aboutsummaryrefslogtreecommitdiff
path: root/scumm/actor.cpp
diff options
context:
space:
mode:
authorTravis Howell2005-04-29 01:36:30 +0000
committerTravis Howell2005-04-29 01:36:30 +0000
commit2f262b3c3e4425a7851f02aa3e712c1401505e79 (patch)
tree9b9af15a1359fea13b76eb616d254dab728bd25c /scumm/actor.cpp
parent4b4242e97316ff1959279d630533366c71219b2a (diff)
downloadscummvm-rg350-2f262b3c3e4425a7851f02aa3e712c1401505e79.tar.gz
scummvm-rg350-2f262b3c3e4425a7851f02aa3e712c1401505e79.tar.bz2
scummvm-rg350-2f262b3c3e4425a7851f02aa3e712c1401505e79.zip
Add HE90 version of processActors().
Add HE71 class, for HE71+ specifics. svn-id: r17859
Diffstat (limited to 'scumm/actor.cpp')
-rw-r--r--scumm/actor.cpp39
1 files changed, 20 insertions, 19 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index 24e74ec8cb..ea761c538d 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -1016,30 +1016,31 @@ void ScummEngine::processActors() {
akos_processQueue();
}
-void ScummEngine_v70he::processActors() {
- // TODO: The HE 90 stuff should be moved to a new method, too,
- // if possible (ScummEngine_v90he::processActors).
- if (_heversion >= 71) {
- preProcessAuxQueue();
- }
- if (_heversion >= 90) {
- ((ScummEngine_v90he *)this)->spritesMarkDirty(0);
- ((ScummEngine_v90he *)this)->spritesProcessWiz(true);
- }
+void ScummEngine_v71he::processActors() {
+ preProcessAuxQueue();
if (!_skipProcessActors)
ScummEngine::processActors();
- if (_heversion >= 71) {
- postProcessAuxQueue();
- }
- if (_heversion >= 90) {
- ((ScummEngine_v90he *)this)->spritesMarkDirty(1);
- ((ScummEngine_v90he *)this)->spritesProcessWiz(false);
- }
+ postProcessAuxQueue();
}
+void ScummEngine_v90he::processActors() {
+ preProcessAuxQueue();
+
+ spritesMarkDirty(0);
+ spritesProcessWiz(true);
+
+ if (!_skipProcessActors)
+ ScummEngine::processActors();
+
+ postProcessAuxQueue();
+
+ spritesMarkDirty(1);
+ spritesProcessWiz(false);
+}
+
// Used in Scumm v8, to allow the verb coin to be drawn over the inventory
// chest. I'm assuming that draw order won't matter here.
void ScummEngine::processUpperActors() {
@@ -1969,7 +1970,7 @@ bool Actor::isTalkConditionSet(int slot) const {
return (_heCondMask & (1 << (slot - 1))) != 0;
}
-void ScummEngine_v70he::preProcessAuxQueue() {
+void ScummEngine_v71he::preProcessAuxQueue() {
if (!_skipProcessActors) {
for (int i = 0; i < _auxBlocksNum; ++i) {
AuxBlock *ab = &_auxBlocks[i];
@@ -1982,7 +1983,7 @@ void ScummEngine_v70he::preProcessAuxQueue() {
_auxBlocksNum = 0;
}
-void ScummEngine_v70he::postProcessAuxQueue() {
+void ScummEngine_v71he::postProcessAuxQueue() {
if (!_skipProcessActors) {
for (int i = 0; i < _auxEntriesNum; ++i) {
AuxEntry *ae = &_auxEntries[i];