thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restore --disable-he functionality. :(

Browse source 
svn-id: r18121
This commit is contained in:
Eugene Sandulenko 2005-05-15 19:27:46 +00:00
parent 71aff53326
commit f9ebe12310
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scumm/actor.cpp
View file

@ -630,8 +630,10 @@ void Actor::putActor(int dstX, int dstY, byte newRoom) {
} }
adjustActorPos(); adjustActorPos();
} else { } else {
#ifndef DISABLE_HE
if (_vm->_heversion >= 71) if (_vm->_heversion >= 71)
((ScummEngine_v71he *)_vm)->queueAuxBlock(this); ((ScummEngine_v71he *)_vm)->queueAuxBlock(this);
#endif
hideActor(); hideActor();
} }
} else { } else {
@ -1430,8 +1432,10 @@ void Actor::setActorCostume(int c) {
if (_vm->_features & GF_NEW_COSTUMES) { if (_vm->_features & GF_NEW_COSTUMES) {
memset(_animVariable, 0, sizeof(_animVariable)); memset(_animVariable, 0, sizeof(_animVariable));
#ifndef DISABLE_HE
if (_vm->_heversion >= 71) if (_vm->_heversion >= 71)
((ScummEngine_v71he *)_vm)->queueAuxBlock(this); ((ScummEngine_v71he *)_vm)->queueAuxBlock(this);
#endif
_costume = c; _costume = c;
_cost.reset(); _cost.reset();
@ -2040,7 +2044,6 @@ void ScummEngine_v71he::postProcessAuxQueue() {
} }
_auxEntriesNum = 0; _auxEntriesNum = 0;
} }
#endif
void ScummEngine_v71he::queueAuxBlock(Actor *a) { void ScummEngine_v71he::queueAuxBlock(Actor *a) {
if (!a->_auxBlock.visible) if (!a->_auxBlock.visible)
@ -2058,6 +2061,7 @@ void ScummEngine_v71he::queueAuxEntry(int actorNum, int subIndex) {
ae->subIndex = subIndex; ae->subIndex = subIndex;
++_auxEntriesNum; ++_auxEntriesNum;
} }
#endif
const SaveLoadEntry *Actor::getSaveLoadEntries() { const SaveLoadEntry *Actor::getSaveLoadEntries() {

2
scumm/akos.cpp
View file

@ -1692,8 +1692,10 @@ void ScummEngine::akos_processQueue() {
a->_offsY = param_2; a->_offsY = param_2;
break; break;
case 7: case 7:
#ifndef DISABLE_HE
assert(_heversion >= 71); assert(_heversion >= 71);
((ScummEngine_v71he *)this)->queueAuxEntry(a->_number, param_1); ((ScummEngine_v71he *)this)->queueAuxEntry(a->_number, param_1);
#endif
break; break;
case 8: case 8:
_actorToPrintStrFor = a->_number; _actorToPrintStrFor = a->_number;