libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-23 02:11:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename classFlags functions and fix one of them.

Browse Source 
svn-id: r16867
This commit is contained in:
Eugene Sandulenko 2005-02-22 22:52:35 +00:00
parent 26b11cb444
commit ee8f4ca1cf
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scumm/intern.h
View File

@ -935,8 +935,8 @@ protected:
void spriteInfoSet_flags23_26(int spriteId, int value);
void spriteInfoSet_flag31(int spriteId, int value);
void spriteInfoSet_field_78_64(int spriteId, int value);
void spriteInfoSet_classFlags_1(int spriteId, int value1, int value2);
void spriteInfoSet_classFlags_2(int spriteId);
void spriteInfoSet_setClassFlags(int spriteId, int value1, int value2);
void spriteInfoSet_resetClassFlags(int spriteId);
void spritesAllocTables(int numSprites, int numGroups, int numMaxSprites);
void spritesResetTables(bool refreshScreen);

6
scumm/script_v90he.cpp
View File

@ -1218,15 +1218,15 @@ void ScummEngine_v90he::o90_setSpriteInfo() {
int code = *p;
if (code == 0) {
for (int i = _curSpriteId; i <= _curMaxSpriteId; ++i) {
spriteInfoSet_classFlags_2(i);
spriteInfoSet_resetClassFlags(i);
}
} else if (code & 0x80) {
for (int i = _curSpriteId; i <= _curMaxSpriteId; ++i) {
spriteInfoSet_classFlags_1(i, code & 0x7F, 1);
spriteInfoSet_setClassFlags(i, code & 0x7F, 1);
}
} else {
for (int i = _curSpriteId; i <= _curMaxSpriteId; ++i) {
spriteInfoSet_classFlags_1(i, code & 0x7F, 0);
spriteInfoSet_setClassFlags(i, code & 0x7F, 0);
}
}
--p;

7
scumm/sprite_he.cpp
View File

@ -485,19 +485,18 @@ void ScummEngine_v90he::spriteInfoSet_field_78_64(int spriteId, int value) {
_spriteTable[spriteId].field_64 = value;
}
void ScummEngine_v90he::spriteInfoSet_classFlags_1(int spriteId, int classId, int toggle) {
void ScummEngine_v90he::spriteInfoSet_setClassFlags(int spriteId, int classId, int toggle) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
checkRange(32, 1, classId, "class %d out of range in statement");
// XXX
if (toggle) {
_spriteTable[spriteId].flags |= 1 << (classId - 1);
} else {
_spriteTable[spriteId].flags &= 1 << (classId - 1);
_spriteTable[spriteId].flags &= ~(1 << (classId - 1));
}
}
void ScummEngine_v90he::spriteInfoSet_classFlags_2(int spriteId) {
void ScummEngine_v90he::spriteInfoSet_resetClassFlags(int spriteId) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
_spriteTable[spriteId].class_flags = 0;