diff options
| author | Matthew Stewart | 2018-07-04 00:32:34 -0400 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-08-09 08:37:30 +0200 |
| commit | ae3be7b40730387707bf4c104ea4f2ff8b588523 (patch) | |
| tree | acd6f32b6dc77cdf65d06139b3c7710618b2845c /engines/startrek/action.h | |
| parent | 007960e85eeaeb0f1ab45914936a917cb40af808 (diff) | |
| download | scummvm-rg350-ae3be7b40730387707bf4c104ea4f2ff8b588523.tar.gz scummvm-rg350-ae3be7b40730387707bf4c104ea4f2ff8b588523.tar.bz2 scummvm-rg350-ae3be7b40730387707bf4c104ea4f2ff8b588523.zip | |
STARTREK: FEATHER2
Diffstat (limited to 'engines/startrek/action.h')
| -rw-r--r-- | engines/startrek/action.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/engines/startrek/action.h b/engines/startrek/action.h index f6178d8858..ab50defdb7 100644 --- a/engines/startrek/action.h +++ b/engines/startrek/action.h @@ -29,7 +29,7 @@ namespace StarTrek { class Room; -enum Acton { // TODO: rename +enum ActionTypes { ACTION_TICK = 0, ACTION_WALK = 1, // Actions 1-5 are directly usable on away missions. @@ -41,8 +41,16 @@ enum Acton { // TODO: rename ACTION_TOUCHED_WARP = 6, ACTION_TOUCHED_HOTSPOT = 7, // Second kind of "hotspot" only relevant when an object touches them ACTION_TIMER_EXPIRED = 8, + + ACTION_DONE_ANIM = 10, + ACTION_DONE_WALK = 12, + + // TODO: Remove these two as redundant. + // They're only here because I don't want to mess up the spacing in function_map.h by + // find/replacing the old name. ACTION_FINISHED_ANIMATION = 10, ACTION_FINISHED_WALKING = 12, + ACTION_OPTIONS = 13 // Not really an action, but selectable from action menu }; |