[Scummvm-cvs-logs] CVS: scummvm/scumm sprite_he.cpp,1.61,1.62
kirben
kirben at users.sourceforge.net
Fri Feb 25 17:46:41 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm sprite_he.cpp,1.60,1.61 wiz_he.cpp,2.6,2.7
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.367,2.368 script_v100he.cpp,2.65,2.66 script_v90he.cpp,2.160,2.161 sprite_he.cpp,1.62,1.63
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26982/scumm
Modified Files:
sprite_he.cpp
Log Message:
Fix sprite states
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- sprite_he.cpp 26 Feb 2005 00:35:23 -0000 1.61
+++ sprite_he.cpp 26 Feb 2005 01:39:52 -0000 1.62
@@ -429,15 +429,13 @@
_spriteTable[spriteId].field_80 = value;
}
-void ScummEngine_v90he::spriteInfoSet_resState(int spriteId, int value) {
+void ScummEngine_v90he::spriteInfoSet_resState(int spriteId, int state) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
if (_spriteTable[spriteId].res_id) {
- int state;
-
- state = MAX(value, _spriteTable[spriteId].res_wiz_states - 1);
- if (state < 0)
- state = 0;
+ int res_wiz_states = _spriteTable[spriteId].res_wiz_states - 1;
+ if (state > res_wiz_states)
+ state = res_wiz_states;
if (_spriteTable[spriteId].res_state != state) {
_spriteTable[spriteId].res_state = state;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm sprite_he.cpp,1.60,1.61 wiz_he.cpp,2.6,2.7
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.367,2.368 script_v100he.cpp,2.65,2.66 script_v90he.cpp,2.160,2.161 sprite_he.cpp,1.62,1.63
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list