[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.162,1.163
Max Horn
fingolfin at users.sourceforge.net
Mon Sep 8 17:51:46 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv8864
Modified Files:
actor.cpp
Log Message:
moving stuff around
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- actor.cpp 8 Sep 2003 20:50:35 -0000 1.162
+++ actor.cpp 8 Sep 2003 21:03:31 -0000 1.163
@@ -1109,6 +1109,28 @@
}
}
+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;
@@ -1566,28 +1588,6 @@
b = (b * b_fact) >> 8;
palette[i] = _vm->remapPaletteColor(r, g, b, 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;
}
}
More information about the Scummvm-git-logs
mailing list