libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-25 03:07:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid HE regressions.

Browse Source 
svn-id: r18068
This commit is contained in:
Travis Howell 2005-05-12 09:12:30 +00:00
parent 3386b6cdd1
commit d6a20a231b
5 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scumm/actor.cpp
View File

@ -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);
}
}
}

5
scumm/script_v100he.cpp
View File

@ -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() {

2
scumm/script_v72he.cpp
View File

@ -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() {

15
scumm/script_v7he.cpp
View File

@ -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();

4
scumm/wiz_he.cpp
View File

@ -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;
}