diff options
| author | Travis Howell | 2005-03-13 13:25:28 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-03-13 13:25:28 +0000 |
| commit | 013f8b18034985c45e156e7abfba51a13ed49f2f (patch) | |
| tree | b9df0e4f9992c9a06ad1e9408a632204b7a44fe5 | |
| parent | c5c6bf838d9c67bd77b7a00f1b411318a0b086a9 (diff) | |
| download | scummvm-rg350-013f8b18034985c45e156e7abfba51a13ed49f2f.tar.gz scummvm-rg350-013f8b18034985c45e156e7abfba51a13ed49f2f.tar.bz2 scummvm-rg350-013f8b18034985c45e156e7abfba51a13ed49f2f.zip | |
Rename sprite flags/functions
svn-id: r17119
| -rw-r--r-- | scumm/intern.h | 4 | ||||
| -rw-r--r-- | scumm/script_v100he.cpp | 4 | ||||
| -rw-r--r-- | scumm/script_v90he.cpp | 4 | ||||
| -rw-r--r-- | scumm/sprite_he.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index 550a6eaa02..464bd88249 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -962,8 +962,8 @@ protected: void spriteInfoSet_zoom(int spriteId, int value); void spriteInfoSet_rotAngle(int spriteId, int value); void spriteInfoSet_flag13(int spriteId, int value); - void spriteInfoSet_flag14(int spriteId, int value); - void spriteInfoSet_flag15(int spriteId, int value); + void spriteInfoGet_flagYFlipped(int spriteId, int value); + void spriteInfoGet_flagXFlipped(int spriteId, int value); void spriteInfoSet_flagActive(int spriteId, int value); void spriteInfoSet_flag20(int spriteId, int value); void spriteInfoSet_flagYFlipped(int spriteId, int value); diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp index 3cd879a1b9..65650be3db 100644 --- a/scumm/script_v100he.cpp +++ b/scumm/script_v100he.cpp @@ -1926,10 +1926,10 @@ void ScummEngine_v100he::o100_setSpriteInfo() { for (; spriteId <= _curMaxSpriteId; spriteId++) switch(args[1]) { case 0: - spriteInfoSet_flag15(spriteId, args[0]); + spriteInfoGet_flagXFlipped(spriteId, args[0]); break; case 1: - spriteInfoSet_flag14(spriteId, args[0]); + spriteInfoGet_flagYFlipped(spriteId, args[0]); break; case 2: spriteInfoSet_flagActive(spriteId, args[0]); diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp index 16b48d66e4..ed7841843b 100644 --- a/scumm/script_v90he.cpp +++ b/scumm/script_v90he.cpp @@ -1057,10 +1057,10 @@ void ScummEngine_v90he::o90_setSpriteInfo() { for (; spriteId <= _curMaxSpriteId; spriteId++) switch(args[1]) { case 0: - spriteInfoSet_flag15(spriteId, args[0]); + spriteInfoGet_flagXFlipped(spriteId, args[0]); break; case 1: - spriteInfoSet_flag14(spriteId, args[0]); + spriteInfoGet_flagYFlipped(spriteId, args[0]); break; case 2: spriteInfoSet_flagActive(spriteId, args[0]); diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp index bf9bc750c1..56478af3ee 100644 --- a/scumm/sprite_he.cpp +++ b/scumm/sprite_he.cpp @@ -553,7 +553,7 @@ void ScummEngine_v90he::spriteInfoSet_flag13(int spriteId, int value) { _spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw; } -void ScummEngine_v90he::spriteInfoSet_flag14(int spriteId, int value) { +void ScummEngine_v90he::spriteInfoGet_flagYFlipped(int spriteId, int value) { checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d"); int oldFlags = _spriteTable[spriteId].flags; @@ -566,7 +566,7 @@ void ScummEngine_v90he::spriteInfoSet_flag14(int spriteId, int value) { _spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw; } -void ScummEngine_v90he::spriteInfoSet_flag15(int spriteId, int value) { +void ScummEngine_v90he::spriteInfoGet_flagXFlipped(int spriteId, int value) { checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d"); int oldFlags = _spriteTable[spriteId].flags; |