[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.393,2.394 script_v100he.cpp,2.88,2.89 script_v90he.cpp,2.183,2.184 sprite_he.cpp,1.99,1.100 sprite_he.h,1.22,1.23
kirben
kirben at users.sourceforge.net
Sun Mar 13 05:11:43 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.392,2.393 script_v100he.cpp,2.87,2.88 script_v90he.cpp,2.182,2.183 sprite_he.cpp,1.98,1.99 sprite_he.h,1.21,1.22
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky text.cpp,1.65,1.66
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21705/scumm
Modified Files:
intern.h script_v100he.cpp script_v90he.cpp sprite_he.cpp
sprite_he.h
Log Message:
Rename sprite flags/functions
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.393
retrieving revision 2.394
diff -u -d -r2.393 -r2.394
--- intern.h 13 Mar 2005 12:59:25 -0000 2.393
+++ intern.h 13 Mar 2005 13:10:38 -0000 2.394
@@ -912,8 +912,8 @@
int spriteInfoGet_classFlags(int spriteId, int num);
int spriteInfoGet_classFlagsAnd(int spriteId, int num, int *args);
int spriteInfoGet_flags_13(int spriteId);
- int spriteInfoGet_flags_14(int spriteId);
- int spriteInfoGet_flags_15(int spriteId);
+ int spriteInfoGet_flagYFlipped(int spriteId);
+ int spriteInfoGet_flagXFlipped(int spriteId);
int spriteInfoGet_flagActive(int spriteId);
int spriteInfoGet_flags_20(int spriteId);
int spriteInfoGet_flags_22(int spriteId);
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.88
retrieving revision 2.89
diff -u -d -r2.88 -r2.89
--- script_v100he.cpp 13 Mar 2005 12:59:25 -0000 2.88
+++ script_v100he.cpp 13 Mar 2005 13:10:38 -0000 2.89
@@ -2637,10 +2637,10 @@
if (spriteId) {
switch(flags) {
case 0:
- push(spriteInfoGet_flags_15(spriteId));
+ push(spriteInfoGet_flagXFlipped(spriteId));
break;
case 1:
- push(spriteInfoGet_flags_14(spriteId));
+ push(spriteInfoGet_flagYFlipped(spriteId));
break;
case 2:
push(spriteInfoGet_flagActive(spriteId));
Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.183
retrieving revision 2.184
diff -u -d -r2.183 -r2.184
--- script_v90he.cpp 13 Mar 2005 12:59:25 -0000 2.183
+++ script_v90he.cpp 13 Mar 2005 13:10:38 -0000 2.184
@@ -835,10 +835,10 @@
if (spriteId) {
switch(flags) {
case 0:
- push(spriteInfoGet_flags_15(spriteId));
+ push(spriteInfoGet_flagXFlipped(spriteId));
break;
case 1:
- push(spriteInfoGet_flags_14(spriteId));
+ push(spriteInfoGet_flagYFlipped(spriteId));
break;
case 2:
push(spriteInfoGet_flagActive(spriteId));
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- sprite_he.cpp 13 Mar 2005 12:59:25 -0000 1.99
+++ sprite_he.cpp 13 Mar 2005 13:10:38 -0000 1.100
@@ -180,16 +180,16 @@
return ((_spriteTable[spriteId].flags & kSF13) != 0) ? 1 : 0;
}
-int ScummEngine_v90he::spriteInfoGet_flags_14(int spriteId) {
+int ScummEngine_v90he::spriteInfoGet_flagYFlipped(int spriteId) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
- return ((_spriteTable[spriteId].flags & kSF14) != 0) ? 1 : 0;
+ return ((_spriteTable[spriteId].flags & kSFYFlipped) != 0) ? 1 : 0;
}
-int ScummEngine_v90he::spriteInfoGet_flags_15(int spriteId) {
+int ScummEngine_v90he::spriteInfoGet_flagXFlipped(int spriteId) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
- return ((_spriteTable[spriteId].flags & kSF15) != 0) ? 1 : 0;
+ return ((_spriteTable[spriteId].flags & kSFXFlipped) != 0) ? 1 : 0;
}
int ScummEngine_v90he::spriteInfoGet_flagActive(int spriteId) {
@@ -558,9 +558,9 @@
int oldFlags = _spriteTable[spriteId].flags;
if (value)
- _spriteTable[spriteId].flags |= kSF14;
+ _spriteTable[spriteId].flags |= kSFYFlipped;
else
- _spriteTable[spriteId].flags &= ~(kSF09 | kSF14);
+ _spriteTable[spriteId].flags &= ~(kSF09 | kSFYFlipped);
if (_spriteTable[spriteId].res_id && _spriteTable[spriteId].flags != oldFlags)
_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
@@ -571,9 +571,9 @@
int oldFlags = _spriteTable[spriteId].flags;
if (value)
- _spriteTable[spriteId].flags |= kSF15;
+ _spriteTable[spriteId].flags |= kSFXFlipped;
else
- _spriteTable[spriteId].flags &= ~(kSF09 | kSF15);
+ _spriteTable[spriteId].flags &= ~(kSF09 | kSFXFlipped);
if (_spriteTable[spriteId].res_id && _spriteTable[spriteId].flags != oldFlags)
_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
@@ -681,7 +681,7 @@
_spriteTable[spriteId].tx = 0;
_spriteTable[spriteId].ty = 0;
- _spriteTable[spriteId].flags &= ~(kSF09 | kSF14 | kSF15);
+ _spriteTable[spriteId].flags &= ~(kSF09 | kSFYFlipped | kSFXFlipped);
_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
_spriteTable[spriteId].dx = 0;
_spriteTable[spriteId].dy = 0;
@@ -1235,9 +1235,9 @@
}
wiz.img.flags = 0x10;
- if (spr_flags & kSF15)
+ if (spr_flags & kSFXFlipped)
wiz.img.flags |= kWIFFlipX;
- if (spr_flags & kSF14)
+ if (spr_flags & kSFYFlipped)
wiz.img.flags |= kWIFFlipY;
if (spr_flags & kSF13) {
wiz.img.flags &= ~(0x11);
Index: sprite_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- sprite_he.h 13 Mar 2005 12:59:25 -0000 1.22
+++ sprite_he.h 13 Mar 2005 13:10:39 -0000 1.23
@@ -39,8 +39,8 @@
kSF11 = (1 << 10),
kSF12 = (1 << 11),
kSF13 = (1 << 12),
- kSF14 = (1 << 13),
- kSF15 = (1 << 14),
+ kSFYFlipped = (1 << 13),
+ kSFXFlipped = (1 << 14),
kSFActive = (1 << 15),
kSF17 = (1 << 16),
kSF18 = (1 << 17),
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.392,2.393 script_v100he.cpp,2.87,2.88 script_v90he.cpp,2.182,2.183 sprite_he.cpp,1.98,1.99 sprite_he.h,1.21,1.22
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky text.cpp,1.65,1.66
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list