[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.397,2.398 script_v100he.cpp,2.92,2.93 script_v90he.cpp,2.187,2.188 sprite_he.cpp,1.103,1.104
kirben
kirben at users.sourceforge.net
Thu Mar 17 01:44:23 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.396,2.397 script_v100he.cpp,2.91,2.92 script_v90he.cpp,2.186,2.187 sprite_he.cpp,1.102,1.103 sprite_he.h,1.24,1.25
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/sdl graphics.cpp,1.32,1.33
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8785/scumm
Modified Files:
intern.h script_v100he.cpp script_v90he.cpp sprite_he.cpp
Log Message:
Rename sprite functions
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.397
retrieving revision 2.398
diff -u -d -r2.397 -r2.398
--- intern.h 17 Mar 2005 09:28:25 -0000 2.397
+++ intern.h 17 Mar 2005 09:42:31 -0000 2.398
@@ -962,12 +962,12 @@
void spriteInfoSet_zoom(int spriteId, int value);
void spriteInfoSet_rotAngle(int spriteId, int value);
void spriteInfoSet_flag13(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);
void spriteInfoSet_flagXFlipped(int spriteId, int value);
+ void spriteInfoSet_flagActive(int spriteId, int value);
+ void spriteInfoSet_flag20(int spriteId, int value);
+ void spriteInfoSet_flag22(int spriteId, int value);
+ void spriteInfoSet_flag23(int spriteId, int value);
void spriteInfoSet_flagHasImage(int spriteId, int value);
void spriteInfoSet_delay(int spriteId, int value);
void spriteInfoSet_setClassFlags(int spriteId, int value);
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.92
retrieving revision 2.93
diff -u -d -r2.92 -r2.93
--- script_v100he.cpp 17 Mar 2005 09:28:36 -0000 2.92
+++ script_v100he.cpp 17 Mar 2005 09:42:31 -0000 2.93
@@ -1759,7 +1759,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- spriteInfoSet_flagYFlipped(spriteId, args[0]);
+ spriteInfoSet_flag22(spriteId, args[0]);
break;
case 4:
args[0] = pop();
@@ -1926,10 +1926,10 @@
for (; spriteId <= _curMaxSpriteId; spriteId++)
switch(args[1]) {
case 0:
- spriteInfoGet_flagXFlipped(spriteId, args[0]);
+ spriteInfoSet_flagXFlipped(spriteId, args[0]);
break;
case 1:
- spriteInfoGet_flagYFlipped(spriteId, args[0]);
+ spriteInfoSet_flagYFlipped(spriteId, args[0]);
break;
case 2:
spriteInfoSet_flagActive(spriteId, args[0]);
@@ -2029,7 +2029,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- spriteInfoSet_flagXFlipped(spriteId, args[0]);
+ spriteInfoSet_flag23(spriteId, args[0]);
break;
case 83:
args[1] = pop();
Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.187
retrieving revision 2.188
diff -u -d -r2.187 -r2.188
--- script_v90he.cpp 17 Mar 2005 09:28:36 -0000 2.187
+++ script_v90he.cpp 17 Mar 2005 09:42:31 -0000 2.188
@@ -1057,10 +1057,10 @@
for (; spriteId <= _curMaxSpriteId; spriteId++)
switch(args[1]) {
case 0:
- spriteInfoGet_flagXFlipped(spriteId, args[0]);
+ spriteInfoSet_flagXFlipped(spriteId, args[0]);
break;
case 1:
- spriteInfoGet_flagYFlipped(spriteId, args[0]);
+ spriteInfoSet_flagYFlipped(spriteId, args[0]);
break;
case 2:
spriteInfoSet_flagActive(spriteId, args[0]);
@@ -1198,7 +1198,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- spriteInfoSet_flagYFlipped(spriteId, args[0]);
+ spriteInfoSet_flag22(spriteId, args[0]);
break;
case 52: // HE 98+
args[0] = pop();
@@ -1253,7 +1253,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- spriteInfoSet_flagXFlipped(spriteId, args[0]);
+ spriteInfoSet_flag23(spriteId, args[0]);
break;
case 91:
n = getStackList(args, ARRAYSIZE(args));
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- sprite_he.cpp 17 Mar 2005 09:28:36 -0000 1.103
+++ sprite_he.cpp 17 Mar 2005 09:42:31 -0000 1.104
@@ -553,7 +553,7 @@
_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
}
-void ScummEngine_v90he::spriteInfoGet_flagYFlipped(int spriteId, int value) {
+void ScummEngine_v90he::spriteInfoSet_flagYFlipped(int spriteId, int value) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
int oldFlags = _spriteTable[spriteId].flags;
@@ -566,7 +566,7 @@
_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
}
-void ScummEngine_v90he::spriteInfoGet_flagXFlipped(int spriteId, int value) {
+void ScummEngine_v90he::spriteInfoSet_flagXFlipped(int spriteId, int value) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
int oldFlags = _spriteTable[spriteId].flags;
@@ -601,7 +601,7 @@
_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
}
-void ScummEngine_v90he::spriteInfoSet_flagYFlipped(int spriteId, int value) {
+void ScummEngine_v90he::spriteInfoSet_flag22(int spriteId, int value) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
if (value)
@@ -610,7 +610,7 @@
_spriteTable[spriteId].flags &= ~kSF22;
}
-void ScummEngine_v90he::spriteInfoSet_flagXFlipped(int spriteId, int value) {
+void ScummEngine_v90he::spriteInfoSet_flag23(int spriteId, int value) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
if (value)
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.396,2.397 script_v100he.cpp,2.91,2.92 script_v90he.cpp,2.186,2.187 sprite_he.cpp,1.102,1.103 sprite_he.h,1.24,1.25
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/sdl graphics.cpp,1.32,1.33
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list