[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.176,1.177 gfx.cpp,2.305,2.306
Gregory Montoir
cyx at users.sourceforge.net
Fri Sep 17 23:30:00 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21571/scumm
Modified Files:
akos.cpp gfx.cpp
Log Message:
minor code simplification
Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -d -r1.176 -r1.177
--- akos.cpp 18 Sep 2004 06:17:50 -0000 1.176
+++ akos.cpp 18 Sep 2004 06:29:07 -0000 1.177
@@ -343,7 +343,7 @@
const CostumeInfo *costumeInfo;
uint i, extra;
byte result = 0;
- int xmoveCur, ymoveCur, dxCur, dyCur;
+ int xmoveCur, ymoveCur;
uint32 seq3Idx[32];
uint8 hasSeq3Idx;
int lastDx, lastDy;
@@ -444,16 +444,10 @@
ymoveCur = _ymove + (int16)READ_LE_UINT16(p + 2);
if (i == extra - 1) {
- dxCur = lastDx;
- dyCur = lastDy;
- } else {
- dxCur = 0;
- dyCur = 0;
+ _xmove += lastDx;
+ _ymove -= lastDy;
}
- _xmove += dxCur;
- _ymove -= dyCur;
-
if (!hasSeq3Idx || !akct) {
decflag = 1;
} else {
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.305
retrieving revision 2.306
diff -u -d -r2.305 -r2.306
--- gfx.cpp 18 Sep 2004 00:36:15 -0000 2.305
+++ gfx.cpp 18 Sep 2004 06:29:07 -0000 2.306
@@ -1714,13 +1714,11 @@
}
}
src += var_8 + 2;
- dst1 += dstPitch;
- dst2 += dstPitch;
} else {
src += 2;
- dst1 += dstPitch;
- dst2 += dstPitch;
}
+ dst1 += dstPitch;
+ dst2 += dstPitch;
}
}
More information about the Scummvm-git-logs
mailing list