[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.371,2.372 sprite_he.cpp,1.70,1.71
kirben
kirben at users.sourceforge.net
Sat Feb 26 04:13:11 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.104,1.105 actor.h,1.55,1.56 input.cpp,1.36,1.37 isomap.cpp,1.33,1.34 isomap.h,1.15,1.16
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.h,1.56,1.57
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18221/scumm
Modified Files:
intern.h sprite_he.cpp
Log Message:
Correction to findSprite()
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.371
retrieving revision 2.372
diff -u -d -r2.371 -r2.372
--- intern.h 26 Feb 2005 11:21:59 -0000 2.371
+++ intern.h 26 Feb 2005 12:10:00 -0000 2.372
@@ -875,7 +875,7 @@
uint8 getWizPixelColor(int restype, int resnum, int state, int x, int y, int flags);
int computeWizHistogram(int resnum, int state, int x, int y, int w, int h);
- int findSpriteWithClassOf(int x, int y, int spriteGroup, int d, int num, int *args);
+ int findSpriteWithClassOf(int x, int y, int spriteGroupId, int d, int num, int *args);
int spriteInfoGet_classFlags(int spriteId, int num);
int spriteInfoGet_classFlagsAnd(int spriteId, int num, int *args);
int spriteInfoGet_flags_13(int spriteId);
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- sprite_he.cpp 26 Feb 2005 11:22:00 -0000 1.70
+++ sprite_he.cpp 26 Feb 2005 12:10:06 -0000 1.71
@@ -38,16 +38,16 @@
//
// spriteInfoGet functions
//
-int ScummEngine_v90he::findSpriteWithClassOf(int x, int y, int spriteGroup, int d, int num, int *args) {
+int ScummEngine_v90he::findSpriteWithClassOf(int x, int y, int spriteGroupId, int d, int num, int *args) {
int classId;
- debug(1, "findSprite: x %d, y %d, spriteGroup %d, d %d, num %d", x, y, spriteGroup, d, num);
+ debug(1, "findSprite: x %d, y %d, spriteGroup %d, d %d, num %d", x, y, spriteGroupId, d, num);
for (int i = 0; i < _numSpritesToProcess; ++i) {
SpriteInfo *spi = _activeSpritesTable[i];
if (!spi->field_4C)
continue;
- if (spriteGroup && spi->group_num != spi->field_4C)
+ if (spriteGroupId && spi->group_num != spriteGroupId)
continue;
for (int j = 0; j < num; j++) {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.104,1.105 actor.h,1.55,1.56 input.cpp,1.36,1.37 isomap.cpp,1.33,1.34 isomap.h,1.15,1.16
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.h,1.56,1.57
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list