diff options
| author | Strangerke | 2016-03-14 07:40:03 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-05-10 09:54:21 +0200 |
| commit | 83bc85713bacd3a50daaace0411a3382c855797a (patch) | |
| tree | b825953bb68b22f6fef096da65c2165dc6d3fb69 /engines/gnap/scenes/scene38.cpp | |
| parent | da2cb981d2d5a71fc9db04404569bfcc92fbfcf3 (diff) | |
| download | scummvm-rg350-83bc85713bacd3a50daaace0411a3382c855797a.tar.gz scummvm-rg350-83bc85713bacd3a50daaace0411a3382c855797a.tar.bz2 scummvm-rg350-83bc85713bacd3a50daaace0411a3382c855797a.zip | |
GNAP: More renaming. Remove unused variable in MouseButtonState and Hotspot
Diffstat (limited to 'engines/gnap/scenes/scene38.cpp')
| -rw-r--r-- | engines/gnap/scenes/scene38.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/gnap/scenes/scene38.cpp b/engines/gnap/scenes/scene38.cpp index f807728bae..a53d5b0691 100644 --- a/engines/gnap/scenes/scene38.cpp +++ b/engines/gnap/scenes/scene38.cpp @@ -73,21 +73,21 @@ void GnapEngine::scene38_updateHotspots() { setHotspot(kHSWalkArea6, 393, 0, 698, 445, SF_WALKABLE | SF_DISABLED); setDeviceHotspot(kHSDevice, -1, -1, -1, -1); if (_beaverActionStatus == kASBeaverHoldingTrapDoor) - _hotspots[kHSPlatypus].flags = SF_WALKABLE | SF_DISABLED; + _hotspots[kHSPlatypus]._flags = SF_WALKABLE | SF_DISABLED; if (_beaverActionStatus == kASBeaverHoldingTrapDoor) - _hotspots[kHSExitCave].flags = SF_EXIT_D_CURSOR; + _hotspots[kHSExitCave]._flags = SF_EXIT_D_CURSOR; else if (_gnapActionStatus == kASHoldingHuntingTrophy) - _hotspots[kHSExitCave].flags = SF_EXIT_D_CURSOR; + _hotspots[kHSExitCave]._flags = SF_EXIT_D_CURSOR; if (_beaverActionStatus == kASBeaverHoldingTrapDoor) - _hotspots[kHSTrapDoorLid1].flags = SF_DISABLED; + _hotspots[kHSTrapDoorLid1]._flags = SF_DISABLED; else if (_gnapActionStatus == kASHoldingHuntingTrophy) - _hotspots[kHSTrapDoorLid1].flags = SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR; + _hotspots[kHSTrapDoorLid1]._flags = SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR; if (_beaverActionStatus == kASBeaverHoldingTrapDoor) - _hotspots[kHSTrapDoorLid2].flags = SF_DISABLED; + _hotspots[kHSTrapDoorLid2]._flags = SF_DISABLED; else if (_gnapActionStatus == kASHoldingHuntingTrophy) - _hotspots[kHSTrapDoorLid2].flags = SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR; + _hotspots[kHSTrapDoorLid2]._flags = SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR; if (_beaverActionStatus == kASBeaverHoldingTrapDoor) - _hotspots[kHSWalkArea6].flags = 0; + _hotspots[kHSWalkArea6]._flags = SF_NONE; _hotspotsCount = 13; } @@ -224,12 +224,12 @@ void GnapEngine::scene38_run() { break; default: - if (_mouseClickState.left) { + if (_mouseClickState._left) { if (_gnapActionStatus == kASHoldingHuntingTrophy) _gnapActionStatus = kASReleaseHuntingTrophy; else if (_gnapActionStatus < 0) gnapWalkTo(-1, -1, -1, -1, 1); - _mouseClickState.left = false; + _mouseClickState._left = false; } break; |