diff options
| author | Kamil Zbróg | 2013-12-13 07:07:02 +0000 |
|---|---|---|
| committer | Kamil Zbróg | 2013-12-13 07:07:02 +0000 |
| commit | fc04a3c328e70733eea1b065cb5dacc9ec6999f2 (patch) | |
| tree | 50c8a75f5b79c3d2c09361ebb7c7c22ef689f01f /engines/lastexpress/game/scenes.cpp | |
| parent | eecc6f3e8462440a26170b2a62941df5101f9c3d (diff) | |
| parent | e79022bf3428354c8c7bcde4fa0406636bc8ded4 (diff) | |
| download | scummvm-rg350-fc04a3c328e70733eea1b065cb5dacc9ec6999f2.tar.gz scummvm-rg350-fc04a3c328e70733eea1b065cb5dacc9ec6999f2.tar.bz2 scummvm-rg350-fc04a3c328e70733eea1b065cb5dacc9ec6999f2.zip | |
Merge remote-tracking branch 'sync/master' into prince-malik
Diffstat (limited to 'engines/lastexpress/game/scenes.cpp')
| -rw-r--r-- | engines/lastexpress/game/scenes.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/lastexpress/game/scenes.cpp b/engines/lastexpress/game/scenes.cpp index 82688fff2e..0d8f51af6e 100644 --- a/engines/lastexpress/game/scenes.cpp +++ b/engines/lastexpress/game/scenes.cpp @@ -579,7 +579,7 @@ void SceneManager::updateDoorsAndClock() { for (ObjectIndex index = firstIndex; index < (ObjectIndex)(firstIndex + 8); index = (ObjectIndex)(index + 1)) { // Doors is not open, nothing to do - if (getObjects()->get(index).location != kObjectLocation2) + if (getObjects()->get(index).status != kObjectLocation2) continue; // Load door sequence @@ -842,11 +842,11 @@ void SceneManager::preProcessScene(SceneIndex *index) { if (object >= kObjectMax) break; - if (getObjects()->get(object).location == kObjectLocationNone) + if (getObjects()->get(object).status == kObjectLocationNone) break; for (Common::Array<SceneHotspot *>::iterator it = scene->getHotspots()->begin(); it != scene->getHotspots()->end(); ++it) { - if (getObjects()->get(object).location != (*it)->location) + if (getObjects()->get(object).status != (*it)->location) continue; PROCESS_HOTSPOT_SCENE(*it, index); @@ -920,7 +920,7 @@ void SceneManager::preProcessScene(SceneIndex *index) { int location = kObjectLocationNone; - if (getObjects()->get(object).location == kObjectLocation2) + if (getObjects()->get(object).status == kObjectLocation2) location = kObjectLocation1; if (getInventory()->get(item)->location != kObjectLocationNone) @@ -933,7 +933,7 @@ void SceneManager::preProcessScene(SceneIndex *index) { if (location != (*it)->location) continue; - if (getObjects()->get(object).location != (*it)->param1) + if (getObjects()->get(object).status != (*it)->param1) continue; if (getInventory()->get(item)->location != (*it)->param2) @@ -994,7 +994,7 @@ void SceneManager::preProcessScene(SceneIndex *index) { bool found = false; for (Common::Array<SceneHotspot *>::iterator it = scene->getHotspots()->begin(); it != scene->getHotspots()->end(); ++it) { - if (getObjects()->get(object).location2 != (*it)->location) + if (getObjects()->get(object).model != (*it)->location) continue; PROCESS_HOTSPOT_SCENE(*it, index); |