aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/core
diff options
context:
space:
mode:
authorPaul Gilbert2017-02-24 23:30:17 -0500
committerPaul Gilbert2017-02-24 23:30:17 -0500
commite107003c4c83418a34fa15813fc4f3c7de473cf7 (patch)
tree52ada0b29ac2b5aaea8ea26c54eea566410ead38 /engines/titanic/core
parent985f8a3720873b6bfd2bd2cb5bcda78b24629e84 (diff)
downloadscummvm-rg350-e107003c4c83418a34fa15813fc4f3c7de473cf7.tar.gz
scummvm-rg350-e107003c4c83418a34fa15813fc4f3c7de473cf7.tar.bz2
scummvm-rg350-e107003c4c83418a34fa15813fc4f3c7de473cf7.zip
TITANIC: Some preliminary cleanup of star control interfaces
Diffstat (limited to 'engines/titanic/core')
-rw-r--r--engines/titanic/core/game_object.cpp4
-rw-r--r--engines/titanic/core/game_object.h5
2 files changed, 6 insertions, 3 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 314746e496..589d026fad 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -1637,10 +1637,10 @@ CStarControl *CGameObject::getStarControl() const {
return starControl;
}
-void CGameObject::starFn1(int v) {
+void CGameObject::starFn(int action) {
CStarControl *starControl = getStarControl();
if (starControl)
- starControl->fn1(v);
+ starControl->doAction(action);
}
bool CGameObject::starIsSolved() const {
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index b214cf8c9e..2025c574a5 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -945,7 +945,10 @@ public:
*/
CStarControl *getStarControl() const;
- void starFn1(int v);
+ /**
+ * Executes an action in the StarControl subsystem
+ */
+ void starFn(int action);
/**
* Returns true if the starmap puzzle has been solved