diff options
author | Travis Howell | 2005-06-05 08:02:50 +0000 |
---|---|---|
committer | Travis Howell | 2005-06-05 08:02:50 +0000 |
commit | b452ee87e78269d4560e11845f042663a7c1b669 (patch) | |
tree | 2796e3b91e031d7378ef59d8acb5c74535536111 /scumm/script_v90he.cpp | |
parent | 065ffeaf853fcb4633ba143e1cbf60f6d72b2aba (diff) | |
download | scummvm-rg350-b452ee87e78269d4560e11845f042663a7c1b669.tar.gz scummvm-rg350-b452ee87e78269d4560e11845f042663a7c1b669.tar.bz2 scummvm-rg350-b452ee87e78269d4560e11845f042663a7c1b669.zip |
Rename sprite functions, based on map.
svn-id: r18349
Diffstat (limited to 'scumm/script_v90he.cpp')
-rw-r--r-- | scumm/script_v90he.cpp | 196 |
1 files changed, 98 insertions, 98 deletions
diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp index 16eb808f4f..8c8720f7a7 100644 --- a/scumm/script_v90he.cpp +++ b/scumm/script_v90he.cpp @@ -650,11 +650,11 @@ void ScummEngine_v90he::o90_wizImageOps() { _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 @@ void ScummEngine_v90he::o90_wizImageOps() { 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_getDistanceBetweenPoints() { 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 @@ void ScummEngine_v90he::o90_getSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_getSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_getSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_getSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_getSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_getSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_getSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_getSpriteInfo() { push(_sprite->getSpriteFlagDoubleBuffered(spriteId)); break; case 4: - push(_sprite->getSpriteFlagNeedPaletteRemap(spriteId)); + push(_sprite->getSpriteFlagRemapPalette(spriteId)); break; default: push(0); @@ -959,98 +959,98 @@ void ScummEngine_v90he::o90_getSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_getSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_getSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_getSpriteInfo() { pop(); spriteId = pop(); if (spriteId) - push(_sprite->getSpriteField_44(spriteId)); + push(_sprite->getSpriteUserValue(spriteId)); else push(0); break; @@ -1111,8 +1111,8 @@ void ScummEngine_v90he::o90_setSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteInfo() { _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 @@ void ScummEngine_v90he::o90_setSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteInfo() { spriteId++; for (; spriteId <= _curMaxSpriteId; spriteId++) - _sprite->setSpriteResetSprite(spriteId); + _sprite->resetSprite(spriteId); break; default: error("o90_setSpriteInfo: Unknown case %d", subOp); @@ -1436,7 +1436,7 @@ void ScummEngine_v90he::o90_getSpriteGroupInfo() { case 8: // HE 99+ spriteGroupId = pop(); if (spriteGroupId) - push(getGroupallocateGroupSpritesList(spriteGroupId)); + push(getGroupSpriteArray(spriteGroupId)); else push(0); break; @@ -1485,14 +1485,14 @@ void ScummEngine_v90he::o90_getSpriteGroupInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteGroupInfo() { 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 @@ void ScummEngine_v90he::o90_setSpriteGroupInfo() { if (!_curSpriteGroupId) break; - _sprite->setGroupzorderPriority(_curSpriteGroupId, value1); + _sprite->setGroupPriority(_curSpriteGroupId, value1); break; case 7: value2 = pop(); @@ -1624,7 +1624,7 @@ void ScummEngine_v90he::o90_setSpriteGroupInfo() { if (!_curSpriteGroupId) break; - _sprite->setGroupdstResNum(_curSpriteGroupId, value1); + _sprite->setGroupImage(_curSpriteGroupId, value1); break; case 28: value2 = pop(); @@ -1632,7 +1632,7 @@ void ScummEngine_v90he::o90_setSpriteGroupInfo() { if (!_curSpriteGroupId) break; - _sprite->setGrouptx_ty(_curSpriteGroupId, value1, value2); + _sprite->moveGroup(_curSpriteGroupId, value1, value2); break; case 30: value4 = pop(); @@ -1642,13 +1642,13 @@ void ScummEngine_v90he::o90_setSpriteGroupInfo() { 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) |