[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.506,2.507 script_v100he.cpp,2.161,2.162 script_v90he.cpp,2.268,2.269 sprite_he.cpp,1.146,1.147 sprite_he.h,1.40,1.41 wiz_he.cpp,2.86,2.87 wiz_he.h,2.24,2.25
kirben
kirben at users.sourceforge.net
Sun Jun 5 01:05:37 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.459,2.460 script_v90he.cpp,2.267,2.268
- Next 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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7320/scumm
Modified Files:
intern.h script_v100he.cpp script_v90he.cpp sprite_he.cpp
sprite_he.h wiz_he.cpp wiz_he.h
Log Message:
Rename sprite functions, based on map.
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.506
retrieving revision 2.507
diff -u -d -r2.506 -r2.507
--- intern.h 1 Jun 2005 00:39:22 -0000 2.506
+++ intern.h 5 Jun 2005 08:02:49 -0000 2.507
@@ -1125,7 +1125,7 @@
void sortArray(int array, int dim2start, int dim2end, int dim1start, int dim1end, int sortOrder);
public:
- int getGroupallocateGroupSpritesList(int spriteGroupId);
+ int getGroupSpriteArray(int spriteGroupId);
protected:
uint8 *getHEPaletteIndex(int palSlot);
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.161
retrieving revision 2.162
diff -u -d -r2.161 -r2.162
--- script_v100he.cpp 4 Jun 2005 02:26:51 -0000 2.161
+++ script_v100he.cpp 5 Jun 2005 08:02:50 -0000 2.162
@@ -884,7 +884,7 @@
if (!_curSpriteGroupId)
break;
- _sprite->setGrouptx_ty(_curSpriteGroupId, value1, value2);
+ _sprite->moveGroup(_curSpriteGroupId, value1, value2);
break;
case 18:
value4 = pop();
@@ -894,7 +894,7 @@
if (!_curSpriteGroupId)
break;
- _sprite->setGroupbbox(_curSpriteGroupId, value1, value2, value3, value4);
+ _sprite->setGroupBounds(_curSpriteGroupId, value1, value2, value3, value4);
break;
case 38:
type = pop() - 1;
@@ -905,55 +905,55 @@
if (!_curSpriteGroupId)
break;
- _sprite->setGroupCase0_0(_curSpriteGroupId, value1, value2);
+ _sprite->moveGroupMembers(_curSpriteGroupId, value1, value2);
break;
case 1:
value1 = pop();
if (!_curSpriteGroupId)
break;
- _sprite->setGroupCase0_1(_curSpriteGroupId, value1);
+ _sprite->setGroupMembersPriority(_curSpriteGroupId, value1);
break;
case 2:
value1 = pop();
if (!_curSpriteGroupId)
break;
- _sprite->setGroupCase0_2(_curSpriteGroupId, value1);
+ _sprite->setGroupMembersGroup(_curSpriteGroupId, value1);
break;
case 3:
value1 = pop();
if (!_curSpriteGroupId)
break;
- _sprite->setGroupCase0_3(_curSpriteGroupId, value1);
+ _sprite->setGroupMembersUpdateType(_curSpriteGroupId, value1);
break;
case 4:
if (!_curSpriteGroupId)
break;
- _sprite->setGroupCase0_4(_curSpriteGroupId);
+ _sprite->setGroupMembersResetSprite(_curSpriteGroupId);
break;
case 5:
value1 = pop();
if (!_curSpriteGroupId)
break;
- _sprite->setGroupCase0_5(_curSpriteGroupId, value1);
+ _sprite->setGroupMembersAnimationSpeed(_curSpriteGroupId, value1);
break;
case 6:
value1 = pop();
if (!_curSpriteGroupId)
break;
- _sprite->setGroupCase0_6(_curSpriteGroupId, value1);
+ _sprite->setGroupMembersAutoAnimFlag(_curSpriteGroupId, value1);
break;
case 7:
value1 = pop();
if (!_curSpriteGroupId)
break;
- _sprite->setGroupCase0_7(_curSpriteGroupId, value1);
+ _sprite->setGroupMembersShadow(_curSpriteGroupId, value1);
break;
default:
error("o100_setSpriteGroupInfo subOp 38: Unknown case %d", subOp);
@@ -964,7 +964,7 @@
if (!_curSpriteGroupId)
break;
- _sprite->setGroupdstResNum(_curSpriteGroupId, value1);
+ _sprite->setGroupImage(_curSpriteGroupId, value1);
break;
case 49:
value2 = pop();
@@ -993,7 +993,7 @@
if (!_curSpriteGroupId)
break;
- _sprite->setGroupzorderPriority(_curSpriteGroupId, value1);
+ _sprite->setGroupPriority(_curSpriteGroupId, value1);
break;
case 60:
type = pop();
@@ -1022,7 +1022,7 @@
if (!_curSpriteGroupId)
break;
- _sprite->setGroupflagClipBoxAnd(_curSpriteGroupId);
+ _sprite->resetGroupBounds(_curSpriteGroupId);
break;
default:
error("o100_setSpriteGroupInfo: Unknown case %d", subOp);
@@ -1137,7 +1137,7 @@
_wizParams.field_184 = 0;
_wizParams.field_180 = 0;
_wizParams.spriteId = 0;
- _wizParams.groupNum = 0;
+ _wizParams.spriteGroup = 0;
break;
case 2:
_wizParams.processFlags |= kWPFRotate;
@@ -1151,7 +1151,7 @@
break;
case 7:
_wizParams.processFlags |= kWPFMaskImg;
- _wizParams.maskImgResNum = pop();
+ _wizParams.sourceImage = pop();
break;
case 11:
_wizParams.processFlags |= kWPFClipBox | 0x100;
@@ -1219,13 +1219,13 @@
_wizParams.img.y1 = pop();
_wizParams.img.x1 = pop();
_wizParams.spriteId = 0;
- _wizParams.groupNum = 0;
+ _wizParams.spriteGroup = 0;
_wizParams.img.resNum = pop();
_wiz->displayWizImage(&_wizParams.img);
break;
case 57:
_wizParams.processFlags |= kWPFPaletteNum;
- _wizParams.img.paletteNum = pop();
+ _wizParams.img.palette = pop();
break;
case 58:
_wizParams.processFlags |= 0x1000 | 0x100 | 0x2;
@@ -1241,8 +1241,8 @@
_wizParams.fileWriteMode = pop();
break;
case 65:
- _wizParams.processFlags |= kWPFZoom;
- _wizParams.zoom = pop();
+ _wizParams.processFlags |= kWPFScaled;
+ _wizParams.scale = pop();
break;
case 67:
_wizParams.processFlags |= kWPFNewFlags;
@@ -1254,8 +1254,8 @@
_wizParams.field_164 = _wizParams.img.y1 = _wizParams.img.x1 = pop();
break;
case 70:
- _wizParams.processFlags |= kWPFXmapNum;
- _wizParams.xmapNum = pop();
+ _wizParams.processFlags |= kWPFShadow;
+ _wizParams.shadow = pop();
break;
case 73:
_wizParams.processFlags |= kWPFNewState;
@@ -1726,7 +1726,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteFlagDelayed(spriteId, args[0]);
+ _sprite->setSpriteFlagAutoAnim(spriteId, args[0]);
break;
case 4:
args[0] = pop();
@@ -1737,7 +1737,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteDelay(spriteId, args[0]);
+ _sprite->setSpriteAnimSpeed(spriteId, args[0]);
break;
case 6:
args[1] = pop();
@@ -1749,7 +1749,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpritetx_ty(spriteId, args[0], args[1]);
+ _sprite->setSpritePosition(spriteId, args[0], args[1]);
break;
case 7:
args[0] = pop();
@@ -1760,7 +1760,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteMaskImgResNum(spriteId, args[0]);
+ _sprite->setSpriteSourceImage(spriteId, args[0]);
break;
case 16:
n = getStackList(args, ARRAYSIZE(args));
@@ -1770,15 +1770,15 @@
int code = *p;
if (code == 0) {
for (int i = _curSpriteId; i <= _curMaxSpriteId; ++i) {
- _sprite->setSpriteResetClassFlags(i);
+ _sprite->setSpriteResetClass(i);
}
} else if (code & 0x80) {
for (int i = _curSpriteId; i <= _curMaxSpriteId; ++i) {
- _sprite->setSpriteSetClassFlag(i, code & 0x7F, 1);
+ _sprite->setSpriteSetClass(i, code & 0x7F, 1);
}
} else {
for (int i = _curSpriteId; i <= _curMaxSpriteId; ++i) {
- _sprite->setSpriteSetClassFlag(i, code & 0x7F, 0);
+ _sprite->setSpriteSetClass(i, code & 0x7F, 0);
}
}
--p;
@@ -1794,7 +1794,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteFlagHasImage(spriteId, args[0]);
+ _sprite->setSpriteFlagEraseType(spriteId, args[0]);
break;
case 38:
args[0] = pop();
@@ -1805,7 +1805,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteGroupNum(spriteId, args[0]);
+ _sprite->setSpriteGroup(spriteId, args[0]);
break;
case 40:
args[0] = pop();
@@ -1816,7 +1816,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->addImageToList(spriteId, 1, &args[0]);
+ _sprite->setSpriteImage(spriteId, args[0]);
break;
case 48:
args[0] = pop();
@@ -1827,7 +1827,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteField80(spriteId, args[0]);
+ _sprite->setSpriteMaskImage(spriteId, args[0]);
break;
case 49:
args[1] = pop();
@@ -1839,7 +1839,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteInc_tx_ty(spriteId, args[0], args[1]);
+ _sprite->moveSprite(spriteId, args[0], args[1]);
break;
case 52:
copyScriptString(string, sizeof(string));
@@ -1852,7 +1852,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteResetSprite(spriteId);
+ _sprite->resetSprite(spriteId);
break;
case 54:
args[1] = pop();
@@ -1864,7 +1864,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteField8C_90(spriteId, args[0], args[1]);
+ _sprite->setSpriteGeneralProperty(spriteId, args[0], args[1]);
break;
case 57:
args[0] = pop();
@@ -1875,7 +1875,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpritePaletteNum(spriteId, args[0]);
+ _sprite->setSpritePalette(spriteId, args[0]);
break;
case 59:
args[0] = pop();
@@ -1886,7 +1886,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteZorderPriority(spriteId, args[0]);
+ _sprite->setSpritePriority(spriteId, args[0]);
break;
case 60:
args[1] = pop();
@@ -1912,7 +1912,7 @@
_sprite->setSpriteFlagDoubleBuffered(spriteId, args[0]);
break;
case 4:
- _sprite->setSpriteFlagNeedPaletteRemap(spriteId, args[0]);
+ _sprite->setSpriteFlagRemapPalette(spriteId, args[0]);
break;
default:
break;
@@ -1930,7 +1930,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteZoom(spriteId, args[0]);
+ _sprite->setSpriteScale(spriteId, args[0]);
break;
case 70:
args[0] = pop();
@@ -1941,7 +1941,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteXmapNum(spriteId, args[0]);
+ _sprite->setSpriteShadow(spriteId, args[0]);
break;
case 73:
args[0] = pop();
@@ -1952,7 +1952,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteResState(spriteId, args[0]);
+ _sprite->setSpriteImageState(spriteId, args[0]);
break;
case 74:
args[1] = pop();
@@ -1964,7 +1964,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpritedx_dy(spriteId, args[0], args[1]);
+ _sprite->setSpriteDist(spriteId, args[0], args[1]);
break;
case 75:
args[0] = pop();
@@ -1975,8 +1975,8 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++) {
- _sprite->getSpritedx_dy(spriteId, tmp[0], tmp[1]);
- _sprite->setSpritedx_dy(spriteId, args[0], tmp[1]);
+ _sprite->getSpriteDist(spriteId, tmp[0], tmp[1]);
+ _sprite->setSpriteDist(spriteId, args[0], tmp[1]);
}
break;
case 76:
@@ -1988,8 +1988,8 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++) {
- _sprite->getSpritedx_dy(spriteId, tmp[0], tmp[1]);
- _sprite->setSpritedx_dy(spriteId, tmp[0], args[0]);
+ _sprite->getSpriteDist(spriteId, tmp[0], tmp[1]);
+ _sprite->setSpriteDist(spriteId, tmp[0], args[0]);
}
break;
case 82:
@@ -2001,7 +2001,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteFlagMarkDirty(spriteId, args[0]);
+ _sprite->setSpriteFlagUpdateType(spriteId, args[0]);
break;
case 83:
args[1] = pop();
@@ -2013,7 +2013,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteField44(spriteId, args[0], args[1]);
+ _sprite->setSpriteUserValue(spriteId, args[0], args[1]);
break;
case 88:
args[0] = pop();
@@ -2286,14 +2286,14 @@
case 5:
spriteGroupId = pop();
if (spriteGroupId)
- push(getGroupallocateGroupSpritesList(spriteGroupId));
+ push(getGroupSpriteArray(spriteGroupId));
else
push(0);
break;
case 40:
spriteGroupId = pop();
if (spriteGroupId)
- push(_sprite->getGroupdstResNum(spriteGroupId));
+ push(_sprite->getGroupDstResNum(spriteGroupId));
else
push(0);
break;
@@ -2306,7 +2306,7 @@
case 59:
spriteGroupId = pop();
if (spriteGroupId)
- push(_sprite->getGroupzorderPriority(spriteGroupId));
+ push(_sprite->getGroupPriority(spriteGroupId));
else
push(0);
break;
@@ -2526,8 +2526,8 @@
void ScummEngine_v100he::o100_getSpriteInfo() {
int args[16];
- int spriteId, flags, c, d, e, f;
- int32 a, b;
+ int spriteId, flags, groupId, type;
+ int32 x, y;
byte subOp = fetchScriptByte();
@@ -2536,21 +2536,21 @@
case 3:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpriteFlagDelayed(spriteId));
+ push(_sprite->getSpriteFlagAutoAnim(spriteId));
else
push(0);
break;
case 4:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpritedelayAmount(spriteId));
+ push(_sprite->getSpriteAnimSpeed(spriteId));
else
push(1);
break;
case 7:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpritemaskImgResNum(spriteId));
+ push(_sprite->getSpriteSourceImage(spriteId));
else
push(0);
break;
@@ -2558,7 +2558,7 @@
flags = getStackList(args, ARRAYSIZE(args));
spriteId = pop();
if (spriteId) {
- push(_sprite->getSpriteclassFlags(spriteId, flags, args));
+ push(_sprite->getSpriteClass(spriteId, flags, args));
} else {
push(0);
}
@@ -2566,51 +2566,51 @@
case 26:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpritewizSize(spriteId));
+ push(_sprite->getSpriteImageStateCount(spriteId));
else
push(0);
break;
case 30:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpritegrp_tx(spriteId));
+ push(_sprite->getSpriteDisplayX(spriteId));
else
push(0);
break;
case 31:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpritegrp_ty(spriteId));
+ push(_sprite->getSpriteDisplayY(spriteId));
else
push(0);
break;
case 32:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpriteFlagHasImage(spriteId));
+ push(_sprite->getSpriteFlagEraseType(spriteId));
else
push(1);
break;
case 33:
flags = getStackList(args, ARRAYSIZE(args));
- c = pop();
- d = pop();
- e = pop();
- f = pop();
- push(_sprite->findSpriteWithClassOf(f, e, d, c, flags, args));
+ type = pop();
+ groupId = pop();
+ y = pop();
+ x = pop();
+ push(_sprite->findSpriteWithClassOf(x, y, groupId, type, flags, args));
break;
case 38:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpriteGroupNum(spriteId));
+ push(_sprite->getSpriteGroup(spriteId));
else
push(0);
break;
case 39:
spriteId = pop();
if (spriteId) {
- _sprite->getSpriteImageDim(spriteId, a, b);
- push(b);
+ _sprite->getSpriteImageDim(spriteId, x, y);
+ push(y);
} else {
push(0);
}
@@ -2618,14 +2618,14 @@
case 40:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpriteResId(spriteId));
+ push(_sprite->getSpriteImage(spriteId));
else
push(0);
break;
case 48:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpriteField_80(spriteId));
+ push(_sprite->getSpriteMaskImage(spriteId));
else
push(0);
break;
@@ -2633,21 +2633,21 @@
flags = pop();
spriteId = pop();
if (spriteId)
- push(_sprite->getSpriteField_8C_90(spriteId, flags));
+ push(_sprite->getSpriteGeneralProperty(spriteId, flags));
else
push(0);
break;
case 57:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpritePaletteNum(spriteId));
+ push(_sprite->getSpritePalette(spriteId));
else
push(0);
break;
case 59:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpriteZorderPriority(spriteId));
+ push(_sprite->getSpritePriority(spriteId));
else
push(0);
break;
@@ -2669,7 +2669,7 @@
push(_sprite->getSpriteFlagDoubleBuffered(spriteId));
break;
case 4:
- push(_sprite->getSpriteFlagNeedPaletteRemap(spriteId));
+ push(_sprite->getSpriteFlagRemapPalette(spriteId));
break;
default:
push(0);
@@ -2681,29 +2681,29 @@
case 65:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpritezoom(spriteId));
+ push(_sprite->getSpriteScale(spriteId));
else
push(0);
break;
case 70:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpriteXmapNum(spriteId));
+ push(_sprite->getSpriteShadow(spriteId));
else
push(0);
break;
case 73:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpriteResState(spriteId));
+ push(_sprite->getSpriteImageState(spriteId));
else
push(0);
break;
case 75:
spriteId = pop();
if (spriteId) {
- _sprite->getSpritedx_dy(spriteId, a, b);
- push(a);
+ _sprite->getSpriteDist(spriteId, x, y);
+ push(x);
} else {
push(0);
}
@@ -2711,8 +2711,8 @@
case 76:
spriteId = pop();
if (spriteId) {
- _sprite->getSpritedx_dy(spriteId, a, b);
- push(b);
+ _sprite->getSpriteDist(spriteId, x, y);
+ push(y);
} else {
push(0);
}
@@ -2720,7 +2720,7 @@
case 82:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpriteFlagMarkDirty(spriteId));
+ push(_sprite->getSpriteFlagUpdateType(spriteId));
else
push(0);
break;
@@ -2728,15 +2728,15 @@
pop();
spriteId = pop();
if (spriteId)
- push(_sprite->getSpriteField_44(spriteId));
+ push(_sprite->getSpriteUserValue(spriteId));
else
push(0);
break;
case 84:
spriteId = pop();
if (spriteId) {
- _sprite->getSpriteImageDim(spriteId, a, b);
- push(a);
+ _sprite->getSpriteImageDim(spriteId, x, y);
+ push(x);
} else {
push(0);
}
@@ -2744,8 +2744,8 @@
case 85:
spriteId = pop();
if (spriteId) {
- _sprite->getSpritetx_ty(spriteId, a, b);
- push(a);
+ _sprite->getSpritePosition(spriteId, x, y);
+ push(x);
} else {
push(0);
}
@@ -2753,8 +2753,8 @@
case 86:
spriteId = pop();
if (spriteId) {
- _sprite->getSpritetx_ty(spriteId, a, b);
- push(b);
+ _sprite->getSpritePosition(spriteId, x, y);
+ push(y);
} else {
push(0);
}
Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.268
retrieving revision 2.269
diff -u -d -r2.268 -r2.269
--- script_v90he.cpp 5 Jun 2005 04:53:43 -0000 2.268
+++ script_v90he.cpp 5 Jun 2005 08:02:50 -0000 2.269
@@ -650,11 +650,11 @@
_wizParams.field_184 = 0;
_wizParams.field_180 = 0;
_wizParams.spriteId = 0;
- _wizParams.groupNum = 0;
+ _wizParams.spriteGroup = 0;
break;
case 16: // HE99+
_wizParams.processFlags |= kWPFMaskImg;
- _wizParams.maskImgResNum = pop();
+ _wizParams.sourceImage = pop();
break;
case 19:
case 108:
@@ -686,15 +686,15 @@
break;
case 40: // HE99+
_wizParams.processFlags |= kWPFPaletteNum;
- _wizParams.img.paletteNum = pop();
+ _wizParams.img.palette = pop();
break;
case 46:
- _wizParams.processFlags |= kWPFZoom;
- _wizParams.zoom = pop();
+ _wizParams.processFlags |= kWPFScaled;
+ _wizParams.scale = pop();
break;
case 52:
- _wizParams.processFlags |= kWPFXmapNum;
- _wizParams.xmapNum = pop();
+ _wizParams.processFlags |= kWPFShadow;
+ _wizParams.shadow = pop();
break;
case 85: // HE99+
_wizParams.processFlags |= 0x1000 | 0x100 | 0x2;
@@ -839,8 +839,8 @@
void ScummEngine_v90he::o90_getSpriteInfo() {
int args[16];
- int spriteId, flags, c, d, e, f;
- int32 a, b;
+ int spriteId, flags, groupId, type;
+ int32 x, y;
byte subOp = fetchScriptByte();
subOp -= 30;
@@ -850,8 +850,8 @@
case 0:
spriteId = pop();
if (spriteId) {
- _sprite->getSpritetx_ty(spriteId, a, b);
- push(a);
+ _sprite->getSpritePosition(spriteId, x, y);
+ push(x);
} else {
push(0);
}
@@ -859,8 +859,8 @@
case 1:
spriteId = pop();
if (spriteId) {
- _sprite->getSpritetx_ty(spriteId, a, b);
- push(b);
+ _sprite->getSpritePosition(spriteId, x, y);
+ push(y);
} else {
push(0);
}
@@ -868,8 +868,8 @@
case 2:
spriteId = pop();
if (spriteId) {
- _sprite->getSpriteImageDim(spriteId, a, b);
- push(a);
+ _sprite->getSpriteImageDim(spriteId, x, y);
+ push(x);
} else {
push(0);
}
@@ -877,8 +877,8 @@
case 3:
spriteId = pop();
if (spriteId) {
- _sprite->getSpriteImageDim(spriteId, a, b);
- push(b);
+ _sprite->getSpriteImageDim(spriteId, x, y);
+ push(y);
} else {
push(0);
}
@@ -886,8 +886,8 @@
case 4:
spriteId = pop();
if (spriteId) {
- _sprite->getSpritedx_dy(spriteId, a, b);
- push(a);
+ _sprite->getSpriteDist(spriteId, x, y);
+ push(x);
} else {
push(0);
}
@@ -895,8 +895,8 @@
case 5:
spriteId = pop();
if (spriteId) {
- _sprite->getSpritedx_dy(spriteId, a, b);
- push(b);
+ _sprite->getSpriteDist(spriteId, x, y);
+ push(y);
} else {
push(0);
}
@@ -904,28 +904,28 @@
case 6:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpritewizSize(spriteId));
+ push(_sprite->getSpriteImageStateCount(spriteId));
else
push(0);
break;
case 7:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpriteGroupNum(spriteId));
+ push(_sprite->getSpriteGroup(spriteId));
else
push(0);
break;
case 8:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpritegrp_tx(spriteId));
+ push(_sprite->getSpriteDisplayX(spriteId));
else
push(0);
break;
case 9:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpritegrp_ty(spriteId));
+ push(_sprite->getSpriteDisplayY(spriteId));
else
push(0);
break;
@@ -947,7 +947,7 @@
push(_sprite->getSpriteFlagDoubleBuffered(spriteId));
break;
case 4:
- push(_sprite->getSpriteFlagNeedPaletteRemap(spriteId));
+ push(_sprite->getSpriteFlagRemapPalette(spriteId));
break;
default:
push(0);
@@ -959,98 +959,98 @@
case 13:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpriteZorderPriority(spriteId));
+ push(_sprite->getSpritePriority(spriteId));
else
push(0);
break;
case 15:
if (_heversion == 99) {
flags = getStackList(args, ARRAYSIZE(args));
- c = pop();
- d = pop();
- e = pop();
- f = pop();
- push(_sprite->findSpriteWithClassOf(f, e, d, c, flags, args));
+ type = pop();
+ groupId = pop();
+ y = pop();
+ x = pop();
+ push(_sprite->findSpriteWithClassOf(x, y, groupId, type, flags, args));
} else if (_heversion == 98) {
- c = pop();
- d = pop();
- e = pop();
- f = pop();
- push(_sprite->findSpriteWithClassOf(f, e, d, c, 0, 0));
+ type = pop();
+ groupId = pop();
+ y = pop();
+ x = pop();
+ push(_sprite->findSpriteWithClassOf(x, y, groupId, type, 0, 0));
} else {
- d = pop();
- e = pop();
- f = pop();
- push(_sprite->findSpriteWithClassOf(f, e, d, 0, 0, 0));
+ groupId = pop();
+ y = pop();
+ x = pop();
+ push(_sprite->findSpriteWithClassOf(x, y, groupId, 0, 0, 0));
}
break;
case 22:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpriteResState(spriteId));
+ push(_sprite->getSpriteImageState(spriteId));
else
push(0);
break;
case 32:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpritemaskImgResNum(spriteId));
+ push(_sprite->getSpriteSourceImage(spriteId));
else
push(0);
break;
case 33:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpriteResId(spriteId));
+ push(_sprite->getSpriteImage(spriteId));
else
push(0);
break;
case 38:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpriteFlagHasImage(spriteId));
+ push(_sprite->getSpriteFlagEraseType(spriteId));
else
push(1);
break;
case 52:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpriteFlagDelayed(spriteId));
+ push(_sprite->getSpriteFlagAutoAnim(spriteId));
else
push(0);
break;
case 56:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpritePaletteNum(spriteId));
+ push(_sprite->getSpritePalette(spriteId));
else
push(0);
break;
case 62:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpritezoom(spriteId));
+ push(_sprite->getSpriteScale(spriteId));
else
push(0);
break;
case 67:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpritedelayAmount(spriteId));
+ push(_sprite->getSpriteAnimSpeed(spriteId));
else
push(1);
break;
case 68:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpriteXmapNum(spriteId));
+ push(_sprite->getSpriteShadow(spriteId));
else
push(0);
break;
case 94:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpriteFlagMarkDirty(spriteId));
+ push(_sprite->getSpriteFlagUpdateType(spriteId));
else
push(0);
break;
@@ -1058,7 +1058,7 @@
flags = getStackList(args, ARRAYSIZE(args));
spriteId = pop();
if (spriteId) {
- push(_sprite->getSpriteclassFlags(spriteId, flags, args));
+ push(_sprite->getSpriteClass(spriteId, flags, args));
} else {
push(0);
}
@@ -1067,14 +1067,14 @@
flags = pop();
spriteId = pop();
if (spriteId)
- push(_sprite->getSpriteField_8C_90(spriteId, flags));
+ push(_sprite->getSpriteGeneralProperty(spriteId, flags));
else
push(0);
break;
case 110:
spriteId = pop();
if (spriteId)
- push(_sprite->getSpriteField_80(spriteId));
+ push(_sprite->getSpriteMaskImage(spriteId));
else
push(0);
break;
@@ -1082,7 +1082,7 @@
pop();
spriteId = pop();
if (spriteId)
- push(_sprite->getSpriteField_44(spriteId));
+ push(_sprite->getSpriteUserValue(spriteId));
else
push(0);
break;
@@ -1111,8 +1111,8 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++) {
- _sprite->getSpritedx_dy(spriteId, tmp[0], tmp[1]);
- _sprite->setSpritedx_dy(spriteId, args[0], tmp[1]);
+ _sprite->getSpriteDist(spriteId, tmp[0], tmp[1]);
+ _sprite->setSpriteDist(spriteId, args[0], tmp[1]);
}
break;
case 1:
@@ -1124,8 +1124,8 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++) {
- _sprite->getSpritedx_dy(spriteId, tmp[0], tmp[1]);
- _sprite->setSpritedx_dy(spriteId, tmp[0], args[0]);
+ _sprite->getSpriteDist(spriteId, tmp[0], tmp[1]);
+ _sprite->setSpriteDist(spriteId, tmp[0], args[0]);
}
break;
case 3:
@@ -1137,7 +1137,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteGroupNum(spriteId, args[0]);
+ _sprite->setSpriteGroup(spriteId, args[0]);
break;
case 8:
args[1] = pop();
@@ -1163,7 +1163,7 @@
_sprite->setSpriteFlagDoubleBuffered(spriteId, args[0]);
break;
case 4:
- _sprite->setSpriteFlagNeedPaletteRemap(spriteId, args[0]);
+ _sprite->setSpriteFlagRemapPalette(spriteId, args[0]);
break;
default:
break;
@@ -1178,7 +1178,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteZorderPriority(spriteId, args[0]);
+ _sprite->setSpritePriority(spriteId, args[0]);
break;
case 10:
args[1] = pop();
@@ -1190,7 +1190,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteInc_tx_ty(spriteId, args[0], args[1]);
+ _sprite->moveSprite(spriteId, args[0], args[1]);
break;
case 18:
args[0] = pop();
@@ -1201,7 +1201,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteResState(spriteId, args[0]);
+ _sprite->setSpriteImageState(spriteId, args[0]);
break;
case 19:
args[0] = pop();
@@ -1235,7 +1235,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteMaskImgResNum(spriteId, args[0]);
+ _sprite->setSpriteSourceImage(spriteId, args[0]);
break;
case 29:
args[0] = pop();
@@ -1246,7 +1246,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->addImageToList(spriteId, 1, &args[0]);
+ _sprite->setSpriteImage(spriteId, args[0]);
break;
case 31:
args[1] = pop();
@@ -1258,7 +1258,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpritetx_ty(spriteId, args[0], args[1]);
+ _sprite->setSpritePosition(spriteId, args[0], args[1]);
break;
case 34:
args[0] = pop();
@@ -1269,7 +1269,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteFlagHasImage(spriteId, args[0]);
+ _sprite->setSpriteFlagEraseType(spriteId, args[0]);
break;
case 43:
args[1] = pop();
@@ -1281,7 +1281,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpritedx_dy(spriteId, args[0], args[1]);
+ _sprite->setSpriteDist(spriteId, args[0], args[1]);
break;
case 48:
args[0] = pop();
@@ -1292,7 +1292,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteFlagDelayed(spriteId, args[0]);
+ _sprite->setSpriteFlagAutoAnim(spriteId, args[0]);
break;
case 52: // HE 98+
args[0] = pop();
@@ -1303,7 +1303,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpritePaletteNum(spriteId, args[0]);
+ _sprite->setSpritePalette(spriteId, args[0]);
break;
case 58: // HE 99+
args[0] = pop();
@@ -1314,7 +1314,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteZoom(spriteId, args[0]);
+ _sprite->setSpriteScale(spriteId, args[0]);
break;
case 63: // HE 98+
args[0] = pop();
@@ -1325,7 +1325,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteDelay(spriteId, args[0]);
+ _sprite->setSpriteAnimSpeed(spriteId, args[0]);
break;
case 64:
args[0] = pop();
@@ -1336,7 +1336,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteXmapNum(spriteId, args[0]);
+ _sprite->setSpriteShadow(spriteId, args[0]);
break;
case 90:
args[0] = pop();
@@ -1347,7 +1347,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteFlagMarkDirty(spriteId, args[0]);
+ _sprite->setSpriteFlagUpdateType(spriteId, args[0]);
break;
case 91:
n = getStackList(args, ARRAYSIZE(args));
@@ -1357,15 +1357,15 @@
int code = *p;
if (code == 0) {
for (int i = _curSpriteId; i <= _curMaxSpriteId; ++i) {
- _sprite->setSpriteResetClassFlags(i);
+ _sprite->setSpriteResetClass(i);
}
} else if (code & 0x80) {
for (int i = _curSpriteId; i <= _curMaxSpriteId; ++i) {
- _sprite->setSpriteSetClassFlag(i, code & 0x7F, 1);
+ _sprite->setSpriteSetClass(i, code & 0x7F, 1);
}
} else {
for (int i = _curSpriteId; i <= _curMaxSpriteId; ++i) {
- _sprite->setSpriteSetClassFlag(i, code & 0x7F, 0);
+ _sprite->setSpriteSetClass(i, code & 0x7F, 0);
}
}
--p;
@@ -1382,7 +1382,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteField8C_90(spriteId, args[0], args[1]);
+ _sprite->setSpriteGeneralProperty(spriteId, args[0], args[1]);
break;
case 106: // HE 99+
args[0] = pop();
@@ -1393,7 +1393,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteField80(spriteId, args[0]);
+ _sprite->setSpriteMaskImage(spriteId, args[0]);
break;
case 124:
_sprite->resetTables(true);
@@ -1408,7 +1408,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteField44(spriteId, args[0], args[1]);
+ _sprite->setSpriteUserValue(spriteId, args[0], args[1]);
break;
case 183:
if (_curSpriteId > _curMaxSpriteId)
@@ -1418,7 +1418,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- _sprite->setSpriteResetSprite(spriteId);
+ _sprite->resetSprite(spriteId);
break;
default:
error("o90_setSpriteInfo: Unknown case %d", subOp);
@@ -1436,7 +1436,7 @@
case 8: // HE 99+
spriteGroupId = pop();
if (spriteGroupId)
- push(getGroupallocateGroupSpritesList(spriteGroupId));
+ push(getGroupSpriteArray(spriteGroupId));
else
push(0);
break;
@@ -1485,14 +1485,14 @@
case 43:
spriteGroupId = pop();
if (spriteGroupId)
- push(_sprite->getGroupzorderPriority(spriteGroupId));
+ push(_sprite->getGroupPriority(spriteGroupId));
else
push(0);
break;
case 63: // HE 99+
spriteGroupId = pop();
if (spriteGroupId)
- push(_sprite->getGroupdstResNum(spriteGroupId));
+ push(_sprite->getGroupDstResNum(spriteGroupId));
else
push(0);
break;
@@ -1524,55 +1524,55 @@
if (!_curSpriteGroupId)
break;
- _sprite->setGroupCase0_0(_curSpriteGroupId, value1, value2);
+ _sprite->moveGroupMembers(_curSpriteGroupId, value1, value2);
break;
case 1:
value1 = pop();
if (!_curSpriteGroupId)
break;
- _sprite->setGroupCase0_1(_curSpriteGroupId, value1);
+ _sprite->setGroupMembersPriority(_curSpriteGroupId, value1);
break;
case 2:
value1 = pop();
if (!_curSpriteGroupId)
break;
- _sprite->setGroupCase0_2(_curSpriteGroupId, value1);
+ _sprite->setGroupMembersGroup(_curSpriteGroupId, value1);
break;
case 3:
value1 = pop();
if (!_curSpriteGroupId)
break;
- _sprite->setGroupCase0_3(_curSpriteGroupId, value1);
+ _sprite->setGroupMembersUpdateType(_curSpriteGroupId, value1);
break;
case 4:
if (!_curSpriteGroupId)
break;
- _sprite->setGroupCase0_4(_curSpriteGroupId);
+ _sprite->setGroupMembersResetSprite(_curSpriteGroupId);
break;
case 5:
value1 = pop();
if (!_curSpriteGroupId)
break;
- _sprite->setGroupCase0_5(_curSpriteGroupId, value1);
+ _sprite->setGroupMembersAnimationSpeed(_curSpriteGroupId, value1);
break;
case 6:
value1 = pop();
if (!_curSpriteGroupId)
break;
- _sprite->setGroupCase0_6(_curSpriteGroupId, value1);
+ _sprite->setGroupMembersAutoAnimFlag(_curSpriteGroupId, value1);
break;
case 7:
value1 = pop();
if (!_curSpriteGroupId)
break;
- _sprite->setGroupCase0_7(_curSpriteGroupId, value1);
+ _sprite->setGroupMembersShadow(_curSpriteGroupId, value1);
break;
default:
error("o90_setSpriteGroupInfo subOp 0: Unknown case %d", subOp);
@@ -1606,7 +1606,7 @@
if (!_curSpriteGroupId)
break;
- _sprite->setGroupzorderPriority(_curSpriteGroupId, value1);
+ _sprite->setGroupPriority(_curSpriteGroupId, value1);
break;
case 7:
value2 = pop();
@@ -1624,7 +1624,7 @@
if (!_curSpriteGroupId)
break;
- _sprite->setGroupdstResNum(_curSpriteGroupId, value1);
+ _sprite->setGroupImage(_curSpriteGroupId, value1);
break;
case 28:
value2 = pop();
@@ -1632,7 +1632,7 @@
if (!_curSpriteGroupId)
break;
- _sprite->setGrouptx_ty(_curSpriteGroupId, value1, value2);
+ _sprite->moveGroup(_curSpriteGroupId, value1, value2);
break;
case 30:
value4 = pop();
@@ -1642,13 +1642,13 @@
if (!_curSpriteGroupId)
break;
- _sprite->setGroupbbox(_curSpriteGroupId, value1, value2, value3, value4);
+ _sprite->setGroupBounds(_curSpriteGroupId, value1, value2, value3, value4);
break;
case 56:
if (!_curSpriteGroupId)
break;
- _sprite->setGroupflagClipBoxAnd(_curSpriteGroupId);
+ _sprite->resetGroupBounds(_curSpriteGroupId);
break;
case 180:
if (!_curSpriteGroupId)
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- sprite_he.cpp 29 May 2005 14:55:12 -0000 1.146
+++ sprite_he.cpp 5 Jun 2005 08:02:50 -0000 1.147
@@ -44,14 +44,14 @@
void Sprite::getSpriteBounds(int spriteId, bool checkGroup, Common::Rect &bound) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
int16 spr_wiz_x, spr_wiz_y;
- int angle, zoom, x1, y1;
+ int angle, scale, x1, y1;
int32 w, h;
SpriteInfo *spi = &_spriteTable[spriteId];
- _vm->_wiz->loadImgSpot(spi->resId, spi->resState, spr_wiz_x, spr_wiz_y);
- if (checkGroup && spi->groupNum) {
[...1216 lines suppressed...]
+ MKLINE(SpriteInfo, animSpeed, sleInt32, VER(48)),
+ MKLINE(SpriteInfo, sourceImage, sleInt32, VER(48)),
+ MKLINE(SpriteInfo, maskImage, sleInt32, VER(48)),
MKLINE(SpriteInfo, field_84, sleInt32, VER(48)),
MKLINE(SpriteInfo, classFlags, sleInt32, VER(48)),
MKLINE(SpriteInfo, imgFlags, sleInt32, VER(48)),
@@ -1445,11 +1444,11 @@
MKLINE(SpriteGroup, bbox.top, sleInt32, VER(48)),
MKLINE(SpriteGroup, bbox.right, sleInt32, VER(48)),
MKLINE(SpriteGroup, bbox.bottom, sleInt32, VER(48)),
- MKLINE(SpriteGroup, zorderPriority, sleInt32, VER(48)),
+ MKLINE(SpriteGroup, priority, sleInt32, VER(48)),
MKLINE(SpriteGroup, flags, sleInt32, VER(48)),
MKLINE(SpriteGroup, tx, sleInt32, VER(48)),
MKLINE(SpriteGroup, ty, sleInt32, VER(48)),
- MKLINE(SpriteGroup, dstResNum, sleInt32, VER(48)),
+ MKLINE(SpriteGroup, image, sleInt32, VER(48)),
MKLINE(SpriteGroup, scaling, sleInt32, VER(48)),
MKLINE(SpriteGroup, scale_x_ratio_mul, sleInt32, VER(48)),
MKLINE(SpriteGroup, scale_x_ratio_div, sleInt32, VER(48)),
Index: sprite_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- sprite_he.h 23 May 2005 11:50:36 -0000 1.40
+++ sprite_he.h 5 Jun 2005 08:02:50 -0000 1.41
@@ -28,14 +28,14 @@
enum SpriteFlags {
kSFChanged = 0x1,
kSFNeedRedraw = 0x2,
- kSFZoomed = 0x10,
+ kSFScaled = 0x10,
kSFRotated = 0x20,
kSFDoubleBuffered = 0x1000,
kSFYFlipped = 0x2000,
kSFXFlipped = 0x4000,
kSFActive = 0x8000,
- kSFNeedPaletteRemap = 0x80000,
- kSFDelayed = 0x200000,
+ kSFRemapPalette = 0x80000,
+ kSFAutoAnim = 0x200000,
kSFMarkDirty = 0x400000,
kSFBlitDirectly = 0x2000000,
kSF30 = 0x20000000,
@@ -50,33 +50,33 @@
int32 id;
int32 zorder;
int32 flags;
- int32 resId;
- int32 resState;
- int32 groupNum;
- int32 paletteNum;
- int32 zorderPriority;
+ int32 image;
+ int32 imageState;
+ int32 group;
+ int32 palette;
+ int32 priority;
Common::Rect bbox;
int32 dx;
int32 dy;
Common::Point pos;
int32 tx;
int32 ty;
- int32 field_44;
+ int32 userValue;
int32 curImageState;
- int32 curResId;
+ int32 curImage;
int32 imglistNum;
- int32 xmapNum;
- int32 res_wiz_states;
+ int32 shadow;
+ int32 imageStateCount;
int32 angle;
- int32 zoom;
- int32 delayCount;
+ int32 scale;
+ int32 animProgress;
int32 curAngle;
- int32 curZoom;
+ int32 curScale;
int32 curImgFlags;
int32 field_74;
- int32 delayAmount;
- int32 maskImgResNum;
- int32 field_80;
+ int32 animSpeed;
+ int32 sourceImage;
+ int32 maskImage;
int32 field_84;
int32 classFlags;
int32 imgFlags;
@@ -85,11 +85,11 @@
struct SpriteGroup {
Common::Rect bbox;
- int32 zorderPriority;
+ int32 priority;
int32 flags;
int32 tx;
int32 ty;
- int32 dstResNum;
+ int32 image;
int32 scaling;
int32 scale_x_ratio_mul;
int32 scale_x_ratio_div;
@@ -121,95 +121,95 @@
void getSpriteBounds(int spriteId, bool checkGroup, Common::Rect &bound);
int findSpriteWithClassOf(int x, int y, int spriteGroupId, int d, int num, int *args);
- int getSpriteclassFlags(int spriteId, int num, int *args);
+ int getSpriteClass(int spriteId, int num, int *args);
int getSpriteFlagDoubleBuffered(int spriteId);
int getSpriteFlagYFlipped(int spriteId);
int getSpriteFlagXFlipped(int spriteId);
int getSpriteFlagActive(int spriteId);
- int getSpriteFlagNeedPaletteRemap(int spriteId);
- int getSpriteFlagDelayed(int spriteId);
- int getSpriteFlagMarkDirty(int spriteId);
- int getSpriteFlagHasImage(int spriteId);
- int getSpriteResId(int spriteId);
- int getSpriteResState(int spriteId);
- int getSpriteGroupNum(int spriteId);
- int getSpritePaletteNum(int spriteId);
- int getSpriteZorderPriority(int spriteId);
- int getSpritegrp_tx(int spriteId);
- int getSpritegrp_ty(int spriteId);
- int getSpriteField_44(int spriteId);
- int getSpriteXmapNum(int spriteId);
- int getSpritewizSize(int spriteId);
- int getSpritezoom(int spriteId);
- int getSpritedelayAmount(int spriteId);
- int getSpritemaskImgResNum(int spriteId);
- int getSpriteField_80(int spriteId);
- int getSpriteField_8C_90(int spriteId, int type);
+ int getSpriteFlagRemapPalette(int spriteId);
+ int getSpriteFlagAutoAnim(int spriteId);
+ int getSpriteFlagUpdateType(int spriteId);
+ int getSpriteFlagEraseType(int spriteId);
+ int getSpriteImage(int spriteId);
+ int getSpriteImageState(int spriteId);
+ int getSpriteGroup(int spriteId);
+ int getSpritePalette(int spriteId);
+ int getSpritePriority(int spriteId);
+ int getSpriteDisplayX(int spriteId);
+ int getSpriteDisplayY(int spriteId);
+ int getSpriteUserValue(int spriteId);
+ int getSpriteShadow(int spriteId);
+ int getSpriteImageStateCount(int spriteId);
+ int getSpriteScale(int spriteId);
+ int getSpriteAnimSpeed(int spriteId);
+ int getSpriteSourceImage(int spriteId);
+ int getSpriteMaskImage(int spriteId);
+ int getSpriteGeneralProperty(int spriteId, int type);
void getSpriteImageDim(int spriteId, int32 &w, int32 &h);
- void getSpritetx_ty(int spriteId, int32 &tx, int32 &ty);
- void getSpritedx_dy(int spriteId, int32 &dx, int32 &dy);
+ void getSpritePosition(int spriteId, int32 &tx, int32 &ty);
+ void getSpriteDist(int spriteId, int32 &dx, int32 &dy);
- int getGroupzorderPriority(int spriteGroupId);
- int getGroupdstResNum(int spriteGroupId);
+ int getGroupPriority(int spriteGroupId);
+ int getGroupDstResNum(int spriteGroupId);
int getGroupScale_x_ratio_mul(int spriteGroupId);
int getGroupScale_x_ratio_div(int spriteGroupId);
int getGroupScale_y_ratio_mul(int spriteGroupId);
int getGroupScale_y_ratio_div(int spriteGroupId);
void getGrouptx_ty(int spriteGroupId, int32 &tx, int32 &ty);
- void setSpritePaletteNum(int spriteId, int value);
- void setSpriteMaskImgResNum(int spriteId, int value);
- void setSpriteField80(int spriteId, int value);
- void setSpriteResetSprite(int spriteId);
- void setSpriteResState(int spriteId, int value);
- void setSpritetx_ty(int spriteId, int value1, int value2);
- void setSpriteGroupNum(int spriteId, int value);
- void setSpritedx_dy(int spriteId, int value1, int value2);
- void setSpriteXmapNum(int spriteId, int value);
- void setSpriteField44(int spriteId, int value1, int value2);
- void setSpriteZorderPriority(int spriteId, int value);
- void setSpriteInc_tx_ty(int spriteId, int value1, int value2);
- void setSpriteZoom(int spriteId, int value);
+ void setSpritePalette(int spriteId, int value);
+ void setSpriteSourceImage(int spriteId, int value);
+ void setSpriteMaskImage(int spriteId, int value);
+ void resetSprite(int spriteId);
+ void setSpriteImageState(int spriteId, int value);
+ void setSpritePosition(int spriteId, int value1, int value2);
+ void setSpriteGroup(int spriteId, int value);
+ void setSpriteDist(int spriteId, int value1, int value2);
+ void setSpriteShadow(int spriteId, int value);
+ void setSpriteUserValue(int spriteId, int value1, int value2);
+ void setSpritePriority(int spriteId, int value);
+ void moveSprite(int spriteId, int value1, int value2);
+ void setSpriteScale(int spriteId, int value);
void setSpriteAngle(int spriteId, int value);
void setSpriteFlagDoubleBuffered(int spriteId, int value);
void setSpriteFlagYFlipped(int spriteId, int value);
void setSpriteFlagXFlipped(int spriteId, int value);
void setSpriteFlagActive(int spriteId, int value);
- void setSpriteFlagNeedPaletteRemap(int spriteId, int value);
- void setSpriteFlagDelayed(int spriteId, int value);
- void setSpriteFlagMarkDirty(int spriteId, int value);
- void setSpriteFlagHasImage(int spriteId, int value);
- void setSpriteDelay(int spriteId, int value);
- void setSpriteSetClassFlag(int spriteId, int classId, int toggle);
- void setSpriteResetClassFlags(int spriteId);
+ void setSpriteFlagRemapPalette(int spriteId, int value);
+ void setSpriteFlagAutoAnim(int spriteId, int value);
+ void setSpriteFlagUpdateType(int spriteId, int value);
+ void setSpriteFlagEraseType(int spriteId, int value);
+ void setSpriteAnimSpeed(int spriteId, int value);
+ void setSpriteSetClass(int spriteId, int classId, int toggle);
+ void setSpriteResetClass(int spriteId);
void setSpriteField84(int spriteId, int value);
- void setSpriteField8C_90(int spriteId, int type, int value);
+ void setSpriteGeneralProperty(int spriteId, int type, int value);
void redrawSpriteGroup(int spriteGroupId);
- void setGroupCase0_0(int spriteGroupId, int value1, int value2);
- void setGroupCase0_1(int spriteGroupId, int value);
- void setGroupCase0_2(int spriteGroupId, int value);
- void setGroupCase0_3(int spriteGroupId, int value);
- void setGroupCase0_4(int spriteGroupId);
- void setGroupCase0_5(int spriteGroupId, int value);
- void setGroupCase0_6(int spriteGroupId, int value);
- void setGroupCase0_7(int spriteGroupId, int value);
- void setGroupbbox(int spriteGroupId, int x1, int y1, int x2, int y2);
- void setGroupzorderPriority(int spriteGroupId, int value);
- void setGrouptx_ty(int spriteGroupId, int value1, int value2);
+ void moveGroupMembers(int spriteGroupId, int value1, int value2);
+ void setGroupMembersPriority(int spriteGroupId, int value);
+ void setGroupMembersGroup(int spriteGroupId, int value);
+ void setGroupMembersUpdateType(int spriteGroupId, int value);
+ void setGroupMembersResetSprite(int spriteGroupId);
+ void setGroupMembersAnimationSpeed(int spriteGroupId, int value);
+ void setGroupMembersAutoAnimFlag(int spriteGroupId, int value);
+ 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 moveGroup(int spriteGroupId, int value1, int value2);
void setGroupinc_tx_ty(int spriteGroupId, int value1, int value2);
- void setGroupdstResNum(int spriteGroupId, int value);
- void setGroupscaling(int spriteGroupId);
+ void setGroupImage(int spriteGroupId, int value);
+ void setGroupScaling(int spriteGroupId);
void setGroupScale_x_ratio_mul(int spriteGroupId, int value);
void setGroupScale_x_ratio_div(int spriteGroupId, int value);
void setGroupScale_y_ratio_mul(int spriteGroupId, int value);
void setGroupScale_y_ratio_div(int spriteGroupId, int value);
- void setGroupflagClipBoxAnd(int spriteGroupId);
+ void resetGroupBounds(int spriteGroupId);
void allocTables(int numSprites, int numGroups, int numMaxSprites);
void resetGroup(int spriteGroupId);
void resetTables(bool refreshScreen);
- void addImageToList(int spriteId, int imageNum, int *spriteIdptr);
+ void setSpriteImage(int spriteId, int imageNum);
private:
ScummEngine_v90he *_vm;
};
Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.86
retrieving revision 2.87
diff -u -d -r2.86 -r2.87
--- wiz_he.cpp 29 May 2005 12:14:31 -0000 2.86
+++ wiz_he.cpp 5 Jun 2005 08:02:50 -0000 2.87
@@ -955,9 +955,9 @@
wi->zorder = 0;
wi->state = pwi->state;
wi->flags = pwi->flags;
- wi->xmapNum = 0;
+ wi->shadow = 0;
wi->field_390 = 0;
- wi->paletteNum = 0;
+ wi->palette = 0;
++_imagesNum;
} else if (pwi->flags & kWIFIsPolygon) {
drawWizPolygon(pwi->resNum, pwi->state, pwi->x1, pwi->flags, 0, 0, 0);
@@ -967,21 +967,21 @@
}
}
-uint8 *Wiz::drawWizImage(int resNum, int state, int x1, int y1, int zorder, int xmapNum, int field_390, const Common::Rect *clipBox, int flags, int dstResNum, int paletteNum) {
- debug(2, "drawWizImage(resNum %d, x1 %d y1 %d flags 0x%X zorder %d xmapNum %d field_390 %d dstResNum %d paletteNum %d)", resNum, x1, y1, flags, zorder, xmapNum, field_390, dstResNum, paletteNum);
+uint8 *Wiz::drawWizImage(int resNum, int state, int x1, int y1, int zorder, int shadow, int field_390, const Common::Rect *clipBox, int flags, int dstResNum, int palette) {
+ debug(2, "drawWizImage(resNum %d, x1 %d y1 %d flags 0x%X zorder %d shadow %d field_390 %d dstResNum %d palette %d)", resNum, x1, y1, flags, zorder, shadow, field_390, dstResNum, palette);
uint8 *dst = NULL;
const uint8 *palPtr = NULL;
if (_vm->_heversion >= 99) {
- if (paletteNum) {
- palPtr = _vm->_hePalettes + paletteNum * 1024 + 768;
+ if (palette) {
+ palPtr = _vm->_hePalettes + palette * 1024 + 768;
} else {
palPtr = _vm->_hePalettes + 1792;
}
}
const uint8 *xmap = NULL;
- if (xmapNum) {
+ if (shadow) {
// TODO: Handle 'XMAP' data for shadows
}
@@ -1182,7 +1182,7 @@
}
};
-void Wiz::drawWizComplexPolygon(int resNum, int state, int po_x, int po_y, int xmapNum, int angle, int zoom, const Common::Rect *r, int flags, int dstResNum, int paletteNum) {
+void Wiz::drawWizComplexPolygon(int resNum, int state, int po_x, int po_y, int shadow, int angle, int scale, const Common::Rect *r, int flags, int dstResNum, int palette) {
Common::Point pts[4];
int32 w, h;
getWizImageDim(resNum, state, w, h);
@@ -1192,10 +1192,10 @@
pts[2].y = pts[3].y = h / 2 - 1;
// transform points
- if (zoom != 256) {
+ if (scale != 256) {
for (int i = 0; i < 4; ++i) {
- pts[i].x = pts[i].x * zoom / 256;
- pts[i].y = pts[i].y * zoom / 256;
+ pts[i].x = pts[i].x * scale / 256;
+ pts[i].y = pts[i].y * scale / 256;
}
}
if (angle)
@@ -1206,10 +1206,10 @@
pts[i].y += po_y;
}
- if (zoom != 256) {
- debug(1, "drawWizComplexPolygon() zoom not implemented");
+ if (scale != 256) {
+ debug(1, "drawWizComplexPolygon() scale not implemented");
- //drawWizPolygonTransform(resNum, state, pts, flags, VAR(VAR_WIZ_TCOLOR), r, dstPtr, paletteNum, xmapPtr);
+ //drawWizPolygonTransform(resNum, state, pts, flags, VAR(VAR_WIZ_TCOLOR), r, dstPtr, palette, xmapPtr);
} else {
debug(1, "drawWizComplexPolygon() angle partially implemented");
@@ -1226,27 +1226,27 @@
switch(angle) {
case 270:
flags |= kWIFFlipX | kWIFFlipY;
- //drawWizComplexPolygonHelper(resNum, state, x1, y1, r, flags, dstResNum, paletteNum);
+ //drawWizComplexPolygonHelper(resNum, state, x1, y1, r, flags, dstResNum, palette);
break;
case 180:
flags |= kWIFFlipX | kWIFFlipY;
- drawWizImage(resNum, state, x1, y1, 0, xmapNum, 0, r, flags, dstResNum, paletteNum);
+ drawWizImage(resNum, state, x1, y1, 0, shadow, 0, r, flags, dstResNum, palette);
break;
case 90:
- //drawWizComplexPolygonHelper(resNum, state, x1, y1, r, flags, dstResNum, paletteNum);
+ //drawWizComplexPolygonHelper(resNum, state, x1, y1, r, flags, dstResNum, palette);
break;
case 0:
- drawWizImage(resNum, state, x1, y1, 0, xmapNum, 0, r, flags, dstResNum, paletteNum);
+ drawWizImage(resNum, state, x1, y1, 0, shadow, 0, r, flags, dstResNum, palette);
break;
default:
- //drawWizPolygonTransform(resNum, state, pts, flags, VAR(VAR_WIZ_TCOLOR), r, dstResNum, paletteNum, xmapPtr);
+ //drawWizPolygonTransform(resNum, state, pts, flags, VAR(VAR_WIZ_TCOLOR), r, dstResNum, palette, xmapPtr);
break;
}
}
}
-void Wiz::drawWizPolygon(int resNum, int state, int id, int flags, int xmapNum, int dstResNum, int paletteNum) {
- debug(1, "drawWizPolygon(resNum %d, id %d, flags 0x%X, xmapNum %d paletteNum %d)", resNum, id, flags, xmapNum, paletteNum);
+void Wiz::drawWizPolygon(int resNum, int state, int id, int flags, int shadow, int dstResNum, int palette) {
+ debug(1, "drawWizPolygon(resNum %d, id %d, flags 0x%X, shadow %d palette %d)", resNum, id, flags, shadow, palette);
int i;
WizPolygon *wp = NULL;
for (i = 0; i < ARRAYSIZE(_polygons); ++i) {
@@ -1262,7 +1262,7 @@
error("Invalid point count %d for Polygon %d", wp->numVerts, id);
}
const Common::Rect *r = NULL;
- uint8 *srcWizBuf = drawWizImage(resNum, state, 0, 0, 0, xmapNum, 0, r, kWIFBlitToMemBuffer, 0, paletteNum);
+ uint8 *srcWizBuf = drawWizImage(resNum, state, 0, 0, 0, shadow, 0, r, kWIFBlitToMemBuffer, 0, palette);
if (srcWizBuf) {
uint8 *dst;
int32 wizW, wizH;
@@ -1357,10 +1357,10 @@
for (int i = 0; i < _imagesNum; ++i) {
WizImage *pwi = &_images[i];
if (pwi->flags & kWIFIsPolygon) {
- drawWizPolygon(pwi->resNum, pwi->state, pwi->x1, pwi->flags, pwi->xmapNum, 0, pwi->paletteNum);
+ drawWizPolygon(pwi->resNum, pwi->state, pwi->x1, pwi->flags, pwi->shadow, 0, pwi->palette);
} else {
const Common::Rect *r = NULL;
- drawWizImage(pwi->resNum, pwi->state, pwi->x1, pwi->y1, pwi->zorder, pwi->xmapNum, pwi->field_390, r, pwi->flags, 0, pwi->paletteNum);
+ drawWizImage(pwi->resNum, pwi->state, pwi->x1, pwi->y1, pwi->zorder, pwi->shadow, pwi->field_390, r, pwi->flags, 0, pwi->palette);
}
}
_imagesNum = 0;
@@ -1403,18 +1403,18 @@
}
void Wiz::displayWizComplexImage(const WizParameters *params) {
- int maskImgResNum = 0;
+ int sourceImage = 0;
if (params->processFlags & kWPFMaskImg) {
- maskImgResNum = params->maskImgResNum;
+ sourceImage = params->sourceImage;
warning("displayWizComplexImage() unhandled flag 0x80000");
}
- int paletteNum = 0;
+ int palette = 0;
if (params->processFlags & kWPFPaletteNum) {
- paletteNum = params->img.paletteNum;
+ palette = params->img.palette;
}
- int zoom = 256;
- if (params->processFlags & kWPFZoom) {
- zoom = params->zoom;
+ int scale = 256;
+ if (params->processFlags & kWPFScaled) {
+ scale = params->scale;
}
int rotationAngle = 0;
if (params->processFlags & kWPFRotate) {
@@ -1434,9 +1434,9 @@
po_x = params->img.x1;
po_y = params->img.y1;
}
- int xmapNum = 0;
- if (params->processFlags & kWPFXmapNum) {
- xmapNum = params->xmapNum;
+ int shadow = 0;
+ if (params->processFlags & kWPFShadow) {
+ shadow = params->shadow;
}
int field_390 = 0;
if (params->processFlags & 0x200000) {
@@ -1468,7 +1468,7 @@
}
if (_vm->_fullRedraw && dstResNum == 0) {
- if (maskImgResNum != 0 || (params->processFlags & (kWPFZoom | kWPFRotate)))
+ if (sourceImage != 0 || (params->processFlags & (kWPFScaled | kWPFRotate)))
error("Can't do this command in the enter script.");
assert(_imagesNum < ARRAYSIZE(_images));
@@ -1479,20 +1479,20 @@
pwi->zorder = params->img.zorder;
pwi->state = state;
pwi->flags = flags;
- pwi->xmapNum = xmapNum;
+ pwi->shadow = shadow;
pwi->field_390 = field_390;
- pwi->paletteNum = paletteNum;
+ pwi->palette = palette;
++_imagesNum;
} else {
- if (maskImgResNum != 0) {
+ if (sourceImage != 0) {
// TODO
- } else if (params->processFlags & (kWPFZoom | kWPFRotate)) {
- drawWizComplexPolygon(params->img.resNum, state, po_x, po_y, xmapNum, rotationAngle, zoom, r, flags, dstResNum, paletteNum);
+ } else if (params->processFlags & (kWPFScaled | kWPFRotate)) {
+ drawWizComplexPolygon(params->img.resNum, state, po_x, po_y, shadow, rotationAngle, scale, r, flags, dstResNum, palette);
} else {
if (flags & kWIFIsPolygon) {
- drawWizPolygon(params->img.resNum, state, po_x, flags, xmapNum, dstResNum, paletteNum); // XXX , VAR(VAR_WIZ_TCOLOR));
+ drawWizPolygon(params->img.resNum, state, po_x, flags, shadow, dstResNum, palette); // XXX , VAR(VAR_WIZ_TCOLOR));
} else {
- drawWizImage(params->img.resNum, state, po_x, po_y, params->img.zorder, xmapNum, field_390, r, flags, dstResNum, paletteNum);
+ drawWizImage(params->img.resNum, state, po_x, po_y, params->img.zorder, shadow, field_390, r, flags, dstResNum, palette);
}
}
}
Index: wiz_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.h,v
retrieving revision 2.24
retrieving revision 2.25
diff -u -d -r2.24 -r2.25
--- wiz_he.h 23 May 2005 03:33:08 -0000 2.24
+++ wiz_he.h 5 Jun 2005 08:02:50 -0000 2.25
@@ -42,9 +42,9 @@
int zorder;
int state;
int flags;
- int xmapNum;
+ int shadow;
int field_390;
- int paletteNum;
+ int palette;
};
struct WizParameters {
@@ -64,13 +64,13 @@
int compType;
int fileWriteMode;
int angle;
- int zoom;
- int xmapNum;
+ int scale;
+ int shadow;
int field_164;
int field_168;
int resDefImgW;
int resDefImgH;
- int maskImgResNum;
+ int sourceImage;
int field_180;
int field_184;
uint8 remapColor[256];
@@ -97,7 +97,7 @@
Common::Rect box2;
int field_23DE;
int spriteId;
- int groupNum;
+ int spriteGroup;
int field_23EA;
WizImage img;
};
@@ -116,8 +116,8 @@
enum WizProcessFlags {
kWPFSetPos = 0x1,
- kWPFXmapNum = 0x4,
- kWPFZoom = 0x8,
+ kWPFShadow = 0x4,
+ kWPFScaled = 0x8,
kWPFRotate = 0x10,
kWPFNewFlags = 0x20,
kWPFRemapPalette = 0x40,
@@ -179,9 +179,9 @@
void displayWizComplexImage(const WizParameters *params);
void displayWizImage(WizImage *pwi);
void captureWizImage(int resNum, const Common::Rect& r, bool frontBuffer, int compType);
- uint8 *drawWizImage(int resNum, int state, int x1, int y1, int zorder, int xmapNum, int field_390, const Common::Rect *clipBox, int flags, int dstResNum, int paletteNum);
- void drawWizPolygon(int resNum, int state, int id, int flags, int xmapNum, int dstResNum, int paletteNum);
- void drawWizComplexPolygon(int resNum, int state, int po_x, int po_y, int xmapNum, int angle, int zoom, const Common::Rect *r, int flags, int dstResNum, int paletteNum);
+ uint8 *drawWizImage(int resNum, int state, int x1, int y1, int zorder, int shadow, int field_390, const Common::Rect *clipBox, int flags, int dstResNum, int palette);
+ void drawWizPolygon(int resNum, int state, int id, int flags, int shadow, int dstResNum, int palette);
+ void drawWizComplexPolygon(int resNum, int state, int po_x, int po_y, int shadow, int angle, int zoom, const Common::Rect *r, int flags, int dstResNum, int palette);
void processWizImage(const WizParameters *params);
static void copyAuxImage(uint8 *dst1, uint8 *dst2, const uint8 *src, int dstw, int dsth, int srcx, int srcy, int srcw, int srch);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.459,2.460 script_v90he.cpp,2.267,2.268
- Next 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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list