aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/core
diff options
context:
space:
mode:
authorPaul Gilbert2017-02-20 21:15:00 -0500
committerPaul Gilbert2017-02-20 21:15:00 -0500
commit90e4e8a06403dc54b862cc08676718a29fdf6f94 (patch)
treeb5709060fcc2c6f0cd03e3f1bfe544aae4438b5b /engines/titanic/core
parente878332cc4f0581343b794d8a20b396b726e3543 (diff)
downloadscummvm-rg350-90e4e8a06403dc54b862cc08676718a29fdf6f94.tar.gz
scummvm-rg350-90e4e8a06403dc54b862cc08676718a29fdf6f94.tar.bz2
scummvm-rg350-90e4e8a06403dc54b862cc08676718a29fdf6f94.zip
TITANIC: Initial cleanup & renamings for bridge controls
Diffstat (limited to 'engines/titanic/core')
-rw-r--r--engines/titanic/core/game_object.cpp4
-rw-r--r--engines/titanic/core/game_object.h6
2 files changed, 7 insertions, 3 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 549cadf085..314746e496 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -1643,9 +1643,9 @@ void CGameObject::starFn1(int v) {
starControl->fn1(v);
}
-bool CGameObject::starFn2() {
+bool CGameObject::starIsSolved() const {
CStarControl *starControl = getStarControl();
- return starControl ? starControl->fn4() : false;
+ return starControl ? starControl->isSolved() : false;
}
/*------------------------------------------------------------------------*/
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index a1e2c35431..b214cf8c9e 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -946,7 +946,11 @@ public:
CStarControl *getStarControl() const;
void starFn1(int v);
- bool starFn2();
+
+ /**
+ * Returns true if the starmap puzzle has been solved
+ */
+ bool starIsSolved() const;
/*--- CTrueTalkManager Methods ---*/