diff options
| author | Travis Howell | 2005-02-26 12:10:06 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-02-26 12:10:06 +0000 |
| commit | 4a803b93c04ed5152ba5d77096451601545f4c21 (patch) | |
| tree | c9ef9f53264e7a3aeb3cacb9b29d814a01f71e62 /scumm | |
| parent | 280003edeea4cb82504f4909ef5c15feca387fbc (diff) | |
| download | scummvm-rg350-4a803b93c04ed5152ba5d77096451601545f4c21.tar.gz scummvm-rg350-4a803b93c04ed5152ba5d77096451601545f4c21.tar.bz2 scummvm-rg350-4a803b93c04ed5152ba5d77096451601545f4c21.zip | |
Correction to findSprite()
svn-id: r16932
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/intern.h | 2 | ||||
| -rw-r--r-- | scumm/sprite_he.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index 7fff91482f..7fac1d36e8 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -875,7 +875,7 @@ protected: 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); diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp index 3210ed0e1a..d60352406c 100644 --- a/scumm/sprite_he.cpp +++ b/scumm/sprite_he.cpp @@ -38,16 +38,16 @@ void ScummEngine_v90he::allocateArrays() { // // 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++) { |