diff options
author | Paul Gilbert | 2017-02-27 08:55:56 -0500 |
---|---|---|
committer | Paul Gilbert | 2017-02-27 08:55:56 -0500 |
commit | 93cd3eced23dba0099cc713a7d2323a901dbca75 (patch) | |
tree | b562ea1e5f77c169461e94e1f60dcb2ed96031f5 /engines/titanic/core | |
parent | 64b05a8693531b455389466bcaa16572f96ecc0a (diff) | |
download | scummvm-rg350-93cd3eced23dba0099cc713a7d2323a901dbca75.tar.gz scummvm-rg350-93cd3eced23dba0099cc713a7d2323a901dbca75.tar.bz2 scummvm-rg350-93cd3eced23dba0099cc713a7d2323a901dbca75.zip |
TITANIC: Implemented CStarControl doAction
Diffstat (limited to 'engines/titanic/core')
-rw-r--r-- | engines/titanic/core/game_object.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/core/game_object.h | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index 589d026fad..50c5dc6d1e 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -1637,7 +1637,7 @@ CStarControl *CGameObject::getStarControl() const { return starControl; } -void CGameObject::starFn(int action) { +void CGameObject::starFn(StarControlAction action) { CStarControl *starControl = getStarControl(); if (starControl) starControl->doAction(action); diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h index 2025c574a5..a04860f7a4 100644 --- a/engines/titanic/core/game_object.h +++ b/engines/titanic/core/game_object.h @@ -42,6 +42,11 @@ namespace Titanic { enum Find { FIND_GLOBAL = 1, FIND_ROOM = 2, FIND_PET = 4, FIND_MAILMAN = 8 }; enum Found { FOUND_NONE = 0, FOUND_GLOBAL = 1, FOUND_ROOM = 2, FOUND_PET = 3, FOUND_MAILMAN = 4 }; enum RoomFlagsComparison { RFC_LOCATION = 1, RFC_CLASS_ELEVATOR = 2, RFC_TITANIA = 3 }; +enum StarControlAction { + STAR_SHOW = 0, STAR_HIDE, STAR_2, STAR_RESET_POS, STAR_4, STAR_5, STAR_6, STAR_7, + STAR_8, STAR_9, STAR_10, STAR_11, STAR_12, STAR_13, STAR_SET_REFERENCE, STAR_FADE_IN, + STAR_FADE_OUT, STAR_17, STAR_18, STAR_19 +}; class CDontSaveFileItem; class CMailMan; @@ -948,7 +953,7 @@ public: /** * Executes an action in the StarControl subsystem */ - void starFn(int action); + void starFn(StarControlAction action); /** * Returns true if the starmap puzzle has been solved |