diff options
| -rw-r--r-- | scumm/actor.cpp | 3 | ||||
| -rw-r--r-- | scumm/script_v100he.cpp | 5 | ||||
| -rw-r--r-- | scumm/script_v72he.cpp | 2 | ||||
| -rw-r--r-- | scumm/script_v7he.cpp | 15 | ||||
| -rw-r--r-- | scumm/wiz_he.cpp | 4 |
5 files changed, 11 insertions, 18 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index 1f94702ce7..52b9b6f1e8 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -1488,7 +1488,8 @@ void Actor::setActorCostume(int c) { if (_vm->_heversion >= 71 && _vm->getTalkingActor() == _number) { if (_vm->_heversion <= 95 || (_vm->_heversion >= 98 && _vm->VAR(_vm->VAR_SKIP_RESET_TALK_ACTOR) == 0)) { - _vm->setTalkingActor(0); + // TODO + // _vm->setTalkingActor(0); } } } diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp index 2c6fd8ff9b..ecf460ed21 100644 --- a/scumm/script_v100he.cpp +++ b/scumm/script_v100he.cpp @@ -1101,11 +1101,10 @@ void ScummEngine_v100he::o100_resourceRoutines() { // Heap related break; case 136: - // Queue loading if (_heResType == rtScript && _heResId >= _numGlobalScripts) break; - ensureResourceLoaded(_heResType, _heResId); + //queueLoadResource(_heResType, _heResId); break; case 137: if (_heResType == rtScript && _heResId >= _numGlobalScripts) @@ -2229,7 +2228,7 @@ void ScummEngine_v100he::o100_isResourceLoaded() { error("o100_isResourceLoaded: default case %d", subOp); } - push (res.isResourceLoaded(type, idx) ? 100 : 0); + push(100); } void ScummEngine_v100he::o100_getResourceSize() { diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp index 208ca0cb0b..995bf4fef9 100644 --- a/scumm/script_v72he.cpp +++ b/scumm/script_v72he.cpp @@ -2135,7 +2135,7 @@ void ScummEngine_v72he::o72_isResourceLoaded() { error("o72_isResourceLoaded: default case %d", subOp); } - push (res.isResourceLoaded(type, idx) ? 100 : 0); + push(100); } void ScummEngine_v72he::o72_readINI() { diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp index b85e6da83d..91d8f214fa 100644 --- a/scumm/script_v7he.cpp +++ b/scumm/script_v7he.cpp @@ -603,31 +603,26 @@ void ScummEngine_v70he::o70_resourceRoutines() { break; } case 120: - // Queue load script resid = pop(); if (resid >= _numGlobalScripts) break; - ensureResourceLoaded(rtScript, resid); + //queueLoadResource(rtScript, resid); break; case 121: - // Queue load sound resid = pop(); - ensureResourceLoaded(rtSound, resid); + //queueLoadResource(rtSound, resid); break; case 122: - // Queue load costume resid = pop(); - ensureResourceLoaded(rtCostume, resid); + //queueLoadResource(rtCostume, resid); break; case 123: - // Queue load room image resid = pop(); - ensureResourceLoaded(rtRoomImage, resid); + //queueLoadResource(rtRoomImage, resid); break; case 203: - // Queue load image resid = pop(); - ensureResourceLoaded(rtImage, resid); + //queueLoadResource(rtImage, resid); break; case 159: resid = pop(); diff --git a/scumm/wiz_he.cpp b/scumm/wiz_he.cpp index d0778bee62..3e0ae7c401 100644 --- a/scumm/wiz_he.cpp +++ b/scumm/wiz_he.cpp @@ -982,8 +982,7 @@ uint8 *ScummEngine_v72he::drawWizImage(int resNum, int state, int x1, int y1, in const uint8 *xmap = NULL; if (xmapNum) { - byte *xmapPtr = getResourceAddress(rtImage, xmapNum); - xmap = findResourceData(MKID('XMAP'), xmapPtr); + // TODO: Handle 'XMAP' data for shadows } uint8 *dataPtr = getResourceAddress(rtImage, resNum); @@ -1062,7 +1061,6 @@ uint8 *ScummEngine_v72he::drawWizImage(int resNum, int state, int x1, int y1, in } } - // XXX handle 'XMAP' data if (xmap) { palPtr = xmap; } |