[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.138,1.139 costume.h,1.26,1.27
Travis Howell
kirben at users.sourceforge.net
Mon Aug 9 19:18:18 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9774/scumm
Modified Files:
costume.cpp costume.h
Log Message:
Remove old unused and unneeded function.
Update comments
Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- costume.cpp 10 Aug 2004 02:13:25 -0000 1.138
+++ costume.cpp 10 Aug 2004 02:17:34 -0000 1.139
@@ -209,7 +209,7 @@
v1.scaleXstep = _mirror ? 1 : -1;
if (_vm->_version == 1)
- // HACK: Fix a glitch where costumes in V1 games leave a trail when the actor moves left
+ // V1 games uses 8 x 8 pixels for actors
_vm->markRectAsDirty(kMainVirtScreen, rect.left, rect.right + 8, rect.top, rect.bottom, _actorID);
else
_vm->markRectAsDirty(kMainVirtScreen, rect.left, rect.right + 1, rect.top, rect.bottom, _actorID);
@@ -249,6 +249,7 @@
v1.x = _outwidth - 1;
}
} else {
+ // V1 games uses 8 x 8 pixels for actors
if (_loaded._format == 0x57)
skip = -8 - rect.left;
else
@@ -304,46 +305,6 @@
return drawFlag;
}
-void CostumeRenderer::c64_ignorePakCols(int num) {
-
- warning("c64_ignorePakCols(%d) - this needs testing", num);
-
- // FIXME: A problem with this is that num can be a number
- // not divisible by 8, e.g. c64_ignorePakCols(17) happens.
- // We currently don't really deal with that. OTOH it seems
- // in all cases the number was of the form 8n+1, e.g. 1, 9, 17
- //
-
- uint height = _height;
- num /= 8;
-
- while (num > 0) {
- v1.replen = *_srcptr++;
- if (v1.replen & 0x80) {
- v1.replen &= 0x7f;
- v1.repcolor = *_srcptr++;
- while (v1.replen--) {
- if (!--height) {
- if (!--num) {
- v1.replen |= 0x80;
- return;
- }
- height = _height;
- }
- }
- } else {
- while (v1.replen--) {
- v1.repcolor = *_srcptr++;
- if (!--height) {
- if (!--num)
- return;
- height = _height;
- }
- }
- }
- }
-}
-
static const int v1MMActorPalatte1[25] = {
8, 8, 8, 8, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8
};
Index: costume.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- costume.h 6 Jan 2004 12:45:30 -0000 1.26
+++ costume.h 10 Aug 2004 02:17:34 -0000 1.27
@@ -75,7 +75,6 @@
void proc3_ami();
void procC64(int actor);
- void c64_ignorePakCols(int num);
byte mainRoutine(int xmoveCur, int ymoveCur);
};
More information about the Scummvm-git-logs
mailing list