[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.377,2.378 script_v100he.cpp,2.69,2.70 script_v90he.cpp,2.168,2.169 sprite_he.cpp,1.76,1.77
kirben
kirben at users.sourceforge.net
Sun Feb 27 20:21:53 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18227/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.377
retrieving revision 2.378
diff -u -d -r2.377 -r2.378
--- intern.h 27 Feb 2005 06:01:10 -0000 2.377
+++ intern.h 28 Feb 2005 04:17:17 -0000 2.378
@@ -974,16 +974,16 @@
void spriteGroupSet_case0_5(int spriteGroupId, int value);
void spriteGroupSet_case0_6(int spriteGroupId, int value);
void spriteGroupSet_case0_7(int spriteGroupId, int value);
- void spriteGroupSet_case5_0(int spriteGroupId, int value);
- void spriteGroupSet_case5_1(int spriteGroupId, int value);
- void spriteGroupSet_case5_2(int spriteGroupId, int value);
- void spriteGroupSet_case5_3(int spriteGroupId, int value);
+ void spriteGroupSet_bbox(int spriteGroupId, int x1, int y1, int x2, int y2);
void spriteGroupSet_zorderPriority(int spriteGroupId, int value);
void spriteGroupSet_tx_ty(int spriteGroupId, int value1, int value2);
- void spriteGroupSet_case26(int spriteGroupId, int value);
- void spriteGroupSet_case28(int spriteGroupId, int value1, int value2);
- void spriteGroupSet_bbox(int spriteGroupId, int x1, int y1, int x2, int y2);
- void spriteGroupSet_case56(int spriteGroupId);
+ void spriteGroupSet_inc_tx_ty(int spriteGroupId, int value1, int value2);
+ void spriteGroupSet_field_20(int spriteGroupId, int value);
+ void spriteGroupSet_scale_x_ratio_mul(int spriteGroupId, int value);
+ void spriteGroupSet_scale_x_ratio_div(int spriteGroupId, int value);
+ void spriteGroupSet_scale_y_ratio_mul(int spriteGroupId, int value);
+ void spriteGroupSet_scale_y_ratio_div(int spriteGroupId, int value);
+ void spriteGroupSet_flagNeedRedrawAnd(int spriteGroupId);
void spritesAllocTables(int numSprites, int numGroups, int numMaxSprites);
void spritesResetGroup(int spriteGroupId);
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.69
retrieving revision 2.70
diff -u -d -r2.69 -r2.70
--- script_v100he.cpp 26 Feb 2005 11:22:00 -0000 2.69
+++ script_v100he.cpp 28 Feb 2005 04:17:17 -0000 2.70
@@ -848,7 +848,7 @@
if (!_curSpriteGroupId)
break;
- spriteGroupSet_case28(_curSpriteGroupId, value1, value2);
+ spriteGroupSet_tx_ty(_curSpriteGroupId, value1, value2);
break;
case 18:
value4 = pop();
@@ -928,7 +928,7 @@
if (!_curSpriteGroupId)
break;
- spriteGroupSet_case26(_curSpriteGroupId, value1);
+ spriteGroupSet_field_20(_curSpriteGroupId, value1);
break;
case 49:
value2 = pop();
@@ -936,7 +936,7 @@
if (!_curSpriteGroupId)
break;
- spriteGroupSet_tx_ty(_curSpriteGroupId, value1, value2);
+ spriteGroupSet_inc_tx_ty(_curSpriteGroupId, value1, value2);
break;
case 52:
copyScriptString(string);
@@ -967,16 +967,16 @@
switch (type) {
case 0:
- spriteGroupSet_case5_0(_curSpriteGroupId, value1);
+ spriteGroupSet_scale_x_ratio_mul(_curSpriteGroupId, value1);
break;
case 1:
- spriteGroupSet_case5_1(_curSpriteGroupId, value1);
+ spriteGroupSet_scale_x_ratio_div(_curSpriteGroupId, value1);
break;
case 2:
- spriteGroupSet_case5_2(_curSpriteGroupId, value1);
+ spriteGroupSet_scale_y_ratio_mul(_curSpriteGroupId, value1);
break;
case 3:
- spriteGroupSet_case5_3(_curSpriteGroupId, value1);
+ spriteGroupSet_scale_y_ratio_div(_curSpriteGroupId, value1);
break;
default:
error("o100_setSpriteGroupInfo subOp 60: Unknown case %d", subOp);
@@ -986,7 +986,7 @@
if (!_curSpriteGroupId)
break;
- spriteGroupSet_case56(_curSpriteGroupId);
+ spriteGroupSet_flagNeedRedrawAnd(_curSpriteGroupId);
break;
default:
error("o100_setSpriteGroupInfo: Unknown case %d", subOp);
Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.168
retrieving revision 2.169
diff -u -d -r2.168 -r2.169
--- script_v90he.cpp 27 Feb 2005 02:55:13 -0000 2.168
+++ script_v90he.cpp 28 Feb 2005 04:17:17 -0000 2.169
@@ -1451,16 +1451,16 @@
switch (type) {
case 0:
- spriteGroupSet_case5_0(_curSpriteGroupId, value1);
+ spriteGroupSet_scale_x_ratio_mul(_curSpriteGroupId, value1);
break;
case 1:
- spriteGroupSet_case5_1(_curSpriteGroupId, value1);
+ spriteGroupSet_scale_x_ratio_div(_curSpriteGroupId, value1);
break;
case 2:
- spriteGroupSet_case5_2(_curSpriteGroupId, value1);
+ spriteGroupSet_scale_y_ratio_mul(_curSpriteGroupId, value1);
break;
case 3:
- spriteGroupSet_case5_3(_curSpriteGroupId, value1);
+ spriteGroupSet_scale_y_ratio_div(_curSpriteGroupId, value1);
break;
default:
error("o90_setSpriteGroupInfo subOp 5: Unknown case %d", subOp);
@@ -1479,7 +1479,7 @@
if (!_curSpriteGroupId)
break;
- spriteGroupSet_tx_ty(_curSpriteGroupId, value1, value2);
+ spriteGroupSet_inc_tx_ty(_curSpriteGroupId, value1, value2);
break;
case 20:
_curSpriteGroupId = pop();
@@ -1489,7 +1489,7 @@
if (!_curSpriteGroupId)
break;
- spriteGroupSet_case26(_curSpriteGroupId, value1);
+ spriteGroupSet_field_20(_curSpriteGroupId, value1);
break;
case 28:
value2 = pop();
@@ -1497,7 +1497,7 @@
if (!_curSpriteGroupId)
break;
- spriteGroupSet_case28(_curSpriteGroupId, value1, value2);
+ spriteGroupSet_tx_ty(_curSpriteGroupId, value1, value2);
break;
case 30:
value4 = pop();
@@ -1513,7 +1513,7 @@
if (!_curSpriteGroupId)
break;
- spriteGroupSet_case56(_curSpriteGroupId);
+ spriteGroupSet_flagNeedRedrawAnd(_curSpriteGroupId);
break;
case 180:
if (!_curSpriteGroupId)
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- sprite_he.cpp 27 Feb 2005 06:07:09 -0000 1.76
+++ sprite_he.cpp 28 Feb 2005 04:17:17 -0000 1.77
@@ -855,130 +855,130 @@
}
}
-void ScummEngine_v90he::spriteGroupSet_case5_0(int spriteGroupId, int value) {
+void ScummEngine_v90he::spriteGroupSet_bbox(int spriteGroupId, int x1, int y1, int x2, int y2) {
checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
- if (_spriteGroups[spriteGroupId].scale_x_ratio_mul == value)
- return;
-
- _spriteGroups[spriteGroupId].scale_x_ratio_mul = value;
- _spriteGroups[spriteGroupId].scale_x = _spriteGroups[spriteGroupId].scale_x_ratio_mul / _spriteGroups[spriteGroupId].scale_x_ratio_div;
-
- if ((_spriteGroups[spriteGroupId].scale_x_ratio_mul != _spriteGroups[spriteGroupId].scale_x_ratio_div) || (_spriteGroups[spriteGroupId].scale_y_ratio_mul != _spriteGroups[spriteGroupId].scale_y_ratio_div))
- _spriteGroups[spriteGroupId].scaling = 1;
- else
- _spriteGroups[spriteGroupId].scaling = 0;
+ _spriteGroups[spriteGroupId].flags |= kSGFClipBox;
+ _spriteGroups[spriteGroupId].bbox.left = x1;
+ _spriteGroups[spriteGroupId].bbox.top = y1;
+ _spriteGroups[spriteGroupId].bbox.right = x2;
+ _spriteGroups[spriteGroupId].bbox.bottom = y2;
redrawSpriteGroup(spriteGroupId);
}
-void ScummEngine_v90he::spriteGroupSet_case5_1(int spriteGroupId, int value) {
+void ScummEngine_v90he::spriteGroupSet_zorderPriority(int spriteGroupId, int value) {
checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
- if (_spriteGroups[spriteGroupId].scale_x_ratio_div == value)
+ if (_spriteGroups[spriteGroupId].zorderPriority == value)
return;
- _spriteGroups[spriteGroupId].scale_x_ratio_div = value;
- _spriteGroups[spriteGroupId].scale_x = _spriteGroups[spriteGroupId].scale_x_ratio_mul / _spriteGroups[spriteGroupId].scale_x_ratio_div;
-
- if ((_spriteGroups[spriteGroupId].scale_x_ratio_mul != _spriteGroups[spriteGroupId].scale_x_ratio_div) || (_spriteGroups[spriteGroupId].scale_y_ratio_mul != _spriteGroups[spriteGroupId].scale_y_ratio_div))
- _spriteGroups[spriteGroupId].scaling = 1;
- else
- _spriteGroups[spriteGroupId].scaling = 0;
+ _spriteGroups[spriteGroupId].zorderPriority = value;
redrawSpriteGroup(spriteGroupId);
}
-void ScummEngine_v90he::spriteGroupSet_case5_2(int spriteGroupId, int value) {
+void ScummEngine_v90he::spriteGroupSet_tx_ty(int spriteGroupId, int value1, int value2) {
checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
- if (_spriteGroups[spriteGroupId].scale_y_ratio_mul == value)
+ if (_spriteGroups[spriteGroupId].tx == value1 && _spriteGroups[spriteGroupId].ty == value2)
return;
- _spriteGroups[spriteGroupId].scale_y_ratio_mul = value;
- _spriteGroups[spriteGroupId].scale_y = _spriteGroups[spriteGroupId].scale_y_ratio_mul / _spriteGroups[spriteGroupId].scale_y_ratio_div;
-
- if ((_spriteGroups[spriteGroupId].scale_x_ratio_mul != _spriteGroups[spriteGroupId].scale_x_ratio_div) || (_spriteGroups[spriteGroupId].scale_y_ratio_mul != _spriteGroups[spriteGroupId].scale_y_ratio_div))
- _spriteGroups[spriteGroupId].scaling = 1;
- else
- _spriteGroups[spriteGroupId].scaling = 0;
+ _spriteGroups[spriteGroupId].tx = value1;
+ _spriteGroups[spriteGroupId].ty = value2;
redrawSpriteGroup(spriteGroupId);
}
-void ScummEngine_v90he::spriteGroupSet_case5_3(int spriteGroupId, int value) {
+void ScummEngine_v90he::spriteGroupSet_inc_tx_ty(int spriteGroupId, int value1, int value2) {
checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
- if (_spriteGroups[spriteGroupId].scale_y_ratio_div == value)
- return;
-
- _spriteGroups[spriteGroupId].scale_y_ratio_div = value;
- _spriteGroups[spriteGroupId].scale_y = _spriteGroups[spriteGroupId].scale_y_ratio_mul / _spriteGroups[spriteGroupId].scale_y_ratio_div;
-
- if ((_spriteGroups[spriteGroupId].scale_x_ratio_mul != _spriteGroups[spriteGroupId].scale_x_ratio_div) || (_spriteGroups[spriteGroupId].scale_y_ratio_mul != _spriteGroups[spriteGroupId].scale_y_ratio_div))
- _spriteGroups[spriteGroupId].scaling = 1;
- else
- _spriteGroups[spriteGroupId].scaling = 0;
+ _spriteGroups[spriteGroupId].tx += value1;
+ _spriteGroups[spriteGroupId].ty += value2;
redrawSpriteGroup(spriteGroupId);
}
-void ScummEngine_v90he::spriteGroupSet_zorderPriority(int spriteGroupId, int value) {
+void ScummEngine_v90he::spriteGroupSet_field_20(int spriteGroupId, int value) {
checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
- if (_spriteGroups[spriteGroupId].zorderPriority == value)
+ if (_spriteGroups[spriteGroupId].field_20 == value)
return;
- _spriteGroups[spriteGroupId].zorderPriority = value;
+ _spriteGroups[spriteGroupId].field_20 = value;
redrawSpriteGroup(spriteGroupId);
}
-void ScummEngine_v90he::spriteGroupSet_tx_ty(int spriteGroupId, int value1, int value2) {
+void ScummEngine_v90he::spriteGroupSet_scale_x_ratio_mul(int spriteGroupId, int value) {
checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
- _spriteGroups[spriteGroupId].tx += value1;
- _spriteGroups[spriteGroupId].ty += value2;
+ if (_spriteGroups[spriteGroupId].scale_x_ratio_mul == value)
+ return;
+
+ _spriteGroups[spriteGroupId].scale_x_ratio_mul = value;
+ _spriteGroups[spriteGroupId].scale_x = _spriteGroups[spriteGroupId].scale_x_ratio_mul / _spriteGroups[spriteGroupId].scale_x_ratio_div;
+
+ if ((_spriteGroups[spriteGroupId].scale_x_ratio_mul != _spriteGroups[spriteGroupId].scale_x_ratio_div) || (_spriteGroups[spriteGroupId].scale_y_ratio_mul != _spriteGroups[spriteGroupId].scale_y_ratio_div))
+ _spriteGroups[spriteGroupId].scaling = 1;
+ else
+ _spriteGroups[spriteGroupId].scaling = 0;
redrawSpriteGroup(spriteGroupId);
}
-void ScummEngine_v90he::spriteGroupSet_case26(int spriteGroupId, int value) {
+void ScummEngine_v90he::spriteGroupSet_scale_x_ratio_div(int spriteGroupId, int value) {
checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
- if (_spriteGroups[spriteGroupId].field_20 == value)
+ if (_spriteGroups[spriteGroupId].scale_x_ratio_div == value)
return;
- _spriteGroups[spriteGroupId].field_20 = value;
+ _spriteGroups[spriteGroupId].scale_x_ratio_div = value;
+ _spriteGroups[spriteGroupId].scale_x = _spriteGroups[spriteGroupId].scale_x_ratio_mul / _spriteGroups[spriteGroupId].scale_x_ratio_div;
+
+ if ((_spriteGroups[spriteGroupId].scale_x_ratio_mul != _spriteGroups[spriteGroupId].scale_x_ratio_div) || (_spriteGroups[spriteGroupId].scale_y_ratio_mul != _spriteGroups[spriteGroupId].scale_y_ratio_div))
+ _spriteGroups[spriteGroupId].scaling = 1;
+ else
+ _spriteGroups[spriteGroupId].scaling = 0;
redrawSpriteGroup(spriteGroupId);
}
-void ScummEngine_v90he::spriteGroupSet_case28(int spriteGroupId, int value1, int value2) {
+void ScummEngine_v90he::spriteGroupSet_scale_y_ratio_mul(int spriteGroupId, int value) {
checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
- if (_spriteGroups[spriteGroupId].tx == value1 && _spriteGroups[spriteGroupId].ty == value2)
+ if (_spriteGroups[spriteGroupId].scale_y_ratio_mul == value)
return;
- _spriteGroups[spriteGroupId].tx = value1;
- _spriteGroups[spriteGroupId].ty = value2;
+ _spriteGroups[spriteGroupId].scale_y_ratio_mul = value;
+ _spriteGroups[spriteGroupId].scale_y = _spriteGroups[spriteGroupId].scale_y_ratio_mul / _spriteGroups[spriteGroupId].scale_y_ratio_div;
+
+ if ((_spriteGroups[spriteGroupId].scale_x_ratio_mul != _spriteGroups[spriteGroupId].scale_x_ratio_div) || (_spriteGroups[spriteGroupId].scale_y_ratio_mul != _spriteGroups[spriteGroupId].scale_y_ratio_div))
+ _spriteGroups[spriteGroupId].scaling = 1;
+ else
+ _spriteGroups[spriteGroupId].scaling = 0;
redrawSpriteGroup(spriteGroupId);
}
-void ScummEngine_v90he::spriteGroupSet_bbox(int spriteGroupId, int x1, int y1, int x2, int y2) {
+void ScummEngine_v90he::spriteGroupSet_scale_y_ratio_div(int spriteGroupId, int value) {
checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
- _spriteGroups[spriteGroupId].flags |= kSGFClipBox;
- _spriteGroups[spriteGroupId].bbox.left = x1;
- _spriteGroups[spriteGroupId].bbox.top = y1;
- _spriteGroups[spriteGroupId].bbox.right = x2;
- _spriteGroups[spriteGroupId].bbox.bottom = y2;
+ if (_spriteGroups[spriteGroupId].scale_y_ratio_div == value)
+ return;
+
+ _spriteGroups[spriteGroupId].scale_y_ratio_div = value;
+ _spriteGroups[spriteGroupId].scale_y = _spriteGroups[spriteGroupId].scale_y_ratio_mul / _spriteGroups[spriteGroupId].scale_y_ratio_div;
+
+ if ((_spriteGroups[spriteGroupId].scale_x_ratio_mul != _spriteGroups[spriteGroupId].scale_x_ratio_div) || (_spriteGroups[spriteGroupId].scale_y_ratio_mul != _spriteGroups[spriteGroupId].scale_y_ratio_div))
+ _spriteGroups[spriteGroupId].scaling = 1;
+ else
+ _spriteGroups[spriteGroupId].scaling = 0;
redrawSpriteGroup(spriteGroupId);
}
-void ScummEngine_v90he::spriteGroupSet_case56(int spriteGroupId) {
+void ScummEngine_v90he::spriteGroupSet_flagNeedRedrawAnd(int spriteGroupId) {
checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
_spriteGroups[spriteGroupId].flags &= ~(kSGFNeedRedraw);
More information about the Scummvm-git-logs
mailing list