thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add sprite function.

Browse source 
Correct sprite function (class_flags, not flags).

svn-id: r16875
This commit is contained in:
Travis Howell 2005-02-23 05:26:56 +00:00
parent 15b02f9232
commit a890737e0e
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
scumm/sprite_he.cpp
View file

@ -44,11 +44,14 @@ int ScummEngine_v90he::spriteInfoGet_case15(int a, int b, int c, int d, int num,
return 0; return 0;
} }
int ScummEngine_v90he::spriteInfoGet_classFlags(int spriteId, int num) { int ScummEngine_v90he::spriteInfoGet_classFlags(int spriteId, int classId) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d"); checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
// TODO if (classId == -1)
return 0; return _spriteTable[spriteId].class_flags;
checkRange(32, 1, classId, "class %d out of range in statement");
return ((_spriteTable[spriteId].class_flags & classId) != 0) ? 1 : 0;
} }
int ScummEngine_v90he::spriteInfoGet_classFlags2(int spriteId, int num, int *args) { int ScummEngine_v90he::spriteInfoGet_classFlags2(int spriteId, int num, int *args) {
@ -220,7 +223,7 @@ void ScummEngine_v90he::spriteInfoGet_dx_dy(int spriteId, int32 &dx, int32 &dy)
// spriteGroupGet functions // spriteGroupGet functions
// //
int ScummEngine_v90he::spriteGroupGet_allocateGroupSpritesList(int spriteGroupId) { int ScummEngine_v90he::spriteGroupGet_allocateGroupSpritesList(int spriteGroupId) {
int i, j, sprites = 0; int i, j = 0, sprites = 0;
checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d"); checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
@ -510,9 +513,9 @@ void ScummEngine_v90he::spriteInfoSet_setClassFlags(int spriteId, int classId, i
checkRange(32, 1, classId, "class %d out of range in statement"); checkRange(32, 1, classId, "class %d out of range in statement");
if (toggle) { if (toggle) {
_spriteTable[spriteId].flags |= 1 << (classId - 1); _spriteTable[spriteId].class_flags |= 1 << (classId - 1);
} else { } else {
_spriteTable[spriteId].flags &= ~(1 << (classId - 1)); _spriteTable[spriteId].class_flags &= ~(1 << (classId - 1));
} }
} }