diff options
| author | Paul Gilbert | 2016-08-17 19:43:24 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-08-17 19:43:24 -0400 |
| commit | 41dab514e1f7dc4bbf9ff9bab21c5dc5cad7812f (patch) | |
| tree | b0b41bfc6d5d5a61ac8e5ed9c341ed309f9a5f0a /engines/titanic/core | |
| parent | c628f7224f336e353d56990977d3683d905877ab (diff) | |
| download | scummvm-rg350-41dab514e1f7dc4bbf9ff9bab21c5dc5cad7812f.tar.gz scummvm-rg350-41dab514e1f7dc4bbf9ff9bab21c5dc5cad7812f.tar.bz2 scummvm-rg350-41dab514e1f7dc4bbf9ff9bab21c5dc5cad7812f.zip | |
TITANIC: Implemented CCaptainsWheel class
Diffstat (limited to 'engines/titanic/core')
| -rw-r--r-- | engines/titanic/core/game_object.cpp | 5 | ||||
| -rw-r--r-- | engines/titanic/core/game_object.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index ee378dd428..a61dd17003 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -1608,10 +1608,9 @@ void CGameObject::starFn1(int v) { starControl->fn1(v); } -void CGameObject::starFn2() { +bool CGameObject::starFn2() { CStarControl *starControl = getStarControl(); - if (starControl) - starControl->fn4(); + return starControl ? starControl->fn4() : false; } /*------------------------------------------------------------------------*/ diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h index 722b6079af..0749bde5f2 100644 --- a/engines/titanic/core/game_object.h +++ b/engines/titanic/core/game_object.h @@ -884,7 +884,7 @@ public: CStarControl *getStarControl() const; void starFn1(int v); - void starFn2(); + bool starFn2(); /*--- CTrueTalkManager Methods ---*/ |