diff options
author | Matthew Stewart | 2018-07-03 23:55:30 -0400 |
---|---|---|
committer | Eugene Sandulenko | 2018-08-09 08:37:30 +0200 |
commit | 8c71f2db84b06862b4fefbe3e79fb042e7a60666 (patch) | |
tree | 7391b512e479707aa14d6855606f00454f3e5662 /engines/startrek/room.h | |
parent | 051ea8c238510db03505cd146025c1db441ace84 (diff) | |
download | scummvm-rg350-8c71f2db84b06862b4fefbe3e79fb042e7a60666.tar.gz scummvm-rg350-8c71f2db84b06862b4fefbe3e79fb042e7a60666.tar.bz2 scummvm-rg350-8c71f2db84b06862b4fefbe3e79fb042e7a60666.zip |
STARTREK: Make Action struct POD again
Diffstat (limited to 'engines/startrek/room.h')
-rw-r--r-- | engines/startrek/room.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/startrek/room.h b/engines/startrek/room.h index bd6d7d9420..f4e7f30175 100644 --- a/engines/startrek/room.h +++ b/engines/startrek/room.h @@ -69,12 +69,14 @@ public: // words 0x0e and 0x10 in RDF file are pointers to start and end of event code. // That code is instead rewritten on a per-room basis. bool actionHasCode(const Action &action); + bool actionHasCode(byte type, byte b1, byte b2, byte b3); + bool handleAction(const Action &action); - bool handleAction(byte type, byte b1, byte b2, byte b3) { return handleAction(Action(type, b1, b2, b3)); }; + bool handleAction(byte type, byte b1, byte b2, byte b3); // Same as above, but if any byte in the action is -1 (0xff), it matches any value. bool handleActionWithBitmask(const Action &action); - bool handleActionWithBitmask(byte type, byte b1, byte b2, byte b3) { return handleActionWithBitmask(Action(type, b1, b2, b3)); }; + bool handleActionWithBitmask(byte type, byte b1, byte b2, byte b3); uint16 getFirstHotspot() { return readRdfWord(0x12); } uint16 getHotspotEnd() { return readRdfWord(0x14); } |