aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/core
diff options
context:
space:
mode:
authorPaul Gilbert2016-04-28 21:34:22 -0400
committerPaul Gilbert2016-07-10 16:22:38 -0400
commit23f5691b97cb53fd45ef411f051b7f10f0523a24 (patch)
treecee825c0c3bc4af78b22ea691897feb7f4495930 /engines/titanic/core
parent4fd482e41813f32359eb91a2b62867605af0382c (diff)
downloadscummvm-rg350-23f5691b97cb53fd45ef411f051b7f10f0523a24.tar.gz
scummvm-rg350-23f5691b97cb53fd45ef411f051b7f10f0523a24.tar.bz2
scummvm-rg350-23f5691b97cb53fd45ef411f051b7f10f0523a24.zip
TITANIC: Implement summoning NPCs
Diffstat (limited to 'engines/titanic/core')
-rw-r--r--engines/titanic/core/tree_item.cpp4
-rw-r--r--engines/titanic/core/tree_item.h6
2 files changed, 7 insertions, 3 deletions
diff --git a/engines/titanic/core/tree_item.cpp b/engines/titanic/core/tree_item.cpp
index 039d597ece..8dd3da054d 100644
--- a/engines/titanic/core/tree_item.cpp
+++ b/engines/titanic/core/tree_item.cpp
@@ -314,9 +314,9 @@ CMusicRoom *CTreeItem::getMusicRoom() const {
return gameManager ? &gameManager->_musicRoom : nullptr;
}
-int CTreeItem::getState8() const {
+int CTreeItem::getPassengerClass() const {
CGameManager *gameManager = getGameManager();
- return gameManager ? gameManager->_gameState._field8 : 3;
+ return gameManager ? gameManager->_gameState._passengerClass : 3;
}
int CTreeItem::getStateC() const {
diff --git a/engines/titanic/core/tree_item.h b/engines/titanic/core/tree_item.h
index 151addee2e..1dcaee552d 100644
--- a/engines/titanic/core/tree_item.h
+++ b/engines/titanic/core/tree_item.h
@@ -279,7 +279,11 @@ public:
*/
CMusicRoom *getMusicRoom() const;
- int getState8() const;
+ /**
+ * Return the player's passenger class
+ */
+ int getPassengerClass() const;
+
int getStateC() const;
};