diff options
| author | johndoe123 | 2015-11-19 14:01:03 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-07-20 06:43:33 +0000 |
| commit | 8b48f2f63f5cc21d864c3e960ce307b50286b64b (patch) | |
| tree | d678ddede21faf2957629554e6859f68e44f1c79 /engines/illusions/duckman | |
| parent | 61a0b5badbd7098e0b96355a428408654b3705df (diff) | |
| download | scummvm-rg350-8b48f2f63f5cc21d864c3e960ce307b50286b64b.tar.gz scummvm-rg350-8b48f2f63f5cc21d864c3e960ce307b50286b64b.tar.bz2 scummvm-rg350-8b48f2f63f5cc21d864c3e960ce307b50286b64b.zip | |
ILLUSIONS: Rename ProgInfo -> SceneInfo
Diffstat (limited to 'engines/illusions/duckman')
| -rw-r--r-- | engines/illusions/duckman/illusions_duckman.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engines/illusions/duckman/illusions_duckman.cpp b/engines/illusions/duckman/illusions_duckman.cpp index 3a6514fa96..86cd068f22 100644 --- a/engines/illusions/duckman/illusions_duckman.cpp +++ b/engines/illusions/duckman/illusions_duckman.cpp @@ -717,13 +717,13 @@ void IllusionsEngine_Duckman::popActiveScene() { } bool IllusionsEngine_Duckman::loadScene(uint32 sceneId) { - ProgInfo *progInfo = _scriptResource->getProgInfo(sceneId & 0xFFFF); - if (!progInfo) + SceneInfo *sceneInfo = _scriptResource->getSceneInfo(sceneId & 0xFFFF); + if (!sceneInfo) return false; pushActiveScene(sceneId); uint resourcesCount; uint32 *resources; - progInfo->getResources(resourcesCount, resources); + sceneInfo->getResources(resourcesCount, resources); for (uint i = 0; i < resourcesCount; ++i) _resSys->loadResource(resources[i], sceneId, 0); return true; @@ -789,9 +789,9 @@ void IllusionsEngine_Duckman::setSceneIdThreadId(uint32 theSceneId, uint32 theTh } bool IllusionsEngine_Duckman::findTriggerCause(uint32 sceneId, uint32 verbId, uint32 objectId2, uint32 objectId, uint32 &codeOffs) { - ProgInfo *progInfo = _scriptResource->getProgInfo(sceneId & 0xFFFF); - if (progInfo) - return progInfo->findTriggerCause(verbId, objectId2, objectId, codeOffs); + SceneInfo *sceneInfo = _scriptResource->getSceneInfo(sceneId & 0xFFFF); + if (sceneInfo) + return sceneInfo->findTriggerCause(verbId, objectId2, objectId, codeOffs); return false; } @@ -993,15 +993,15 @@ void IllusionsEngine_Duckman::playSoundEffect(int index) { } bool IllusionsEngine_Duckman::getTriggerCause(uint32 verbId, uint32 objectId2, uint32 objectId, uint32 &outThreadId) { - ProgInfo *progInfo = _scriptResource->getProgInfo(getCurrentScene() & 0xFFFF); + SceneInfo *sceneInfo = _scriptResource->getSceneInfo(getCurrentScene() & 0xFFFF); bool found = - progInfo->findTriggerCause(verbId, objectId2, objectId, outThreadId) || - progInfo->findTriggerCause(verbId, objectId2, 0x40001, outThreadId); + sceneInfo->findTriggerCause(verbId, objectId2, objectId, outThreadId) || + sceneInfo->findTriggerCause(verbId, objectId2, 0x40001, outThreadId); if (!found) { - progInfo = _scriptResource->getProgInfo(3); + sceneInfo = _scriptResource->getSceneInfo(3); found = - progInfo->findTriggerCause(verbId, objectId2, objectId, outThreadId) || - progInfo->findTriggerCause(verbId, objectId2, 0x40001, outThreadId); + sceneInfo->findTriggerCause(verbId, objectId2, objectId, outThreadId) || + sceneInfo->findTriggerCause(verbId, objectId2, 0x40001, outThreadId); } return found; } |