[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.217,1.218
kirben
kirben at users.sourceforge.net
Sun Apr 10 04:21:36 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.135,2.136 resource_v2.cpp,1.50,1.51 script_v2.cpp,2.271,2.272 util.cpp,2.6,2.7 util.h,2.5,2.6
- Next message: [Scummvm-cvs-logs] CVS: scummvm/gob goblin.cpp,1.8,1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31654/scumm
Modified Files:
akos.cpp
Log Message:
akst/aksf pointer should be reset for each loop.
Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -d -r1.217 -r1.218
--- akos.cpp 7 Apr 2005 10:43:43 -0000 1.217
+++ akos.cpp 10 Apr 2005 11:20:55 -0000 1.218
@@ -182,13 +182,16 @@
return;
r += offs;
- const uint8 *akst = _vm->findResourceData(MKID('AKST'), _akos);
- const uint8 *aksf = _vm->findResourceData(MKID('AKSF'), _akos);
+ const uint8 *akstPtr = _vm->findResourceData(MKID('AKST'), _akos);
+ const uint8 *aksfPtr = _vm->findResourceData(MKID('AKSF'), _akos);
i = 0;
mask = READ_LE_UINT16(r); r += 2;
do {
if (mask & 0x8000) {
+ const uint8 *akst = akstPtr;
+ const uint8 *aksf = aksfPtr;
+
code = *r++;
if (usemask & 0x8000) {
switch (code) {
@@ -213,7 +216,7 @@
akst += 8;
}
if (!found) {
- warning("Sequence not found in actor 0x%X costume %d", a, a->_costume);
+ error("Sequence not found in actor 0x%X costume %d", a, a->_costume);
}
}
}
@@ -244,7 +247,7 @@
aksf += 6;
}
if (!found) {
- warning("Sequence not found in actor 0x%X costume %d", a, a->_costume);
+ error("Sequence not found in actor 0x%X costume %d", a, a->_costume);
}
}
}
@@ -268,7 +271,7 @@
akst += 8;
}
if (!found) {
- warning("Sequence not found in actor 0x%X costume %d", a, a->_costume);
+ error("Sequence not found in actor 0x%X costume %d", a, a->_costume);
}
}
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.135,2.136 resource_v2.cpp,1.50,1.51 script_v2.cpp,2.271,2.272 util.cpp,2.6,2.7 util.h,2.5,2.6
- Next message: [Scummvm-cvs-logs] CVS: scummvm/gob goblin.cpp,1.8,1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list