[Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.163,2.164 script_v90he.cpp,2.270,2.271 sprite_he.cpp,1.148,1.149 sprite_he.h,1.41,1.42
kirben
kirben at users.sourceforge.net
Sun Jun 5 01:23:08 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.162,2.163 script_v90he.cpp,2.269,2.270 sprite_he.cpp,1.147,1.148 wiz_he.cpp,2.87,2.88 wiz_he.h,2.25,2.26
- Next message: [Scummvm-cvs-logs] CVS: scummvm/dists/msvc8 common.vcproj,NONE,1.1 gob.vcproj,1.2,1.3 kyra.vcproj,1.3,1.4 queen.vcproj,1.1,1.2 saga.vcproj,1.6,1.7 scumm.vcproj,1.8,1.9 scummvm.sln,1.2,1.3 scummvm.vcproj,1.17,1.18 simon.vcproj,1.2,1.3 sky.vcproj,1.2,1.3 sword1.vcproj,1.2,1.3 sword2.vcproj,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15204/scumm
Modified Files:
script_v100he.cpp script_v90he.cpp sprite_he.cpp sprite_he.h
Log Message:
Ooops, mixed up one function name.
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.163
retrieving revision 2.164
diff -u -d -r2.163 -r2.164
--- script_v100he.cpp 5 Jun 2005 08:15:29 -0000 2.163
+++ script_v100he.cpp 5 Jun 2005 08:22:09 -0000 2.164
@@ -884,7 +884,7 @@
if (!_curSpriteGroupId)
break;
- _sprite->moveGroup(_curSpriteGroupId, value1, value2);
+ _sprite->setGroupPosition(_curSpriteGroupId, value1, value2);
break;
case 18:
value4 = pop();
@@ -972,7 +972,7 @@
if (!_curSpriteGroupId)
break;
- _sprite->setGroupinc_tx_ty(_curSpriteGroupId, value1, value2);
+ _sprite->moveGroup(_curSpriteGroupId, value1, value2);
break;
case 52:
copyScriptString(string, sizeof(string));
Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.270
retrieving revision 2.271
diff -u -d -r2.270 -r2.271
--- script_v90he.cpp 5 Jun 2005 08:15:29 -0000 2.270
+++ script_v90he.cpp 5 Jun 2005 08:22:09 -0000 2.271
@@ -1614,7 +1614,7 @@
if (!_curSpriteGroupId)
break;
- _sprite->setGroupinc_tx_ty(_curSpriteGroupId, value1, value2);
+ _sprite->moveGroup(_curSpriteGroupId, value1, value2);
break;
case 20:
_curSpriteGroupId = pop();
@@ -1632,7 +1632,7 @@
if (!_curSpriteGroupId)
break;
- _sprite->moveGroup(_curSpriteGroupId, value1, value2);
+ _sprite->setGroupPosition(_curSpriteGroupId, value1, value2);
break;
case 30:
value4 = pop();
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- sprite_he.cpp 5 Jun 2005 08:15:29 -0000 1.148
+++ sprite_he.cpp 5 Jun 2005 08:22:09 -0000 1.149
@@ -951,7 +951,7 @@
}
}
-void Sprite::moveGroup(int spriteGroupId, int value1, int value2) {
+void Sprite::setGroupPosition(int spriteGroupId, int value1, int value2) {
checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
if (_spriteGroups[spriteGroupId].tx != value1 || _spriteGroups[spriteGroupId].ty != value2) {
@@ -961,7 +961,7 @@
}
}
-void Sprite::setGroupinc_tx_ty(int spriteGroupId, int value1, int value2) {
+void Sprite::moveGroup(int spriteGroupId, int value1, int value2) {
checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
if (value1 || value2) {
Index: sprite_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- sprite_he.h 5 Jun 2005 08:02:50 -0000 1.41
+++ sprite_he.h 5 Jun 2005 08:22:09 -0000 1.42
@@ -196,8 +196,8 @@
void setGroupMembersShadow(int spriteGroupId, int value);
void setGroupBounds(int spriteGroupId, int x1, int y1, int x2, int y2);
void setGroupPriority(int spriteGroupId, int value);
+ void setGroupPosition(int spriteGroupId, int value1, int value2);
void moveGroup(int spriteGroupId, int value1, int value2);
- void setGroupinc_tx_ty(int spriteGroupId, int value1, int value2);
void setGroupImage(int spriteGroupId, int value);
void setGroupScaling(int spriteGroupId);
void setGroupScale_x_ratio_mul(int spriteGroupId, int value);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.162,2.163 script_v90he.cpp,2.269,2.270 sprite_he.cpp,1.147,1.148 wiz_he.cpp,2.87,2.88 wiz_he.h,2.25,2.26
- Next message: [Scummvm-cvs-logs] CVS: scummvm/dists/msvc8 common.vcproj,NONE,1.1 gob.vcproj,1.2,1.3 kyra.vcproj,1.3,1.4 queen.vcproj,1.1,1.2 saga.vcproj,1.6,1.7 scumm.vcproj,1.8,1.9 scummvm.sln,1.2,1.3 scummvm.vcproj,1.17,1.18 simon.vcproj,1.2,1.3 sky.vcproj,1.2,1.3 sword1.vcproj,1.2,1.3 sword2.vcproj,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list