libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-10 21:03:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CHEWY: Fix typo (setSetailPos -> setDetailPos)

Browse Source
This commit is contained in:
Filippos Karapetis 2022-06-29 17:17:27 +03:00
parent c604ec8d7e
commit a452290f02
13 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/chewy/detail.cpp
View File

@ -322,7 +322,7 @@ void Detail::setStaticPos(int16 detNr, int16 x, int16 y, bool hideFl, bool corre
_rdi.Sinfo[detNr].Hide = hideFl;
}
void Detail::setSetailPos(int16 detNr, int16 x, int16 y) {
void Detail::setDetailPos(int16 detNr, int16 x, int16 y) {
_rdi.Ainfo[detNr].x = x;
_rdi.Ainfo[detNr].y = y;
}

2
engines/chewy/detail.h
View File

@ -172,7 +172,7 @@ public:
void load_rdi_taf(const char *fname, int16 load_flag);
void setStaticPos(int16 detNr, int16 x, int16 y, bool hideFl, bool correctionFlag);
void setSetailPos(int16 detNr, int16 x, int16 y);
void setDetailPos(int16 detNr, int16 x, int16 y);
void hideStaticSpr(int16 detNr);
void showStaticSpr(int16 detNr);
void freezeAni();

2
engines/chewy/rooms/room12.cpp
View File

@ -170,7 +170,7 @@ void Room12::bork_ok() {
wait_auto_obj(R12_BORK_OBJ);
_G(gameState).R12BorkInRohr = true;
_G(det)->setSetailPos(3, 170, 145);
_G(det)->setDetailPos(3, 170, 145);
_G(det)->startDetail(3, 255, ANI_FRONT);
startAadWait(57);
_G(det)->stop_detail(3);

2
engines/chewy/rooms/room13.cpp
View File

@ -103,7 +103,7 @@ void Room13::talk_bork() {
_G(gameState).R13BorkOk = true;
_G(gameState).R12ChewyBork = false;
_G(det)->showStaticSpr(13);
_G(det)->setSetailPos(10, _G(moveState)[P_CHEWY].Xypos[0], _G(moveState)[P_CHEWY].Xypos[1]);
_G(det)->setDetailPos(10, _G(moveState)[P_CHEWY].Xypos[0], _G(moveState)[P_CHEWY].Xypos[1]);
_G(det)->setStaticPos(12, _G(moveState)[P_CHEWY].Xypos[0], _G(moveState)[P_CHEWY].Xypos[1], false, true);
_G(gameState)._personHide[P_CHEWY] = true;
startAadWait(33);

8
engines/chewy/rooms/room18.cpp
View File

@ -263,8 +263,8 @@ int16 Room18::calc_surimy() {
_G(gameState)._personHide[P_CHEWY] = false;
wait_auto_obj(SURIMY_OBJ);
_G(det)->setSetailPos(21, 392, 170);
_G(det)->setSetailPos(22, 447, 154);
_G(det)->setDetailPos(21, 392, 170);
_G(det)->setDetailPos(22, 447, 154);
startDetailFrame(21, 1, ANI_FRONT, 14);
_G(det)->startDetail(22, 1, ANI_FRONT);
waitDetail(21);
@ -289,8 +289,8 @@ int16 Room18::calc_surimy() {
auto_scroll(70, 0);
wait_auto_obj(SURIMY_OBJ);
_G(det)->setSetailPos(21, 143, 170);
_G(det)->setSetailPos(22, 198, 154);
_G(det)->setDetailPos(21, 143, 170);
_G(det)->setDetailPos(22, 198, 154);
startDetailFrame(21, 1, ANI_FRONT, 14);
_G(det)->startDetail(22, 1, ANI_FRONT);
waitDetail(21);

4
engines/chewy/rooms/room21.cpp
View File

@ -195,7 +195,7 @@ void Room21::chewy_kolli() {
_G(flags).AutoAniPlay = true;
_G(gameState)._personHide[P_CHEWY] = true;
int16 ani_nr = (_G(moveState)[P_CHEWY].Xyvo[0] < 0) ? 10 : 11;
_G(det)->setSetailPos(ani_nr, _G(moveState)[P_CHEWY].Xypos[0], _G(moveState)[P_CHEWY].Xypos[1]);
_G(det)->setDetailPos(ani_nr, _G(moveState)[P_CHEWY].Xypos[0], _G(moveState)[P_CHEWY].Xypos[1]);
startSetAILWait(ani_nr, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
_G(flags).AutoAniPlay = false;
@ -213,7 +213,7 @@ void Room21::salto() {
_G(gameState)._personHide[P_CHEWY] = true;
for (int16 i = 0; i < 3; i++) {
_G(det)->setSetailPos(12 + i, _G(moveState)[P_CHEWY].Xypos[0],
_G(det)->setDetailPos(12 + i, _G(moveState)[P_CHEWY].Xypos[0],
_G(moveState)[P_CHEWY].Xypos[1]);
}

4
engines/chewy/rooms/room28.cpp
View File

@ -250,7 +250,7 @@ void Room28::set_pump() {
_G(gameState)._personHide[P_CHEWY] = true;
int16 tmp = (_G(person_end_phase)[P_CHEWY] == P_RIGHT) ? 1 : 0;
delInventory(K_MASKE_INV);
_G(det)->setSetailPos(tmp, _G(moveState)[P_CHEWY].Xypos[0], _G(moveState)[P_CHEWY].Xypos[1]);
_G(det)->setDetailPos(tmp, _G(moveState)[P_CHEWY].Xypos[0], _G(moveState)[P_CHEWY].Xypos[1]);
if (_G(gameState).R28PumpTxt1 < 3) {
start_aad(137);
@ -297,7 +297,7 @@ void Room28::get_pump() {
_G(gameState).R28ChewyPump = false;
_G(gameState)._personHide[P_CHEWY] = true;
int16 tmp = (_G(person_end_phase)[P_CHEWY] == P_RIGHT) ? 1 : 0;
_G(det)->setSetailPos(tmp, _G(moveState)[P_CHEWY].Xypos[0], _G(moveState)[P_CHEWY].Xypos[1]);
_G(det)->setDetailPos(tmp, _G(moveState)[P_CHEWY].Xypos[0], _G(moveState)[P_CHEWY].Xypos[1]);
startSetAILWait(tmp, 1, ANI_BACK);
invent_2_slot(K_MASKE_INV);

2
engines/chewy/rooms/room40.cpp
View File

@ -182,7 +182,7 @@ void Room40::move_train(int16 mode) {
int16 delay = 0;
while (ax < 560) {
_G(det)->setSetailPos(7, lx, 46);
_G(det)->setDetailPos(7, lx, 46);
_G(det)->setStaticPos(11, ax, 62, false, false);
if (mode && _G(gameState).ChewyAni == CHEWY_PUMPKIN)

4
engines/chewy/rooms/room45.cpp
View File

@ -120,7 +120,7 @@ void Room45::setup_func() {
_G(det)->stop_detail(3 + i);
}
}
_G(det)->setSetailPos(3 + i, x, y);
_G(det)->setDetailPos(3 + i, x, y);
} else {
++_G(r45_pinfo)[i][2];
@ -133,7 +133,7 @@ void Room45::setup_func() {
} else {
x = 0;
}
_G(det)->setSetailPos(3 + i, x, y);
_G(det)->setDetailPos(3 + i, x, y);
_G(det)->startDetail(3 + i, 255, ANI_FRONT);
}
}

2
engines/chewy/rooms/room51.cpp
View File

@ -145,7 +145,7 @@ void Room51::setup_func() {
if ((_G(minfo).button == 1 || _G(in)->getSwitchCode() == 28) && !_flag) {
_flag = true;
_G(det)->setSetailPos(8, _tmpx - 20, _tmpy + 41);
_G(det)->setDetailPos(8, _tmpx - 20, _tmpy + 41);
startSetAILWait(8, 1, ANI_FRONT);
_flag = false;
++_index;

6
engines/chewy/rooms/room78.cpp
View File

@ -49,7 +49,7 @@ void Room78::entry() {
int destX = 592;
while (destX > 0) {
_G(det)->setSetailPos(3, destX, 77);
_G(det)->setDetailPos(3, destX, 77);
if (delay)
--delay;
else {
@ -71,8 +71,8 @@ void Room78::entry() {
bool flag2 = false;
while (exitLoopFlag == 0) {
_G(det)->setSetailPos(0, det0DestX, 93);
_G(det)->setSetailPos(4, det4DestX, 57);
_G(det)->setDetailPos(0, det0DestX, 93);
_G(det)->setDetailPos(4, det4DestX, 57);
if (delay)
--delay;

10
engines/chewy/rooms/room90.cpp
View File

@ -66,7 +66,7 @@ void Room90::entry(int16 eib_nr) {
_G(HowardMov) = 1;
if (_G(gameState).flags34_40 && !_G(gameState).flags33_40) {
_G(det)->setSetailPos(12, 329, 15);
_G(det)->setDetailPos(12, 329, 15);
_G(det)->startDetail(12, 255, false);
g_engine->_sound->playSound(12, 0);
g_engine->_sound->playSound(12);
@ -138,7 +138,7 @@ void Room90::setup_func() {
_G(det)->stop_detail(i + 4);
}
}
_G(det)->setSetailPos(i + 4, destX, destY);
_G(det)->setDetailPos(i + 4, destX, destY);
} else {
++_G(gameState).r90_Array187030[i][2];
if (_G(gameState).r90_Array187030[i][2] < _G(gameState).r90_Array187030[i][3])
@ -151,7 +151,7 @@ void Room90::setup_func() {
else
destX = 500;
_G(det)->setSetailPos(i + 4, destX, _G(Adi)[i + 4].y);
_G(det)->setDetailPos(i + 4, destX, _G(Adi)[i + 4].y);
if (!_G(gameState).flags34_40)
_G(det)->startDetail(i + 4, 255, false);
@ -257,7 +257,7 @@ int Room90::getHubcaps() {
_G(gameState).flags35_1 = true;
autoMove(4, P_CHEWY);
auto_scroll(176, 0);
_G(det)->setSetailPos(12, 495, 15);
_G(det)->setDetailPos(12, 495, 15);
_G(det)->startDetail(12, 255, false);
g_engine->_sound->playSound(12, 0);
g_engine->_sound->playSound(12);
@ -266,7 +266,7 @@ int Room90::getHubcaps() {
while (destX > 329) {
destX -= 2;
_G(det)->setSetailPos(12, destX, 15);
_G(det)->setDetailPos(12, destX, 15);
setupScreen(DO_SETUP);
SHOULD_QUIT_RETURN0;
}

6
engines/chewy/rooms/room97.cpp
View File

@ -82,7 +82,7 @@ void Room97::entry() {
}
if (_G(gameState).flags36_20) {
_G(det)->setSetailPos(27, 272, 110);
_G(det)->setDetailPos(27, 272, 110);
for (int i = 0; i < 2; ++i) {
_G(det)->stop_detail(23 + i);
_G(det)->startDetail(27 + i, 255, ANI_FRONT);
@ -194,7 +194,7 @@ void Room97::setup_func() {
_G(det)->setStaticPos(16, 699, _word18DB38, false, false);
if (_G(gameState).flags36_10) {
_G(det)->setSetailPos(12, _word18DB34, _word18DB36);
_G(det)->setDetailPos(12, _word18DB34, _word18DB36);
} else {
_G(det)->setStaticPos(14, _word18DB34, _word18DB36, false, false);
}
@ -513,7 +513,7 @@ int Room97::proc8() {
_G(det)->stop_detail(27);
_G(gameState).flags36_20 = true;
_G(det)->startDetail(28, 255, false);
_G(det)->setSetailPos(27, 272, 110);
_G(det)->setDetailPos(27, 272, 110);
_G(det)->startDetail(27, 255, false);
_G(atds)->setControlBit(533, ATS_ACTIVE_BIT);
_G(atds)->setControlBit(534, ATS_ACTIVE_BIT);