diff options
| author | Eugene Sandulenko | 2005-05-15 19:27:46 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-05-15 19:27:46 +0000 |
| commit | f9ebe123106c3067a80c207898009cf1f3e9c237 (patch) | |
| tree | 1977b5fc09debc86d9908723ae3bc30e35eed71c | |
| parent | 71aff533264cd0326407f74f8ae3f8c0735d49c5 (diff) | |
| download | scummvm-rg350-f9ebe123106c3067a80c207898009cf1f3e9c237.tar.gz scummvm-rg350-f9ebe123106c3067a80c207898009cf1f3e9c237.tar.bz2 scummvm-rg350-f9ebe123106c3067a80c207898009cf1f3e9c237.zip | |
Restore --disable-he functionality. :(
svn-id: r18121
| -rw-r--r-- | scumm/actor.cpp | 6 | ||||
| -rw-r--r-- | scumm/akos.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index a48d6429a1..4047fe5b8c 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -630,8 +630,10 @@ void Actor::putActor(int dstX, int dstY, byte newRoom) { } adjustActorPos(); } else { +#ifndef DISABLE_HE if (_vm->_heversion >= 71) ((ScummEngine_v71he *)_vm)->queueAuxBlock(this); +#endif hideActor(); } } else { @@ -1430,8 +1432,10 @@ void Actor::setActorCostume(int c) { if (_vm->_features & GF_NEW_COSTUMES) { memset(_animVariable, 0, sizeof(_animVariable)); +#ifndef DISABLE_HE if (_vm->_heversion >= 71) ((ScummEngine_v71he *)_vm)->queueAuxBlock(this); +#endif _costume = c; _cost.reset(); @@ -2040,7 +2044,6 @@ void ScummEngine_v71he::postProcessAuxQueue() { } _auxEntriesNum = 0; } -#endif void ScummEngine_v71he::queueAuxBlock(Actor *a) { if (!a->_auxBlock.visible) @@ -2058,6 +2061,7 @@ void ScummEngine_v71he::queueAuxEntry(int actorNum, int subIndex) { ae->subIndex = subIndex; ++_auxEntriesNum; } +#endif const SaveLoadEntry *Actor::getSaveLoadEntries() { diff --git a/scumm/akos.cpp b/scumm/akos.cpp index 022dc36a90..65fd9a8483 100644 --- a/scumm/akos.cpp +++ b/scumm/akos.cpp @@ -1692,8 +1692,10 @@ void ScummEngine::akos_processQueue() { a->_offsY = param_2; break; case 7: +#ifndef DISABLE_HE assert(_heversion >= 71); ((ScummEngine_v71he *)this)->queueAuxEntry(a->_number, param_1); +#endif break; case 8: _actorToPrintStrFor = a->_number; |