diff options
author | Sven Hesse | 2009-07-05 21:40:51 +0000 |
---|---|---|
committer | Sven Hesse | 2009-07-05 21:40:51 +0000 |
commit | edfaf7bc3c770c008be81f9ccb26835185d7d7d5 (patch) | |
tree | 6504408a41c6c7041e604aa6cff0f3c80a10f420 /engines/gob/inter_v6.cpp | |
parent | 29e97533c1b884e231feb01ed99fd8ae17a3564d (diff) | |
download | scummvm-rg350-edfaf7bc3c770c008be81f9ccb26835185d7d7d5.tar.gz scummvm-rg350-edfaf7bc3c770c008be81f9ccb26835185d7d7d5.tar.bz2 scummvm-rg350-edfaf7bc3c770c008be81f9ccb26835185d7d7d5.zip |
Added an enum for the hotspot states
svn-id: r42155
Diffstat (limited to 'engines/gob/inter_v6.cpp')
-rw-r--r-- | engines/gob/inter_v6.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp index 67bf87a7da..aa4721ff0a 100644 --- a/engines/gob/inter_v6.cpp +++ b/engines/gob/inter_v6.cpp @@ -355,6 +355,9 @@ bool Inter_v6::o6_palLoad(OpFuncParams ¶ms) { bool Inter_v6::o6_removeHotspot(OpFuncParams ¶ms) { int16 id; + uint8 stateType1 = Hotspots::kStateFilledDisabled | Hotspots::kStateType1; + uint8 stateType2 = Hotspots::kStateFilledDisabled | Hotspots::kStateType2; + uint8 stateDisabled = Hotspots::kStateDisabled; id = _vm->_game->_script->readValExpr(); @@ -369,14 +372,14 @@ bool Inter_v6::o6_removeHotspot(OpFuncParams ¶ms) { _vm->_game->_hotspots->push(2); break; case 3: - _vm->_game->_hotspots->removeState(0xD); - _vm->_game->_hotspots->removeState(0x4); + _vm->_game->_hotspots->removeState(stateType1); + _vm->_game->_hotspots->removeState(stateDisabled); break; case 4: - _vm->_game->_hotspots->removeState(0xE); + _vm->_game->_hotspots->removeState(stateType2); break; default: - _vm->_game->_hotspots->remove(0xE000 + id); + _vm->_game->_hotspots->remove((stateType2 << 12) + id); break; } |