diff options
author | David Corrales | 2007-08-05 19:34:20 +0000 |
---|---|---|
committer | David Corrales | 2007-08-05 19:34:20 +0000 |
commit | 6856535010bd2fa4449bcfde1c88dc06cd46e26f (patch) | |
tree | b81a2234c2beff0312c93e039d6cafda4babeca6 /engines/lure/res_struct.h | |
parent | 1400d28bfb37fc94f3c44dec0a4d0cef65fb8fb7 (diff) | |
parent | ec1803f838d5efc7decf75c05a1fb4a9633751e5 (diff) | |
download | scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.gz scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.bz2 scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.zip |
Merged fsnode with trunk: r27971:28460
svn-id: r28462
Diffstat (limited to 'engines/lure/res_struct.h')
-rw-r--r-- | engines/lure/res_struct.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/engines/lure/res_struct.h b/engines/lure/res_struct.h index b5e4aef724..4d2c55e6b1 100644 --- a/engines/lure/res_struct.h +++ b/engines/lure/res_struct.h @@ -458,8 +458,7 @@ public: uint16 talkGate; uint16 actionHotspotId; uint16 talkOverride; - - uint16 use2HotspotId; + uint16 scriptHotspotId; void enable() { flags |= 0x80; } void disable() { flags &= 0x7F; } @@ -817,16 +816,10 @@ struct PlayerNewPosition { uint16 roomNumber; }; -struct PlayerPendingPosition { - Point pos; - bool isSet; -}; - class ValueTableData { private: uint16 _numGroats; PlayerNewPosition _playerNewPos; - PlayerPendingPosition _playerPendingPos; uint8 _flags; uint8 _hdrFlagMask; @@ -845,7 +838,6 @@ public: uint8 &flags() { return _flags; } uint8 &hdrFlagMask() { return _hdrFlagMask; } PlayerNewPosition &playerNewPos() { return _playerNewPos; } - PlayerPendingPosition &playerPendingPos() { return _playerPendingPos; } void saveToStream(Common::WriteStream *stream); void loadFromStream(Common::ReadStream *stream); |