aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-09-08 21:03:31 +0000
committerMax Horn2003-09-08 21:03:31 +0000
commit738470b02e16b69ffb0ce938bbc09a5e29f0305c (patch)
treed1d128a90cd21ae5f11160c4c15a09dccd8a0e4e
parent72b24e8b4729e105497c207fd055fbc2db003a3c (diff)
downloadscummvm-rg350-738470b02e16b69ffb0ce938bbc09a5e29f0305c.tar.gz
scummvm-rg350-738470b02e16b69ffb0ce938bbc09a5e29f0305c.tar.bz2
scummvm-rg350-738470b02e16b69ffb0ce938bbc09a5e29f0305c.zip
moving stuff around
svn-id: r10111
-rw-r--r--scumm/actor.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index cbefe01dca..df2ce8d7da 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -1109,6 +1109,28 @@ void Scumm::setActorRedrawFlags() {
}
}
+void Scumm::resetActorBgs() {
+ int i, j;
+
+ for (i = 0; i < gdi._numStrips; i++) {
+ int strip = _screenStartStrip + i;
+ clearGfxUsageBit(strip, USAGE_BIT_DIRTY);
+ clearGfxUsageBit(strip, USAGE_BIT_RESTORED);
+ for (j = 1; j < _numActors; j++) {
+ if (testGfxUsageBit(strip, j) &&
+ ((_actors[j].top != 0xFF || _actors[j].needRedraw) || _actors[j].needBgReset)) {
+ clearGfxUsageBit(strip, j);
+ if ((_actors[j].bottom - _actors[j].top) >= 0)
+ gdi.resetBackground(_actors[j].top, _actors[j].bottom, i);
+ }
+ }
+ }
+
+ for (i = 1; i < _numActors; i++) {
+ _actors[i].needBgReset = false;
+ }
+}
+
int Scumm::getActorFromPos(int x, int y) {
int i;
@@ -1569,28 +1591,6 @@ void Actor::remapActorPalette(int r_fact, int g_fact, int b_fact, int threshold)
}
}
-void Scumm::resetActorBgs() {
- int i, j;
-
- for (i = 0; i < gdi._numStrips; i++) {
- int strip = _screenStartStrip + i;
- clearGfxUsageBit(strip, USAGE_BIT_DIRTY);
- clearGfxUsageBit(strip, USAGE_BIT_RESTORED);
- for (j = 1; j < _numActors; j++) {
- if (testGfxUsageBit(strip, j) &&
- ((_actors[j].top != 0xFF || _actors[j].needRedraw) || _actors[j].needBgReset)) {
- clearGfxUsageBit(strip, j);
- if ((_actors[j].bottom - _actors[j].top) >= 0)
- gdi.resetBackground(_actors[j].top, _actors[j].bottom, i);
- }
- }
- }
-
- for (i = 1; i < _numActors; i++) {
- _actors[i].needBgReset = false;
- }
-}
-
void Actor::classChanged(int cls, bool value) {
if (cls == kObjectClassAlwaysClip)
forceClip = value;