[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.202,1.203 akos.h,1.32,1.33
Max Horn
fingolfin at users.sourceforge.net
Sat Nov 27 18:38:27 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.201,1.202 base-costume.cpp,2.22,2.23 bomp.cpp,2.25,2.26
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/midi/mt32 mt32_file.h,1.2,1.3 mt32emu.h,1.7,1.8 part.cpp,1.3,1.4 part.h,1.3,1.4 partial.cpp,1.10,1.11 partial.h,1.6,1.7 partialManager.cpp,1.2,1.3 partialManager.h,1.2,1.3 structures.h,1.10,1.11 synth.cpp,1.23,1.24 synth.h,1.9,1.10 tables.cpp,1.3,1.4 tables.h,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32580
Modified Files:
akos.cpp akos.h
Log Message:
Fixing actor regression in The Dig caused by my previous changes
Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -d -r1.202 -r1.203
--- akos.cpp 28 Nov 2004 02:05:03 -0000 1.202
+++ akos.cpp 28 Nov 2004 02:36:00 -0000 1.203
@@ -872,7 +872,7 @@
if (_actorHitX < rect.left || _actorHitX >= rect.right || _actorHitY < rect.top || _actorHitY >= rect.bottom)
return 0;
} else
- _vm->markRectAsDirty(kMainVirtScreen, rect, _actorID);
+ markRectAsDirty(rect);
if (rect.top >= _out.h || rect.bottom <= 0)
return 0;
@@ -940,6 +940,11 @@
return drawFlag;
}
+void AkosRenderer::markRectAsDirty(Common::Rect rect) {
+ rect.left -= _vm->virtscr[0].xstart & 7;
+ rect.right -= _vm->virtscr[0].xstart & 7;
+ _vm->markRectAsDirty(kMainVirtScreen, rect, _actorID);
+}
byte AkosRenderer::codec5(int xmoveCur, int ymoveCur) {
Common::Rect clip;
@@ -962,7 +967,7 @@
maxw = _out.w;
maxh = _out.h;
- _vm->markRectAsDirty(kMainVirtScreen, clip, _actorID);
+ markRectAsDirty(clip);
clip.clip(maxw, maxh);
@@ -1133,7 +1138,7 @@
clip.clip(_clipOverride);
}
- _vm->markRectAsDirty(kMainVirtScreen, clip, _actorID);
+ markRectAsDirty(clip);
skip_x = 0;
skip_y = 0;
@@ -1225,7 +1230,7 @@
src = dst;
src.moveTo(0, 0);
- _vm->markRectAsDirty(kMainVirtScreen, dst, _actorID);
+ markRectAsDirty(dst);
if (_draw_top > dst.top)
_draw_top = dst.top;
Index: akos.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- akos.h 25 Nov 2004 23:36:02 -0000 1.32
+++ akos.h 28 Nov 2004 02:36:01 -0000 1.33
@@ -99,6 +99,8 @@
void akos16SkipData(int32 numskip);
void akos16DecodeLine(byte *buf, int32 numbytes, int32 dir);
void akos16Decompress(byte *dest, int32 pitch, const byte *src, int32 t_width, int32 t_height, int32 dir, int32 numskip_before, int32 numskip_after, byte transparency, int maskLeft, int maskTop, int zBuf);
+
+ void markRectAsDirty(Common::Rect rect);
};
} // End of namespace Scumm
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.201,1.202 base-costume.cpp,2.22,2.23 bomp.cpp,2.25,2.26
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/midi/mt32 mt32_file.h,1.2,1.3 mt32emu.h,1.7,1.8 part.cpp,1.3,1.4 part.h,1.3,1.4 partial.cpp,1.10,1.11 partial.h,1.6,1.7 partialManager.cpp,1.2,1.3 partialManager.h,1.2,1.3 structures.h,1.10,1.11 synth.cpp,1.23,1.24 synth.h,1.9,1.10 tables.cpp,1.3,1.4 tables.h,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list