aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/core
diff options
context:
space:
mode:
authorPaul Gilbert2016-08-30 22:51:18 -0400
committerPaul Gilbert2016-08-30 22:51:18 -0400
commitd9fb4a2bc5ed99bc46e4d9ced3ef4bafa5dc5740 (patch)
treee2fe667c916ffa65be6a9023bc3be5b3c05652c9 /engines/titanic/core
parent46316fdb63c5ce945fbad3434d9078628014097a (diff)
downloadscummvm-rg350-d9fb4a2bc5ed99bc46e4d9ced3ef4bafa5dc5740.tar.gz
scummvm-rg350-d9fb4a2bc5ed99bc46e4d9ced3ef4bafa5dc5740.tar.bz2
scummvm-rg350-d9fb4a2bc5ed99bc46e4d9ced3ef4bafa5dc5740.zip
TITANIC: Fleshed out CMusicRoom & CMusicHandler setup
Diffstat (limited to 'engines/titanic/core')
-rw-r--r--engines/titanic/core/game_object_desc_item.cpp4
-rw-r--r--engines/titanic/core/game_object_desc_item.h7
2 files changed, 8 insertions, 3 deletions
diff --git a/engines/titanic/core/game_object_desc_item.cpp b/engines/titanic/core/game_object_desc_item.cpp
index 409334c9d7..a6ee7e3cf5 100644
--- a/engines/titanic/core/game_object_desc_item.cpp
+++ b/engines/titanic/core/game_object_desc_item.cpp
@@ -30,7 +30,7 @@ CGameObjectDescItem::CGameObjectDescItem(): CTreeItem() {
void CGameObjectDescItem::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
_clipList.save(file, indent);
- file->writeQuotedLine(_string1, indent);
+ file->writeQuotedLine(_name, indent);
file->writeQuotedLine(_string2, indent);
_list1.save(file, indent);
_list2.save(file, indent);
@@ -45,7 +45,7 @@ void CGameObjectDescItem::load(SimpleFile *file) {
if (val)
_clipList.load(file);
- _string1 = file->readString();
+ _name = file->readString();
_string2 = file->readString();
_list1.load(file);
_list1.load(file);
diff --git a/engines/titanic/core/game_object_desc_item.h b/engines/titanic/core/game_object_desc_item.h
index 7bfecaf5a2..4f485e0d55 100644
--- a/engines/titanic/core/game_object_desc_item.h
+++ b/engines/titanic/core/game_object_desc_item.h
@@ -31,7 +31,7 @@ namespace Titanic {
class CGameObjectDescItem : public CTreeItem {
protected:
- CString _string1;
+ CString _name;
CString _string2;
List<ListItem> _list1;
List<ListItem> _list2;
@@ -49,6 +49,11 @@ public:
* Load the data for the class from file
*/
virtual void load(SimpleFile *file);
+
+ /**
+ * Gets the name of the item, if any
+ */
+ virtual const CString getName() const { return _name; }
};
} // End of namespace Titanic