[Scummvm-git-logs] scummvm master -> 1fbf587117dc3293dd5e307b90366dd7553a9628
bluegr
noreply at scummvm.org
Mon Mar 7 12:35:35 UTC 2022
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
1fbf587117 CHEWY: Renaming
Commit: 1fbf587117dc3293dd5e307b90366dd7553a9628
https://github.com/scummvm/scummvm/commit/1fbf587117dc3293dd5e307b90366dd7553a9628
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-03-07T14:35:02+02:00
Commit Message:
CHEWY: Renaming
Changed paths:
engines/chewy/globals.h
engines/chewy/menus.cpp
engines/chewy/r_event.cpp
engines/chewy/rooms/room00.cpp
engines/chewy/rooms/room01.cpp
engines/chewy/rooms/room02.cpp
engines/chewy/rooms/room03.cpp
engines/chewy/rooms/room05.cpp
engines/chewy/rooms/room06.cpp
engines/chewy/rooms/room07.cpp
engines/chewy/rooms/room08.cpp
engines/chewy/rooms/room09.cpp
engines/chewy/rooms/room12.cpp
engines/chewy/rooms/room13.cpp
engines/chewy/rooms/room14.cpp
engines/chewy/rooms/room17.cpp
engines/chewy/rooms/room18.cpp
engines/chewy/rooms/room21.cpp
engines/chewy/rooms/room22.cpp
engines/chewy/rooms/room23.cpp
engines/chewy/rooms/room24.cpp
engines/chewy/rooms/room27.cpp
engines/chewy/rooms/room28.cpp
engines/chewy/rooms/room29.cpp
engines/chewy/rooms/room32.cpp
engines/chewy/rooms/room33.cpp
engines/chewy/rooms/room35.cpp
engines/chewy/rooms/room37.cpp
engines/chewy/rooms/room39.cpp
engines/chewy/rooms/room40.cpp
engines/chewy/rooms/room42.cpp
engines/chewy/rooms/room42.h
engines/chewy/rooms/room45.cpp
engines/chewy/rooms/room46.cpp
engines/chewy/rooms/room48.cpp
engines/chewy/rooms/room49.cpp
engines/chewy/rooms/room50.cpp
engines/chewy/rooms/room51.cpp
engines/chewy/rooms/room52.cpp
engines/chewy/rooms/room53.cpp
engines/chewy/rooms/room54.cpp
engines/chewy/rooms/room55.cpp
engines/chewy/rooms/room56.cpp
engines/chewy/rooms/room57.cpp
engines/chewy/rooms/room62.cpp
engines/chewy/rooms/room63.cpp
engines/chewy/rooms/room66.cpp
engines/chewy/rooms/room68.cpp
engines/chewy/rooms/room71.cpp
engines/chewy/rooms/room74.cpp
engines/chewy/rooms/room76.cpp
engines/chewy/rooms/room78.cpp
engines/chewy/rooms/room81.cpp
engines/chewy/rooms/room82.cpp
engines/chewy/rooms/room84.cpp
engines/chewy/rooms/room85.cpp
engines/chewy/rooms/room88.cpp
engines/chewy/rooms/room90.cpp
engines/chewy/rooms/room91.cpp
engines/chewy/rooms/room93.cpp
engines/chewy/rooms/room94.cpp
engines/chewy/rooms/room97.cpp
engines/chewy/sprite.cpp
engines/chewy/t_event.cpp
diff --git a/engines/chewy/globals.h b/engines/chewy/globals.h
index 549d4645ad5..7693dae9c98 100644
--- a/engines/chewy/globals.h
+++ b/engines/chewy/globals.h
@@ -441,7 +441,7 @@ void setSsiPos();
int16 atsAction(int16 txtNr, int16 txtMode, int16 MODE);
-void adsAction(int16 diaNr, int16 blkNr, int16 strEndNr);
+void selectDialogOption(int16 diaNr, int16 blkNr, int16 strEndNr);
void ads_ende(int16 diaNr, int16 blkNr, int16 strEndNr);
@@ -458,7 +458,7 @@ void calc_z_ebene();
void startAniBlock(int16 nr, const AniBlock *ab);
-void startSetailWait(int16 aniNr, int16 rep, int16 mode);
+void startSetAILWait(int16 aniNr, int16 rep, int16 mode);
void startDetailFrame(int16 aniNr, int16 rep, int16 mode,
int16 frame);
diff --git a/engines/chewy/menus.cpp b/engines/chewy/menus.cpp
index c80cf71f7ff..d01a1debcb9 100644
--- a/engines/chewy/menus.cpp
+++ b/engines/chewy/menus.cpp
@@ -273,12 +273,12 @@ void adsMenu() {
g_events->_mousePos.y = 159;
AdsNextBlk *an_blk = _G(atds)->ads_item_choice(_G(ads_blk_nr), curY);
if (an_blk->BlkNr == -1) {
- adsAction(_G(ads_dia_nr), _G(ads_blk_nr), an_blk->EndNr);
+ selectDialogOption(_G(ads_dia_nr), _G(ads_blk_nr), an_blk->EndNr);
ads_ende(_G(ads_dia_nr), _G(ads_blk_nr), an_blk->EndNr);
stop_ads_dialog();
} else {
an_blk = _G(atds)->calc_next_block(_G(ads_blk_nr), curY);
- adsAction(_G(ads_dia_nr), _G(ads_blk_nr), an_blk->EndNr);
+ selectDialogOption(_G(ads_dia_nr), _G(ads_blk_nr), an_blk->EndNr);
_G(ads_blk_nr) = an_blk->BlkNr;
_G(ads_item_ptr) = _G(atds)->ads_item_ptr(_G(ads_blk_nr), &_G(ads_item_nr));
}
diff --git a/engines/chewy/r_event.cpp b/engines/chewy/r_event.cpp
index 6b5f9849957..72f436c2987 100644
--- a/engines/chewy/r_event.cpp
+++ b/engines/chewy/r_event.cpp
@@ -67,7 +67,7 @@ void play_scene_ani(int16 nr, int16 mode) {
break;
}
- startSetailWait(nr, 1, mode);
+ startSetAILWait(nr, 1, mode);
switch (r_nr) {
case ROOM_1_1:
diff --git a/engines/chewy/rooms/room00.cpp b/engines/chewy/rooms/room00.cpp
index f82741c513f..e78f01bc8ff 100644
--- a/engines/chewy/rooms/room00.cpp
+++ b/engines/chewy/rooms/room00.cpp
@@ -152,8 +152,8 @@ bool Room0::pullSlime() {
_G(flags).AutoAniPlay = true;
autoMove(2, P_CHEWY);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(3, 1, ANI_FRONT);
- startSetailWait(17, 2, ANI_FRONT);
+ startSetAILWait(3, 1, ANI_FRONT);
+ startSetAILWait(17, 2, ANI_FRONT);
setPersonPos(222, 106, P_CHEWY, P_LEFT);
_G(spieler)._personHide[P_CHEWY] = false;
invent_2_slot(1);
diff --git a/engines/chewy/rooms/room01.cpp b/engines/chewy/rooms/room01.cpp
index 6a86e05c1b8..57975bedb21 100644
--- a/engines/chewy/rooms/room01.cpp
+++ b/engines/chewy/rooms/room01.cpp
@@ -30,7 +30,7 @@ namespace Rooms {
void Room1::gottenCard() {
_G(det)->hideStaticSpr(2);
- startSetailWait(4, 1, ANI_FRONT);
+ startSetAILWait(4, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
_G(atds)->del_steuer_bit(7, ATS_COUNT_BIT, ATS_DATA);
int16 tmp;
diff --git a/engines/chewy/rooms/room02.cpp b/engines/chewy/rooms/room02.cpp
index 6b6e68ea6fe..1e08d8975be 100644
--- a/engines/chewy/rooms/room02.cpp
+++ b/engines/chewy/rooms/room02.cpp
@@ -44,7 +44,7 @@ void Room2::entry() {
void Room2::jump_out_r1(int16 nr) {
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(nr, 1, ANI_FRONT);
+ startSetAILWait(nr, 1, ANI_FRONT);
setupScreen(DO_SETUP);
_G(det)->stop_detail(6);
setPersonPos(32, 127, P_CHEWY, P_LEFT);
diff --git a/engines/chewy/rooms/room03.cpp b/engines/chewy/rooms/room03.cpp
index ad01bdfa1b1..455f54953b2 100644
--- a/engines/chewy/rooms/room03.cpp
+++ b/engines/chewy/rooms/room03.cpp
@@ -112,7 +112,7 @@ void Room3::terminal() {
_G(spieler).room_s_obj[SIB_SLIME].ZustandFlipFlop = 1;
}
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(8, 1, ANI_FRONT);
+ startSetAILWait(8, 1, ANI_FRONT);
setupScreen(DO_SETUP);
_G(det)->stop_detail(6);
clear_prog_ani();
diff --git a/engines/chewy/rooms/room05.cpp b/engines/chewy/rooms/room05.cpp
index cc26cd8e8e9..7c6d327b5bb 100644
--- a/engines/chewy/rooms/room05.cpp
+++ b/engines/chewy/rooms/room05.cpp
@@ -38,11 +38,11 @@ void Room5::pushButton() {
if (_G(spieler).R5Terminal) {
int16 strNr;
if (_G(spieler).R5Tuer == false) {
- startSetailWait(9, 1, ANI_FRONT);
+ startSetAILWait(9, 1, ANI_FRONT);
_G(spieler).room_e_obj[6].Attribut = EXIT_TOP;
strNr = 1;
} else {
- startSetailWait(9, 1, ANI_BACK);
+ startSetAILWait(9, 1, ANI_BACK);
_G(spieler).room_e_obj[6].Attribut = 255;
strNr = 0;
}
diff --git a/engines/chewy/rooms/room06.cpp b/engines/chewy/rooms/room06.cpp
index 8f168deaf25..09c8ebeca42 100644
--- a/engines/chewy/rooms/room06.cpp
+++ b/engines/chewy/rooms/room06.cpp
@@ -94,7 +94,7 @@ void Room6::init_robo() {
void Room6::bola_button() {
if (!_G(spieler).R6BolaBecher) {
_G(det)->hideStaticSpr(0);
- startSetailWait(0, 1, ANI_FRONT);
+ startSetAILWait(0, 1, ANI_FRONT);
if (_G(spieler).R6BolaOk) {
_G(spieler).R6BolaBecher = true;
_G(det)->showStaticSpr(0);
diff --git a/engines/chewy/rooms/room07.cpp b/engines/chewy/rooms/room07.cpp
index 1885b1891d4..e4cea0e46db 100644
--- a/engines/chewy/rooms/room07.cpp
+++ b/engines/chewy/rooms/room07.cpp
@@ -83,8 +83,8 @@ void Room7::bell() {
startAniBlock(3, ABLOCK25);
_G(det)->showStaticSpr(7);
- startSetailWait(12, 1, ANI_FRONT);
- startSetailWait(11, 1, ANI_FRONT);
+ startSetAILWait(12, 1, ANI_FRONT);
+ startSetAILWait(11, 1, ANI_FRONT);
_G(det)->hideStaticSpr(7);
_G(det)->stop_detail(5);
setPersonPos(95, 94, P_CHEWY, P_RIGHT);
@@ -94,7 +94,7 @@ void Room7::bell() {
start_aad(6, 0);
startAniBlock(3, ABLOCK25);
_G(det)->showStaticSpr(7);
- startSetailWait(10, 1, ANI_FRONT);
+ startSetAILWait(10, 1, ANI_FRONT);
_G(det)->startDetail(13, 1, ANI_FRONT);
setPersonPos(95, 94, P_CHEWY, P_RIGHT);
_G(det)->stop_detail(5);
@@ -105,7 +105,7 @@ void Room7::bell() {
_G(spieler)._personHide[P_CHEWY] = true;
_G(det)->startDetail(0, 255, ANI_FRONT);
- startSetailWait(13, 1, ANI_FRONT);
+ startSetAILWait(13, 1, ANI_FRONT);
flic_cut(FCUT_001);
_G(det)->stop_detail(0);
_G(spieler).scrollx = 0;
@@ -152,7 +152,7 @@ void Room7::bell() {
_G(spieler).R7BorkFlug = true;
_G(spieler)._personHide[P_CHEWY] = true;
start_aad(8, 0);
- startSetailWait(1, 1, ANI_FRONT);
+ startSetAILWait(1, 1, ANI_FRONT);
_G(obj)->set_rsi_flip_flop(SIB_TBUTTON2_R7, 255);
_G(obj)->hide_sib(SIB_KLINGEL_R7);
_G(flags).NoPalAfterFlc = false;
@@ -173,7 +173,7 @@ void Room7::gedAction(int index) {
if (index == 0 && _G(spieler).R7BorkFlug && _G(spieler).R7ChewyFlug) {
_G(spieler)._personHide[P_CHEWY] = true;
setPersonPos(180, 124, P_CHEWY, P_LEFT);
- startSetailWait(20, 1, ANI_FRONT);
+ startSetAILWait(20, 1, ANI_FRONT);
_G(det)->showStaticSpr(10);
waitShowScreen(10 * _G(spieler).DelaySpeed);
_G(det)->hideStaticSpr(10);
diff --git a/engines/chewy/rooms/room08.cpp b/engines/chewy/rooms/room08.cpp
index 3fac73dc79c..078c808eba5 100644
--- a/engines/chewy/rooms/room08.cpp
+++ b/engines/chewy/rooms/room08.cpp
@@ -73,7 +73,7 @@ void Room8::hole_kohle() {
_G(spieler).R8Kohle = true;
autoMove(4, P_CHEWY);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(12, 1, ANI_FRONT);
+ startSetAILWait(12, 1, ANI_FRONT);
cur_2_inventory();
invent_2_slot(KOHLE_HEISS_INV);
_G(spieler)._personHide[P_CHEWY] = false;
@@ -123,11 +123,11 @@ bool Room8::gips_wurf() {
_G(spieler)._personHide[P_CHEWY] = true;
delInventory(GIPS_EIMER_INV);
- startSetailWait(4, 1, ANI_FRONT);
+ startSetAILWait(4, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
startDetailFrame(5, 1, ANI_FRONT, 16);
- startSetailWait(6, 1, ANI_FRONT);
+ startSetAILWait(6, 1, ANI_FRONT);
_G(obj)->show_sib(33);
_G(det)->showStaticSpr(14);
waitDetail(5);
@@ -141,7 +141,7 @@ bool Room8::gips_wurf() {
Dialogs::Inventory::look_screen(INVENTORY_NORMAL, 178);
_G(flags).AtsAction = true;
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(20, 1, ANI_FRONT);
+ startSetAILWait(20, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
invent_2_slot(MASKE_INV);
cursorChoice(_G(menu_item));
@@ -155,7 +155,7 @@ void Room8::open_gdoor() {
_G(spieler)._personHide[P_CHEWY] = true;
_G(det)->showStaticSpr(17);
setupScreen(DO_SETUP);
- startSetailWait(7, 1, ANI_FRONT);
+ startSetAILWait(7, 1, ANI_FRONT);
_G(det)->showStaticSpr(15);
_G(det)->hideStaticSpr(17);
_G(spieler)._personHide[P_CHEWY] = false;
diff --git a/engines/chewy/rooms/room09.cpp b/engines/chewy/rooms/room09.cpp
index 8504596ea4f..34a45aa5f68 100644
--- a/engines/chewy/rooms/room09.cpp
+++ b/engines/chewy/rooms/room09.cpp
@@ -62,7 +62,7 @@ void Room9::entry() {
void Room9::gtuer() {
_G(spieler).R9Gitter = true;
_G(det)->showStaticSpr(5);
- startSetailWait(6, 1, ANI_FRONT);
+ startSetAILWait(6, 1, ANI_FRONT);
setPersonPos(74, 93, P_CHEWY, P_LEFT);
_G(atds)->del_steuer_bit(74, ATS_AKTIV_BIT, ATS_DATA);
_G(atds)->del_steuer_bit(75, ATS_AKTIV_BIT, ATS_DATA);
@@ -104,7 +104,7 @@ void Room9::surimy_ani() {
startDetailFrame(0, 1, ANI_FRONT, 15);
_G(det)->startDetail(2, 1, ANI_FRONT);
waitDetail(0);
- startSetailWait(1, 1, ANI_FRONT);
+ startSetAILWait(1, 1, ANI_FRONT);
start_spz(CH_EKEL, 2, ANI_FRONT, P_CHEWY);
_G(det)->hideStaticSpr(4);
_G(mov_phasen)[SURIMY_OBJ].Repeat = 1;
diff --git a/engines/chewy/rooms/room12.cpp b/engines/chewy/rooms/room12.cpp
index 2744be3a448..947fe7d038a 100644
--- a/engines/chewy/rooms/room12.cpp
+++ b/engines/chewy/rooms/room12.cpp
@@ -179,7 +179,7 @@ void Room12::bork_ok() {
init_auto_obj(R12_BORK_OBJ, &R12_BORK_PHASEN[0][0], 3, (const MovLine *)R12_BORK_MPKT2);
wait_auto_obj(R12_BORK_OBJ);
_G(det)->hideStaticSpr(10);
- startSetailWait(4, 1, ANI_FRONT);
+ startSetAILWait(4, 1, ANI_FRONT);
_G(talk_hide_static) = -1;
_G(det)->showStaticSpr(12);
_G(atds)->set_ats_str(118, TXT_MARK_LOOK, 2, ATS_DATA);
diff --git a/engines/chewy/rooms/room13.cpp b/engines/chewy/rooms/room13.cpp
index e2b57ae9360..d0c382725b0 100644
--- a/engines/chewy/rooms/room13.cpp
+++ b/engines/chewy/rooms/room13.cpp
@@ -161,7 +161,7 @@ void Room13::jmp_band() {
_G(spieler).R13Band = true;
autoMove(3, P_CHEWY);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(8, 1, ANI_FRONT);
+ startSetAILWait(8, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
setPersonPos(292, 98, P_CHEWY, P_RIGHT);
@@ -205,7 +205,7 @@ void Room13::jmp_floor() {
_G(spieler).R13Band = false;
autoMove(5, P_CHEWY);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(7, 1, ANI_FRONT);
+ startSetAILWait(7, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
setPersonPos(176, 138, P_CHEWY, P_LEFT);
}
@@ -223,7 +223,7 @@ int16 Room13::monitor_button() {
action_flag = true;
autoMove(8, P_CHEWY);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(6, 1, ANI_FRONT);
+ startSetAILWait(6, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
if (_G(spieler).R13MonitorStatus)
diff --git a/engines/chewy/rooms/room14.cpp b/engines/chewy/rooms/room14.cpp
index 5798659707d..584bbaec08d 100644
--- a/engines/chewy/rooms/room14.cpp
+++ b/engines/chewy/rooms/room14.cpp
@@ -61,7 +61,7 @@ void Room14::eremit_feuer(int16 t_nr, int16 ani_nr) {
if (!_G(flags).AutoAniPlay && !_G(spieler).R14Feuer) {
_G(flags).AutoAniPlay = true;
_G(det)->hideStaticSpr(9);
- startSetailWait(_G(room)->_roomTimer._objNr[ani_nr], 1, ANI_FRONT);
+ startSetAILWait(_G(room)->_roomTimer._objNr[ani_nr], 1, ANI_FRONT);
_G(uhr)->resetTimer(t_nr, 0);
_G(det)->showStaticSpr(9);
_G(det)->startDetail(7, 1, ANI_FRONT);
@@ -75,7 +75,7 @@ int16 Room14::use_schrott() {
if (!_G(spieler).inv_cur) {
autoMove(3, P_CHEWY);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(12, 1, ANI_FRONT);
+ startSetAILWait(12, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
if (!_G(spieler).R14Waffe) {
@@ -98,7 +98,7 @@ int16 Room14::use_gleiter() {
if (!_G(spieler).R14GleiterAuf) {
_G(spieler).R14GleiterAuf = true;
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(10, 1, ANI_FRONT);
+ startSetAILWait(10, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
_G(det)->showStaticSpr(6);
_G(atds)->set_ats_str(107, TXT_MARK_LOOK, 1, ATS_DATA);
@@ -134,7 +134,7 @@ int16 Room14::use_schleim() {
if (!_G(spieler).inv_cur) {
autoMove(2, P_CHEWY);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(11, 1, ANI_FRONT);
+ startSetAILWait(11, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
if (!_G(spieler).R14Sicherung) {
@@ -161,7 +161,7 @@ void Room14::feuer() {
waffe = true;
_G(spieler)._personHide[P_CHEWY] = true;
startDetailFrame(8, 1, ANI_FRONT, 11);
- startSetailWait(9, 1, ANI_FRONT);
+ startSetAILWait(9, 1, ANI_FRONT);
waitDetail(8);
_G(spieler)._personHide[P_CHEWY] = false;
} else {
@@ -169,10 +169,10 @@ void Room14::feuer() {
_G(det)->hideStaticSpr(9);
startDetailFrame(2, 1, ANI_FRONT, 9);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(13, 1, ANI_FRONT);
+ startSetAILWait(13, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
waitDetail(2);
- startSetailWait(5, 1, ANI_FRONT);
+ startSetAILWait(5, 1, ANI_FRONT);
_G(det)->showStaticSpr(9);
}
@@ -185,7 +185,7 @@ void Room14::feuer() {
startAadWait(26);
_G(det)->hideStaticSpr(9);
- startSetailWait(3, 1, ANI_FRONT);
+ startSetAILWait(3, 1, ANI_FRONT);
_G(det)->showStaticSpr(9);
invent_2_slot(FLUXO_INV);
_G(atds)->set_ats_str(105, TXT_MARK_LOOK, 1, ATS_DATA);
diff --git a/engines/chewy/rooms/room17.cpp b/engines/chewy/rooms/room17.cpp
index c1b246355f2..e9cb9a93824 100644
--- a/engines/chewy/rooms/room17.cpp
+++ b/engines/chewy/rooms/room17.cpp
@@ -145,7 +145,7 @@ int16 Room17::use_seil() {
_G(flags).AutoAniPlay = true;
autoMove(5, P_CHEWY);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(10, 1, ANI_FRONT);
+ startSetAILWait(10, 1, ANI_FRONT);
_G(spieler).R17Seil = true;
_G(atds)->del_steuer_bit(139, ATS_AKTIV_BIT, ATS_DATA);
plot_seil();
@@ -171,7 +171,7 @@ void Room17::kletter_down() {
autoMove(5, P_CHEWY);
_G(det)->load_taf_seq(177, 1, nullptr);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(14, 1, ANI_FRONT);
+ startSetAILWait(14, 1, ANI_FRONT);
_G(flags).ZoomMov = false;
_G(zoom_mov_fak) = 1;
_G(spieler).ScrollyStep = 2;
@@ -187,7 +187,7 @@ void Room17::kletter_up() {
autoMove(6, P_CHEWY);
_G(det)->load_taf_seq(141, 4, nullptr);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(11, 1, ANI_FRONT);
+ startSetAILWait(11, 1, ANI_FRONT);
_G(flags).ZoomMov = true;
_G(zoom_mov_fak) = 3;
_G(spieler).ScrollyStep = 1;
@@ -244,7 +244,7 @@ void Room17::door_kommando(int16 mode) {
if (!_G(spieler).R17DoorKommand) {
_G(spieler).room_e_obj[36].Attribut = EXIT_TOP;
_G(spieler).R17DoorKommand = true;
- startSetailWait(4, 1, ANI_FRONT);
+ startSetAILWait(4, 1, ANI_FRONT);
stopPerson(P_CHEWY);
_G(det)->showStaticSpr(7);
}
@@ -326,7 +326,7 @@ int16 Room17::get_oel() {
close_door();
autoMove(4, P_CHEWY);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(13, 1, ANI_FRONT);
+ startSetAILWait(13, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
delInventory(_G(spieler).AkInvent);
_G(obj)->addInventory(BECHER_VOLL_INV, &_G(room_blk));
diff --git a/engines/chewy/rooms/room18.cpp b/engines/chewy/rooms/room18.cpp
index 29f60622a37..3b80d3d8f74 100644
--- a/engines/chewy/rooms/room18.cpp
+++ b/engines/chewy/rooms/room18.cpp
@@ -129,20 +129,20 @@ bool Room18::timer(int16 t_nr, int16 ani_nr) {
if (t_nr == _G(timer_nr)[0]) {
_G(det)->hideStaticSpr(16);
- startSetailWait(10, 1, ANI_FRONT);
+ startSetAILWait(10, 1, ANI_FRONT);
_G(det)->showStaticSpr(16);
_G(uhr)->resetTimer(_G(timer_nr)[0], 10);
} else if (t_nr == _G(timer_nr)[1]) {
hideCur();
_G(det)->hideStaticSpr(17);
- startSetailWait(9, 1, ANI_FRONT);
+ startSetAILWait(9, 1, ANI_FRONT);
_G(det)->showStaticSpr(17);
if (!_G(spieler).R18SondeMoni) {
_G(spieler).R18SondeMoni = true;
- startSetailWait(2, 1, ANI_FRONT);
+ startSetAILWait(2, 1, ANI_FRONT);
_G(det)->showStaticSpr(9);
- startSetailWait(4, 1, ANI_FRONT);
+ startSetAILWait(4, 1, ANI_FRONT);
_G(det)->showStaticSpr(11);
waitShowScreen(50);
_G(det)->hideStaticSpr(9);
@@ -206,7 +206,7 @@ int16 Room18::sonden_moni() {
hideCur();
autoMove(8, P_CHEWY);
- startSetailWait(3, 1, ANI_FRONT);
+ startSetAILWait(3, 1, ANI_FRONT);
_G(det)->showStaticSpr(10);
startAniBlock(3, ABLOCK20);
@@ -355,10 +355,10 @@ short Room18::use_cart_moni() {
if (!_G(spieler).R18CartTerminal) {
_G(atds)->set_ats_str(147, TXT_MARK_LOOK, 0, ATS_DATA);
_G(det)->hideStaticSpr(23);
- startSetailWait(20, 1, ANI_BACK);
+ startSetAILWait(20, 1, ANI_BACK);
} else {
_G(atds)->set_ats_str(147, TXT_MARK_LOOK, 1, ATS_DATA);
- startSetailWait(20, 1, ANI_FRONT);
+ startSetAILWait(20, 1, ANI_FRONT);
_G(det)->showStaticSpr(23);
if (_G(spieler).R18CartFach) {
diff --git a/engines/chewy/rooms/room21.cpp b/engines/chewy/rooms/room21.cpp
index 54a386a3636..164aae85003 100644
--- a/engines/chewy/rooms/room21.cpp
+++ b/engines/chewy/rooms/room21.cpp
@@ -195,7 +195,7 @@ void Room21::chewy_kolli() {
_G(spieler)._personHide[P_CHEWY] = true;
int16 ani_nr = (_G(spieler_vector)[P_CHEWY].Xyvo[0] < 0) ? 10 : 11;
_G(det)->setSetailPos(ani_nr, _G(spieler_vector)[P_CHEWY].Xypos[0], _G(spieler_vector)[P_CHEWY].Xypos[1]);
- startSetailWait(ani_nr, 1, ANI_FRONT);
+ startSetAILWait(ani_nr, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
_G(flags).AutoAniPlay = false;
_G(spieler_vector)[P_CHEWY].Count = tmp;
@@ -232,7 +232,7 @@ void Room21::use_gitter_energie() {
switchRoom(17);
_G(det)->hideStaticSpr(5);
- startSetailWait(9, 1, ANI_FRONT);
+ startSetAILWait(9, 1, ANI_FRONT);
_G(spieler).R17GitterWeg = true;
_G(spieler)._personHide[P_CHEWY] = false;
}
diff --git a/engines/chewy/rooms/room22.cpp b/engines/chewy/rooms/room22.cpp
index 53dc6d17c9a..de5b47109e3 100644
--- a/engines/chewy/rooms/room22.cpp
+++ b/engines/chewy/rooms/room22.cpp
@@ -85,7 +85,7 @@ int16 Room22::chewy_amboss() {
autoMove(5, P_CHEWY);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(1, 1, ANI_FRONT);
+ startSetAILWait(1, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
autoMove(2, P_CHEWY);
_G(flags).NoPalAfterFlc = false;
@@ -140,7 +140,7 @@ void Room22::bork_walk1() {
init_auto_obj(BORK_OBJ, &BORK_PHASEN[0][0], _G(mov_phasen)[BORK_OBJ].Lines, (const MovLine *)BORK_MPKT);
wait_auto_obj(BORK_OBJ);
- startSetailWait(2, 1, ANI_FRONT);
+ startSetAILWait(2, 1, ANI_FRONT);
_G(mov_phasen)[BORK_OBJ].Repeat = 1;
init_auto_obj(BORK_OBJ, &BORK_PHASEN[0][0], _G(mov_phasen)[BORK_OBJ].Lines, (const MovLine *)BORK_MPKT1);
diff --git a/engines/chewy/rooms/room23.cpp b/engines/chewy/rooms/room23.cpp
index 3d935c74550..bd9899c2346 100644
--- a/engines/chewy/rooms/room23.cpp
+++ b/engines/chewy/rooms/room23.cpp
@@ -134,7 +134,7 @@ void Room23::use_cartridge() {
if (_G(spieler).R18CartSave) {
_G(atds)->del_steuer_bit(171, ATS_AKTIV_BIT, ATS_DATA);
_G(atds)->set_ats_str(111, 2, ATS_DATA);
- startSetailWait(4, 1, ANI_FRONT);
+ startSetAILWait(4, 1, ANI_FRONT);
_G(det)->showStaticSpr(3);
} else {
_G(atds)->set_ats_str(111, 1, ATS_DATA);
diff --git a/engines/chewy/rooms/room24.cpp b/engines/chewy/rooms/room24.cpp
index 7a6d7d5c508..5f506913442 100644
--- a/engines/chewy/rooms/room24.cpp
+++ b/engines/chewy/rooms/room24.cpp
@@ -132,8 +132,8 @@ void Room24::calc_animation(int16 kristall_nr) {
g_engine->_sound->playSound(ani_nr + kristall_nr * 4, 0);
g_engine->_sound->stopSound(0);
_G(det)->hideStaticSpr(_G(spieler).R24KristallLast[kristall_nr] + kristall_nr * 2);
- startSetailWait(ani_nr + kristall_nr * 4, 1, ANI_BACK);
- startSetailWait(6 + kristall_nr * 4, 1, ANI_BACK);
+ startSetAILWait(ani_nr + kristall_nr * 4, 1, ANI_BACK);
+ startSetAILWait(6 + kristall_nr * 4, 1, ANI_BACK);
_G(det)->startDetail(5 + kristall_nr * 4, 255, ANI_BACK);
} else if (_G(spieler).R24KristallLast[kristall_nr] == 20) {
@@ -141,8 +141,8 @@ void Room24::calc_animation(int16 kristall_nr) {
g_engine->_sound->stopSound(0);
g_engine->_sound->playSound(5 + ani_nr + kristall_nr * 4, 0);
_G(det)->stop_detail(5 + kristall_nr * 4);
- startSetailWait(6 + kristall_nr * 4, 1, ANI_FRONT);
- startSetailWait(ani_nr + kristall_nr * 4, 1, ANI_FRONT);
+ startSetAILWait(6 + kristall_nr * 4, 1, ANI_FRONT);
+ startSetAILWait(ani_nr + kristall_nr * 4, 1, ANI_FRONT);
}
showCur();
diff --git a/engines/chewy/rooms/room27.cpp b/engines/chewy/rooms/room27.cpp
index 32814b3a1f2..eeb18eeb86c 100644
--- a/engines/chewy/rooms/room27.cpp
+++ b/engines/chewy/rooms/room27.cpp
@@ -50,7 +50,7 @@ void Room27::xit(int16 eib_nr) {
startAadWait(175);
_G(room)->set_timer_status(0, TIMER_STOP);
_G(det)->del_static_ani(0);
- startSetailWait(2, 1, ANI_FRONT);
+ startSetAILWait(2, 1, ANI_FRONT);
_G(spieler)._personRoomNr[P_HOWARD] = 28;
_G(spieler_mi)[P_HOWARD].Id = HOWARD_OBJ;
} else if (_G(spieler).R27HowardGed < 3 && eib_nr != -1) {
diff --git a/engines/chewy/rooms/room28.cpp b/engines/chewy/rooms/room28.cpp
index 2ee6d1e9925..3f91f929a00 100644
--- a/engines/chewy/rooms/room28.cpp
+++ b/engines/chewy/rooms/room28.cpp
@@ -255,7 +255,7 @@ void Room28::set_pump() {
++_G(spieler).R28PumpTxt1;
}
- startSetailWait(tmp, 1, ANI_FRONT);
+ startSetAILWait(tmp, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
load_chewy_taf(CHEWY_PUMPKIN);
@@ -296,7 +296,7 @@ void Room28::get_pump() {
_G(spieler)._personHide[P_CHEWY] = true;
int16 tmp = (_G(person_end_phase)[P_CHEWY] == P_RIGHT) ? 1 : 0;
_G(det)->setSetailPos(tmp, _G(spieler_vector)[P_CHEWY].Xypos[0], _G(spieler_vector)[P_CHEWY].Xypos[1]);
- startSetailWait(tmp, 1, ANI_BACK);
+ startSetAILWait(tmp, 1, ANI_BACK);
invent_2_slot(K_MASKE_INV);
_G(atds)->set_ats_str(209, 0, ATS_DATA);
diff --git a/engines/chewy/rooms/room29.cpp b/engines/chewy/rooms/room29.cpp
index a316d9bda2e..0286621e8db 100644
--- a/engines/chewy/rooms/room29.cpp
+++ b/engines/chewy/rooms/room29.cpp
@@ -117,7 +117,7 @@ bool Room29::use_schlauch() {
start_spz_wait(CH_LGET_U, 1, false, P_CHEWY);
_G(det)->hideStaticSpr(7);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(4, 1, ANI_FRONT);
+ startSetAILWait(4, 1, ANI_FRONT);
_G(det)->showStaticSpr(8);
_G(det)->showStaticSpr(10);
_G(atds)->del_steuer_bit(219, ATS_AKTIV_BIT, ATS_DATA);
diff --git a/engines/chewy/rooms/room32.cpp b/engines/chewy/rooms/room32.cpp
index a932bd48cfb..ac18d7bcc7d 100644
--- a/engines/chewy/rooms/room32.cpp
+++ b/engines/chewy/rooms/room32.cpp
@@ -59,12 +59,12 @@ int16 Room32::use_howard() {
_G(det)->hideStaticSpr(0);
startDetailFrame(0, 1, ANI_FRONT, 9);
- startSetailWait(1, 1, ANI_BACK);
+ startSetAILWait(1, 1, ANI_BACK);
_G(det)->showStaticSpr(7);
_G(det)->showStaticSpr(6);
waitShowScreen(20);
_G(det)->hideStaticSpr(7);
- startSetailWait(1, 1, ANI_FRONT);
+ startSetAILWait(1, 1, ANI_FRONT);
start_spz(CH_TALK3, 255, ANI_FRONT, P_CHEWY);
ani_nr = CH_TALK3;
dia_nr = 164;
diff --git a/engines/chewy/rooms/room33.cpp b/engines/chewy/rooms/room33.cpp
index 0179b78b5de..6bf9850f526 100644
--- a/engines/chewy/rooms/room33.cpp
+++ b/engines/chewy/rooms/room33.cpp
@@ -134,7 +134,7 @@ void Room33::use_maschine() {
if (action) {
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(0, 1, ANI_FRONT);
+ startSetAILWait(0, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
setPersonPos(128, 65, P_CHEWY, P_LEFT);
start_spz_wait(CH_LGET_O, 1, false, P_CHEWY);
@@ -162,7 +162,7 @@ void Room33::use_maschine() {
if (_G(spieler).R33MunterOk) {
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(2, 1, ANI_FRONT);
+ startSetAILWait(2, 1, ANI_FRONT);
flic_cut(FCUT_031);
_G(spieler)._personHide[P_CHEWY] = false;
start_spz(CH_TALK3, 255, ANI_FRONT, P_CHEWY);
@@ -172,7 +172,7 @@ void Room33::use_maschine() {
if (hocker) {
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(1, 1, ANI_FRONT);
+ startSetAILWait(1, 1, ANI_FRONT);
setPersonPos(64, 100, P_CHEWY, P_LEFT);
}
diff --git a/engines/chewy/rooms/room35.cpp b/engines/chewy/rooms/room35.cpp
index bec52b46f6b..5369091b918 100644
--- a/engines/chewy/rooms/room35.cpp
+++ b/engines/chewy/rooms/room35.cpp
@@ -93,9 +93,9 @@ int16 Room35::use_cat() {
delInventory(_G(spieler).AkInvent);
_G(det)->stop_detail(0);
_G(det)->del_static_ani(0);
- startSetailWait(1, 1, ANI_FRONT);
+ startSetAILWait(1, 1, ANI_FRONT);
_G(det)->startDetail(2, 1, ANI_FRONT);
- startSetailWait(3, 1, ANI_FRONT);
+ startSetAILWait(3, 1, ANI_FRONT);
_G(obj)->show_sib(SIB_KNOCHEN_R35);
_G(obj)->calc_rsi_flip_flop(SIB_KNOCHEN_R35);
_G(det)->showStaticSpr(7);
diff --git a/engines/chewy/rooms/room37.cpp b/engines/chewy/rooms/room37.cpp
index 59436cbb356..60d983d629c 100644
--- a/engines/chewy/rooms/room37.cpp
+++ b/engines/chewy/rooms/room37.cpp
@@ -184,13 +184,13 @@ void Room37::dog_bell() {
disable_timer();
_G(det)->stop_detail(3);
_G(det)->del_static_ani(3);
- startSetailWait(5, 1, ANI_FRONT);
+ startSetAILWait(5, 1, ANI_FRONT);
_G(det)->hideStaticSpr(9);
- startSetailWait(6, 1, ANI_FRONT);
+ startSetAILWait(6, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = true;
_G(det)->startDetail(11, 255, ANI_FRONT);
flic_cut(FCUT_050);
- startSetailWait(6, 1, ANI_BACK);
+ startSetAILWait(6, 1, ANI_BACK);
_G(det)->stop_detail(11);
setPersonPos(326, 85, P_CHEWY, P_LEFT);
_G(spieler)._personHide[P_CHEWY] = false;
@@ -211,7 +211,7 @@ void Room37::dog_bell() {
_G(room)->set_timer_status(3, TIMER_STOP);
_G(det)->del_static_ani(3);
_G(det)->stop_detail(3);
- startSetailWait(4, 1, ANI_FRONT);
+ startSetAILWait(4, 1, ANI_FRONT);
flic_cut(FCUT_051);
_G(spieler).scrollx = 104;
flic_cut(FCUT_054);
diff --git a/engines/chewy/rooms/room39.cpp b/engines/chewy/rooms/room39.cpp
index 12bfedf1208..b1007ebcaa3 100644
--- a/engines/chewy/rooms/room39.cpp
+++ b/engines/chewy/rooms/room39.cpp
@@ -84,7 +84,7 @@ short Room39::use_howard() {
_G(det)->startDetail(6, 255, ANI_FRONT);
startAadWait(170);
_G(det)->stop_detail(6);
- startSetailWait(7, 1, ANI_FRONT);
+ startSetAILWait(7, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
delInventory(_G(spieler).AkInvent);
@@ -93,7 +93,7 @@ short Room39::use_howard() {
start_spz(CH_TALK6, 255, ANI_FRONT, P_CHEWY);
startAadWait(167);
_G(det)->stop_detail(3);
- startSetailWait(4, 1, ANI_FRONT);
+ startSetAILWait(4, 1, ANI_FRONT);
_G(det)->set_static_ani(5, -1);
_G(atds)->set_ats_str(62, 1, ATS_DATA);
startAadWait(169);
diff --git a/engines/chewy/rooms/room40.cpp b/engines/chewy/rooms/room40.cpp
index f47672e77a3..c623fe11266 100644
--- a/engines/chewy/rooms/room40.cpp
+++ b/engines/chewy/rooms/room40.cpp
@@ -286,7 +286,7 @@ void Room40::setup_func() {
_G(det)->stop_detail(17);
_G(spieler).R40HoUse = true;
_G(person_end_phase)[P_CHEWY] = P_RIGHT;
- startSetailWait(10, 1, ANI_FRONT);
+ startSetAILWait(10, 1, ANI_FRONT);
_G(person_end_phase)[P_HOWARD] = P_RIGHT;
startAadWait(224);
_G(spieler).R40PoliceWeg = true;
@@ -325,7 +325,7 @@ int16 Room40::use_mr_pumpkin() {
action_ret = true;
autoMove(5, P_CHEWY);
delInventory(_G(spieler).AkInvent);
- startSetailWait(15, 1, ANI_FRONT);
+ startSetAILWait(15, 1, ANI_FRONT);
start_spz(CH_PUMP_TALK, 255, ANI_FRONT, P_CHEWY);
startAadWait(200);
break;
@@ -397,11 +397,11 @@ int16 Room40::use_schalter(int16 aad_nr) {
}
_G(det)->hideStaticSpr(15);
- startSetailWait(12, 1, ANI_FRONT);
+ startSetAILWait(12, 1, ANI_FRONT);
_G(det)->set_static_ani(14, -1);
startAadWait(aad_nr);
_G(det)->del_static_ani(14);
- startSetailWait(13, 1, ANI_FRONT);
+ startSetAILWait(13, 1, ANI_FRONT);
_G(det)->showStaticSpr(15);
_G(room)->set_timer_status(255, TIMER_START);
_G(uhr)->resetTimer(_G(timer_nr)[0], 0);
@@ -547,7 +547,7 @@ void Room40::bmeister_dia(int16 aad_nr) {
_G(det)->del_static_ani(0);
_G(room)->set_timer_status(0, TIMER_STOP);
_G(det)->stop_detail(0);
- startSetailWait(1, 1, ANI_FRONT);
+ startSetAILWait(1, 1, ANI_FRONT);
_G(det)->set_static_ani(2, -1);
if (aad_nr == 237) {
diff --git a/engines/chewy/rooms/room42.cpp b/engines/chewy/rooms/room42.cpp
index eb711c58144..0f5cbb669dc 100644
--- a/engines/chewy/rooms/room42.cpp
+++ b/engines/chewy/rooms/room42.cpp
@@ -75,22 +75,22 @@ void Room42::setup_func() {
calc_person_look();
}
-void Room42::get_kuerbis(int16 aad_nr) {
+void Room42::getPumpkin(int16 aad_nr) {
hideCur();
autoMove(1, P_CHEWY);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(7, 1, ANI_BACK);
+ startSetAILWait(7, 1, ANI_BACK);
_G(spieler)._personHide[P_CHEWY] = false;
start_spz(CH_TALK5, 255, ANI_FRONT, P_CHEWY);
startAadWait(aad_nr);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(7, 1, ANI_FRONT);
+ startSetAILWait(7, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
showCur();
}
-int16 Room42::use_psack() {
+int16 Room42::useMailBag() {
int16 action_flag = false;
if (_G(menu_item) == CUR_HOWARD)
@@ -99,16 +99,16 @@ int16 Room42::use_psack() {
hideCur();
if (!_G(spieler).R42BeamterWach && !_G(spieler).inv_cur) {
action_flag = true;
- get_kuerbis(136);
+ getPumpkin(136);
} else if (_G(spieler).R42HoToBeamter && !_G(spieler).inv_cur && !_G(spieler).R42MarkeOk) {
action_flag = true;
autoMove(3, P_CHEWY);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(10, 1, ANI_FRONT);
+ startSetAILWait(10, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
startAadWait(187);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(9, 1, ANI_FRONT);
+ startSetAILWait(9, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
new_invent_2_cur(BMARKE_INV);
startAadWait(181);
@@ -120,7 +120,7 @@ int16 Room42::use_psack() {
action_flag = true;
autoMove(3, P_CHEWY);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(10, 1, ANI_FRONT);
+ startSetAILWait(10, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
delInventory(_G(spieler).AkInvent);
startAadWait(183);
@@ -140,7 +140,7 @@ int16 Room42::use_psack() {
return action_flag;
}
-int16 Room42::use_beamter() {
+int16 Room42::useStationEmployee() {
int16 action_flag = false;
if (_G(menu_item) == CUR_HOWARD) {
@@ -160,7 +160,7 @@ int16 Room42::use_beamter() {
return action_flag;
}
-void Room42::talk_beamter() {
+void Room42::talkToStationEmployee() {
int16 dia_nr;
autoMove(1, P_CHEWY);
@@ -175,7 +175,7 @@ void Room42::talk_beamter() {
startAdsWait(dia_nr);
}
-void Room42::dia_beamter(int16 str_end_nr) {
+void Room42::dialogWithStationEmployee(int16 str_end_nr) {
hideCur();
if (str_end_nr != 4) {
@@ -189,16 +189,16 @@ void Room42::dia_beamter(int16 str_end_nr) {
switch (str_end_nr) {
case 1:
- startSetailWait(3, 4, ANI_FRONT);
+ startSetAILWait(3, 4, ANI_FRONT);
break;
case 2:
g_engine->_sound->playSound(4);
- startSetailWait(4, 13, ANI_FRONT);
+ startSetAILWait(4, 13, ANI_FRONT);
break;
case 3:
- startSetailWait(5, 2, ANI_FRONT);
+ startSetAILWait(5, 2, ANI_FRONT);
break;
default:
@@ -212,7 +212,7 @@ void Room42::dia_beamter(int16 str_end_nr) {
_G(det)->stop_detail(0);
g_engine->_sound->stopSound(0);
- startSetailWait(1, 1, ANI_FRONT);
+ startSetAILWait(1, 1, ANI_FRONT);
_G(det)->startDetail(2, 255, ANI_FRONT);
while (_G(atds)->aadGetStatus() != -1) {
diff --git a/engines/chewy/rooms/room42.h b/engines/chewy/rooms/room42.h
index a948a4d2300..0a902a4ccc3 100644
--- a/engines/chewy/rooms/room42.h
+++ b/engines/chewy/rooms/room42.h
@@ -28,16 +28,16 @@ namespace Rooms {
class Room42 {
private:
static void setup_func();
- static void get_kuerbis(int16 aad_nr);
+ static void getPumpkin(int16 aad_nr);
public:
static void entry();
static void xit();
- static void talk_beamter();
- static int16 use_psack();
- static int16 use_beamter();
- static void dia_beamter(int16 str_end_nr);
+ static void talkToStationEmployee();
+ static int16 useMailBag();
+ static int16 useStationEmployee();
+ static void dialogWithStationEmployee(int16 str_end_nr);
};
} // namespace Rooms
diff --git a/engines/chewy/rooms/room45.cpp b/engines/chewy/rooms/room45.cpp
index d418d77be62..00082580cee 100644
--- a/engines/chewy/rooms/room45.cpp
+++ b/engines/chewy/rooms/room45.cpp
@@ -199,11 +199,11 @@ int16 Room45::use_taxi() {
void Room45::talk_taxi(int16 aad_nr) {
_G(room)->set_timer_status(12, TIMER_STOP);
_G(det)->del_static_ani(12);
- startSetailWait(13, 1, ANI_FRONT);
+ startSetAILWait(13, 1, ANI_FRONT);
_G(det)->set_static_ani(14, -1);
startAadWait(aad_nr);
_G(det)->del_static_ani(14);
- startSetailWait(13, 1, ANI_BACK);
+ startSetAILWait(13, 1, ANI_BACK);
_G(det)->set_static_ani(12, -1);
_G(room)->set_timer_status(12, TIMER_START);
}
@@ -229,7 +229,7 @@ void Room45::taxi_mov() {
g_engine->_sound->playSound(15, 2);
g_engine->_sound->playSound(15, 2, false);
g_engine->_sound->playSound(15, 0);
- startSetailWait(15, 1, ANI_FRONT);
+ startSetAILWait(15, 1, ANI_FRONT);
g_engine->_sound->stopSound(0);
switchRoom(48);
}
@@ -247,7 +247,7 @@ int16 Room45::use_boy() {
startAadWait(258);
_G(room)->set_timer_status(0, TIMER_STOP);
_G(det)->del_static_ani(0);
- startSetailWait(1, 1, ANI_FRONT);
+ startSetAILWait(1, 1, ANI_FRONT);
_G(room)->set_timer_status(0, TIMER_START);
_G(det)->set_static_ani(0, -1);
_G(spieler).R45MagOk = true;
diff --git a/engines/chewy/rooms/room46.cpp b/engines/chewy/rooms/room46.cpp
index 7dfa635a743..57d9500d532 100644
--- a/engines/chewy/rooms/room46.cpp
+++ b/engines/chewy/rooms/room46.cpp
@@ -111,15 +111,15 @@ void Room46::bodo() {
autoMove(2, P_CHEWY);
_G(spieler_mi)[P_CHEWY].Mode = false;
- startSetailWait(0, 1, ANI_FRONT);
+ startSetAILWait(0, 1, ANI_FRONT);
_G(det)->startDetail(5, 255, ANI_FRONT);
startAadWait(241);
_G(det)->stop_detail(5);
_G(det)->showStaticSpr(5);
startAadWait(609);
_G(det)->hideStaticSpr(5);
- startSetailWait(2, 1, ANI_FRONT);
- startSetailWait(3, 1, ANI_FRONT);
+ startSetAILWait(2, 1, ANI_FRONT);
+ startSetAILWait(3, 1, ANI_FRONT);
_G(det)->startDetail(4, 255, ANI_FRONT);
startAadWait(242);
_G(det)->stop_detail(4);
@@ -127,10 +127,10 @@ void Room46::bodo() {
_G(det)->showStaticSpr(6);
startAadWait(610);
_G(det)->hideStaticSpr(6);
- startSetailWait(6, 1, ANI_FRONT);
+ startSetAILWait(6, 1, ANI_FRONT);
_G(det)->showStaticSpr(3);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(1, 1, ANI_FRONT);
+ startSetAILWait(1, 1, ANI_FRONT);
flic_cut(FCUT_065);
_G(out)->setPointer(nullptr);
_G(out)->cls();
diff --git a/engines/chewy/rooms/room48.cpp b/engines/chewy/rooms/room48.cpp
index b4af662df73..219dd2e4d85 100644
--- a/engines/chewy/rooms/room48.cpp
+++ b/engines/chewy/rooms/room48.cpp
@@ -75,9 +75,9 @@ void Room48::frage() {
if (!_G(flags).AutoAniPlay) {
_G(flags).AutoAniPlay = true;
hideCur();
- startSetailWait(1, 1, ANI_FRONT);
+ startSetAILWait(1, 1, ANI_FRONT);
_G(det)->showStaticSpr(6);
- startSetailWait(1, 1, ANI_BACK);
+ startSetAILWait(1, 1, ANI_BACK);
_G(det)->hideStaticSpr(6);
_G(uhr)->resetTimer(_G(timer_nr)[0], 0);
showCur();
@@ -136,7 +136,7 @@ void Room48::setup_func() {
_G(room)->set_timer_status(0, TIMER_STOP);
_G(det)->stop_detail(0);
_G(det)->del_static_ani(0);
- startSetailWait(2, 1, ANI_FRONT);
+ startSetAILWait(2, 1, ANI_FRONT);
g_engine->_sound->stopSound(0);
_G(menu_item) = CUR_WALK;
cursorChoice(_G(menu_item));
diff --git a/engines/chewy/rooms/room49.cpp b/engines/chewy/rooms/room49.cpp
index 9f564ce346e..e9b1ecc94f9 100644
--- a/engines/chewy/rooms/room49.cpp
+++ b/engines/chewy/rooms/room49.cpp
@@ -131,14 +131,14 @@ void Room49::calc_boy() {
goAutoXy(374, 79, P_HOWARD, ANI_WAIT);
setPersonSpr(P_LEFT, P_HOWARD);
_G(det)->del_static_ani(2);
- startSetailWait(3, 1, ANI_FRONT);
+ startSetAILWait(3, 1, ANI_FRONT);
_G(det)->showStaticSpr(9);
_G(spieler)._personHide[P_HOWARD] = true;
- startSetailWait(8, 1, ANI_FRONT);
+ startSetAILWait(8, 1, ANI_FRONT);
_G(spieler)._personHide[P_HOWARD] = false;
_G(det)->hideStaticSpr(9);
- startSetailWait(4, 1, ANI_GO);
+ startSetAILWait(4, 1, ANI_GO);
_G(SetUpScreenFunc) = setup_func;
_G(det)->set_static_ani(_G(spieler).R49BoyAni ? 1 : 0, -1);
@@ -259,7 +259,7 @@ int16 Room49::use_taxi() {
}
_G(det)->hideStaticSpr(7);
- startSetailWait(5, 1, ANI_FRONT);
+ startSetAILWait(5, 1, ANI_FRONT);
g_engine->_sound->stopSound(0);
switchRoom(48);
}
diff --git a/engines/chewy/rooms/room50.cpp b/engines/chewy/rooms/room50.cpp
index 20bdc3d42c0..b96380dd2ef 100644
--- a/engines/chewy/rooms/room50.cpp
+++ b/engines/chewy/rooms/room50.cpp
@@ -190,7 +190,7 @@ int16 Room50::use_gum() {
_G(room)->set_timer_status(1, TIMER_STOP);
_wasser = false;
stop_page();
- startSetailWait(6, 1, ANI_FRONT);
+ startSetAILWait(6, 1, ANI_FRONT);
_G(det)->set_static_ani(5, -1);
autoMove(3, P_CHEWY);
_G(spieler_mi)[P_CHEWY].Mode = true;
@@ -201,14 +201,14 @@ int16 Room50::use_gum() {
setPersonSpr(P_LEFT, P_HOWARD);
delInventory(_G(spieler).AkInvent);
hide_person();
- startSetailWait(2, 1, ANI_FRONT);
+ startSetAILWait(2, 1, ANI_FRONT);
_G(det)->showStaticSpr(4);
- startSetailWait(2, 1, ANI_BACK);
+ startSetAILWait(2, 1, ANI_BACK);
show_person();
setPersonSpr(P_LEFT, P_CHEWY);
startAadWait(275);
_G(det)->del_static_ani(5);
- startSetailWait(9, 1, ANI_FRONT);
+ startSetAILWait(9, 1, ANI_FRONT);
_G(det)->del_static_ani(5);
_G(det)->set_static_ani(10, -1);
startAadWait(277);
@@ -237,7 +237,7 @@ void Room50::aad_page(int16 aad_nr, int16 ani_nr) {
_G(det)->set_static_ani(ani_nr, -1);
startAadWait(aad_nr);
_G(det)->del_static_ani(ani_nr);
- startSetailWait(6, 1, ANI_BACK);
+ startSetAILWait(6, 1, ANI_BACK);
go_page();
if (!_G(spieler).R50KeyOK)
diff --git a/engines/chewy/rooms/room51.cpp b/engines/chewy/rooms/room51.cpp
index 416384c78a6..42d65fbed33 100644
--- a/engines/chewy/rooms/room51.cpp
+++ b/engines/chewy/rooms/room51.cpp
@@ -146,7 +146,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);
- startSetailWait(8, 1, ANI_FRONT);
+ startSetAILWait(8, 1, ANI_FRONT);
_flag = false;
++_index;
@@ -240,7 +240,7 @@ int16 Room51::use_door(int16 txt_nr) {
g_engine->_sound->playSound(2, 0);
g_engine->_sound->playSound(2);
_G(det)->showStaticSpr(1);
- startSetailWait(2, 1, ANI_FRONT);
+ startSetAILWait(2, 1, ANI_FRONT);
_G(det)->startDetail(5, 255, ANI_FRONT);
if (!_G(spieler).R52HotDogOk) {
@@ -319,7 +319,7 @@ int16 Room51::use_door(int16 txt_nr) {
case 1:
_G(det)->showStaticSpr(3);
startAadWait(280);
- startSetailWait(1, 1, ANI_FRONT);
+ startSetAILWait(1, 1, ANI_FRONT);
++_G(spieler).R51DoorCount;
_G(obj)->show_sib(SIB_KAPPE_R51);
_G(obj)->calc_rsi_flip_flop(SIB_KAPPE_R51);
diff --git a/engines/chewy/rooms/room52.cpp b/engines/chewy/rooms/room52.cpp
index 679598a813e..6e746e5d433 100644
--- a/engines/chewy/rooms/room52.cpp
+++ b/engines/chewy/rooms/room52.cpp
@@ -92,7 +92,7 @@ int16 Room52::use_hot_dog() {
action_ret = true;
autoMove(5, P_CHEWY);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(7, 1, ANI_FRONT);
+ startSetAILWait(7, 1, ANI_FRONT);
g_engine->_sound->playSound(7, 0);
g_engine->_sound->playSound(7);
_G(det)->startDetail(8, 255, ANI_FRONT);
@@ -105,7 +105,7 @@ int16 Room52::use_hot_dog() {
g_engine->_sound->stopSound(0);
_G(det)->stop_detail(0);
_G(det)->stop_detail(8);
- startSetailWait(7, 1, ANI_BACK);
+ startSetAILWait(7, 1, ANI_BACK);
g_engine->_sound->stopSound(0);
_G(spieler)._personHide[P_CHEWY] = false;
_G(atds)->set_steuer_bit(341, ATS_AKTIV_BIT, ATS_DATA);
diff --git a/engines/chewy/rooms/room53.cpp b/engines/chewy/rooms/room53.cpp
index e706c0c3203..39171c30a55 100644
--- a/engines/chewy/rooms/room53.cpp
+++ b/engines/chewy/rooms/room53.cpp
@@ -44,7 +44,7 @@ void Room53::entry() {
hideCur();
_G(obj)->hide_sib(SIB_VISIT_R53);
_G(atds)->del_steuer_bit(319, ATS_AKTIV_BIT, ATS_DATA);
- startSetailWait(0, 1, ANI_FRONT);
+ startSetAILWait(0, 1, ANI_FRONT);
_G(det)->set_static_ani(1, -1);
_G(timer_nr)[0] = _G(room)->set_timer(1, 7);
showCur();
@@ -53,7 +53,7 @@ void Room53::entry() {
void Room53::man_go() {
_G(room)->set_timer_status(1, TIMER_STOP);
_G(det)->del_static_ani(1);
- startSetailWait(5, 1, ANI_FRONT);
+ startSetAILWait(5, 1, ANI_FRONT);
_G(atds)->set_steuer_bit(319, ATS_AKTIV_BIT, ATS_DATA);
if (!_G(spieler).R53Visit)
_G(obj)->show_sib(SIB_VISIT_R53);
@@ -64,11 +64,11 @@ void Room53::talk_man() {
autoMove(2, P_CHEWY);
_G(room)->set_timer_status(1, TIMER_STOP);
_G(det)->del_static_ani(1);
- startSetailWait(2, 1, ANI_FRONT);
+ startSetAILWait(2, 1, ANI_FRONT);
_G(det)->set_static_ani(3, -1);
startAadWait(269 + (_G(spieler).R53Kostuem ? 1 : 0));
_G(det)->del_static_ani(3);
- startSetailWait(4, 1, ANI_FRONT);
+ startSetAILWait(4, 1, ANI_FRONT);
man_go();
showCur();
}
diff --git a/engines/chewy/rooms/room54.cpp b/engines/chewy/rooms/room54.cpp
index 157a383db35..4d35bbddf97 100644
--- a/engines/chewy/rooms/room54.cpp
+++ b/engines/chewy/rooms/room54.cpp
@@ -142,7 +142,7 @@ int16 Room54::use_schalter() {
g_engine->_sound->playSound(0, 1);
g_engine->_sound->stopSound(2);
- startSetailWait(1, 1, ANI_FRONT);
+ startSetAILWait(1, 1, ANI_FRONT);
_G(det)->startDetail(3, 255, ANI_FRONT);
startAadWait(292 + _G(spieler).R54LiftCount);
_G(det)->stop_detail(3);
@@ -150,19 +150,19 @@ int16 Room54::use_schalter() {
int16 aad_nr;
if (_G(spieler).R54LiftCount < 3) {
- startSetailWait(2, 1, ANI_FRONT);
+ startSetAILWait(2, 1, ANI_FRONT);
_G(det)->hideStaticSpr(0);
g_engine->_sound->stopSound(0);
g_engine->_sound->stopSound(1);
g_engine->_sound->playSound(1, 2);
- startSetailWait(1, 1, ANI_BACK);
+ startSetAILWait(1, 1, ANI_BACK);
g_engine->_sound->stopSound(2);
aad_nr = 295;
} else {
- startSetailWait(5, 1, ANI_FRONT);
+ startSetAILWait(5, 1, ANI_FRONT);
_G(det)->showStaticSpr(9);
- startSetailWait(4, 1, ANI_FRONT);
+ startSetAILWait(4, 1, ANI_FRONT);
aad_nr = 296;
_G(spieler).R54FputzerWeg = true;
_G(atds)->del_steuer_bit(345, ATS_AKTIV_BIT, ATS_DATA);
@@ -200,13 +200,13 @@ void Room54::talk_verkauf() {
startAadWait(299);
_G(room)->set_timer_status(6, TIMER_STOP);
_G(det)->del_static_ani(6);
- startSetailWait(7, 1, ANI_FRONT);
+ startSetAILWait(7, 1, ANI_FRONT);
_G(det)->startDetail(8, 255, ANI_FRONT);
startAadWait(310);
_G(det)->stop_detail(8);
- startSetailWait(9, 1, ANI_FRONT);
- startSetailWait(10, 1, ANI_FRONT);
+ startSetAILWait(9, 1, ANI_FRONT);
+ startSetAILWait(10, 1, ANI_FRONT);
_G(det)->startDetail(11, 255, ANI_FRONT);
startAadWait(311);
_G(det)->stop_detail(11);
diff --git a/engines/chewy/rooms/room55.cpp b/engines/chewy/rooms/room55.cpp
index 46cf2c80b8e..be299fe56eb 100644
--- a/engines/chewy/rooms/room55.cpp
+++ b/engines/chewy/rooms/room55.cpp
@@ -75,7 +75,7 @@ void Room55::entry() {
if (_G(spieler).R55Location) {
_G(spieler).scrollx = 136;
setPersonPos(404, 66, P_CHEWY, P_RIGHT);
- startSetailWait(3, 1, ANI_FRONT);
+ startSetAILWait(3, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
_G(zoom_horizont) = 1;
_G(atds)->del_steuer_bit(340, ATS_AKTIV_BIT, ATS_DATA);
@@ -188,11 +188,11 @@ int16 Room55::use_telefon() {
_G(spieler).R55RaumOk = true;
autoMove(6, P_CHEWY);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(10, 1, ANI_FRONT);
+ startSetAILWait(10, 1, ANI_FRONT);
_G(det)->startDetail(11, 255, ANI_FRONT);
startAadWait(329);
_G(det)->stop_detail(11);
- startSetailWait(10, 1, ANI_BACK);
+ startSetAILWait(10, 1, ANI_BACK);
_G(spieler)._personHide[P_CHEWY] = false;
autoMove(7, P_CHEWY);
@@ -200,7 +200,7 @@ int16 Room55::use_telefon() {
auto_scroll(0, 0);
startAadWait(330);
_G(det)->showStaticSpr(8);
- startSetailWait(0, 1, ANI_FRONT);
+ startSetAILWait(0, 1, ANI_FRONT);
_G(det)->startDetail(1, 255, ANI_FRONT);
startAadWait(331);
_G(det)->stop_detail(1);
@@ -208,7 +208,7 @@ int16 Room55::use_telefon() {
_G(det)->showStaticSpr(16);
startAadWait(608);
_G(det)->hideStaticSpr(16);
- startSetailWait(2, 1, ANI_FRONT);
+ startSetAILWait(2, 1, ANI_FRONT);
_G(det)->hideStaticSpr(0);
_G(det)->hideStaticSpr(8);
_G(atds)->set_ats_str(354, 1, ATS_DATA);
@@ -326,16 +326,16 @@ void Room55::rock2mans() {
}
void Room55::verleger_mov(int16 mode) {
- startSetailWait(7, 1, ANI_FRONT);
+ startSetAILWait(7, 1, ANI_FRONT);
_G(det)->showStaticSpr(11);
- startSetailWait(13, 1, ANI_FRONT);
- startSetailWait(14, 1, ANI_FRONT);
+ startSetAILWait(13, 1, ANI_FRONT);
+ startSetAILWait(14, 1, ANI_FRONT);
if (_G(spieler).ChewyAni == CHEWY_JMANS)
start_spz(CH_JM_TITS, 1, ANI_FRONT, P_CHEWY);
if (mode)
- startSetailWait(15, 1, ANI_FRONT);
+ startSetAILWait(15, 1, ANI_FRONT);
_G(det)->set_static_ani(16, -1);
}
@@ -347,7 +347,7 @@ void Room55::strasse(int16 mode) {
_G(det)->del_static_ani(4);
_G(det)->stop_detail(4);
_G(atds)->set_steuer_bit(340, ATS_AKTIV_BIT, ATS_DATA);
- startSetailWait(3, 1, ANI_BACK);
+ startSetAILWait(3, 1, ANI_BACK);
_G(spieler).scrollx = 0;
switchRoom(54);
@@ -365,7 +365,7 @@ int16 Room55::use_kammeraus() {
else if (!_G(spieler).R55SekWeg) {
hideCur();
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(5, 1, ANI_FRONT);
+ startSetAILWait(5, 1, ANI_FRONT);
_G(det)->showStaticSpr(10);
flic_cut(FCUT_070);
register_cutscene(18);
@@ -430,7 +430,7 @@ void Room55::talk_line() {
_G(room)->set_timer_status(aniNr, TIMER_STOP);
_G(det)->stop_detail(aniNr);
_G(det)->del_static_ani(aniNr);
- startSetailWait(22, 1, ANI_FRONT);
+ startSetAILWait(22, 1, ANI_FRONT);
_G(det)->set_static_ani(21, -1);
} else if (!_G(spieler).R55RaumOk) {
autoMove(3, P_CHEWY);
@@ -442,10 +442,10 @@ void Room55::talk_line() {
if (_G(spieler).R55SekWeg) {
_G(det)->del_static_ani(16);
- startSetailWait(14, 1, ANI_FRONT);
+ startSetAILWait(14, 1, ANI_FRONT);
} else {
_G(det)->del_static_ani(21);
- startSetailWait(22, 1, ANI_FRONT);
+ startSetAILWait(22, 1, ANI_FRONT);
}
_G(flags).NoScroll = false;
diff --git a/engines/chewy/rooms/room56.cpp b/engines/chewy/rooms/room56.cpp
index 8c79a057132..99e8eaaec02 100644
--- a/engines/chewy/rooms/room56.cpp
+++ b/engines/chewy/rooms/room56.cpp
@@ -58,11 +58,11 @@ void Room56::entry() {
setPersonPos(3, 42, P_CHEWY, P_RIGHT);
g_engine->_sound->stopSound(0);
g_engine->_sound->playSound(7, 1);
- startSetailWait(7, 1, ANI_BACK);
- startSetailWait(8, 1, ANI_FRONT);
+ startSetAILWait(7, 1, ANI_BACK);
+ startSetAILWait(8, 1, ANI_FRONT);
g_engine->_sound->stopSound(1);
g_engine->_sound->playSound(7, 0);
- startSetailWait(7, 1, ANI_FRONT);
+ startSetAILWait(7, 1, ANI_FRONT);
setupScreen(DO_SETUP);
if (!_G(spieler).R56GetTabak) {
@@ -214,7 +214,7 @@ int16 Room56::use_taxi() {
autoMove(1, P_CHEWY);
g_engine->_sound->stopSound(0);
g_engine->_sound->playSound(7, 1);
- startSetailWait(7, 1, ANI_BACK);
+ startSetAILWait(7, 1, ANI_BACK);
_G(det)->startDetail(8, 1, ANI_FRONT);
_G(zoom_horizont) = 0;
_G(room)->set_zoom(23);
@@ -260,7 +260,7 @@ int16 Room56::use_man() {
_G(det)->del_static_ani(0);
if (!_G(spieler).R56WhiskyMix) {
- startSetailWait(4, 1, ANI_FRONT);
+ startSetAILWait(4, 1, ANI_FRONT);
_G(det)->set_static_ani(5, -1);
startAadWait(304);
@@ -270,7 +270,7 @@ int16 Room56::use_man() {
} else {
delInventory(_G(spieler).AkInvent);
_G(spieler).R56AbfahrtOk = true;
- startSetailWait(6, 1, ANI_FRONT);
+ startSetAILWait(6, 1, ANI_FRONT);
_G(det)->set_static_ani(1, -1);
startAadWait(305);
@@ -300,7 +300,7 @@ int16 Room56::use_kneipe() {
_G(spieler).R56Kneipe = true;
_G(flags).NoScroll = true;
auto_scroll(0, 0);
- startSetailWait(12, 3, ANI_FRONT);
+ startSetAILWait(12, 3, ANI_FRONT);
flic_cut(FCUT_075);
g_engine->_sound->stopSound(0);
g_engine->_sound->playSound(9);
diff --git a/engines/chewy/rooms/room57.cpp b/engines/chewy/rooms/room57.cpp
index 15afd8fe301..e7c89e42ada 100644
--- a/engines/chewy/rooms/room57.cpp
+++ b/engines/chewy/rooms/room57.cpp
@@ -101,7 +101,7 @@ int16 Room57::use_taxi() {
g_engine->_sound->playSound(3);
_G(room)->set_timer_status(3, TIMER_STOP);
_G(det)->del_static_ani(3);
- startSetailWait(5, 1, ANI_FRONT);
+ startSetAILWait(5, 1, ANI_FRONT);
g_engine->_sound->stopSound(0);
switchRoom(48);
}
@@ -138,7 +138,7 @@ int16 Room57::use_pfoertner() {
_G(spieler).R57StudioAuf = true;
_G(spieler).room_e_obj[91].Attribut = EXIT_TOP;
_G(det)->hideStaticSpr(4);
- startSetailWait(6, 1, ANI_WAIT);
+ startSetAILWait(6, 1, ANI_WAIT);
g_engine->_sound->stopSound(0);
_G(atds)->set_steuer_bit(358, ATS_AKTIV_BIT, ATS_DATA);
} else {
diff --git a/engines/chewy/rooms/room62.cpp b/engines/chewy/rooms/room62.cpp
index 5035057af01..68df13fd274 100644
--- a/engines/chewy/rooms/room62.cpp
+++ b/engines/chewy/rooms/room62.cpp
@@ -52,7 +52,7 @@ void Room62::entry() {
_G(det)->startDetail(6, 255, ANI_FRONT);
startAadWait(347);
_G(det)->stop_detail(6);
- startSetailWait(7, 1, ANI_FRONT);
+ startSetAILWait(7, 1, ANI_FRONT);
_G(det)->set_static_ani(5, -1);
_G(det)->startDetail(0, 255, ANI_FRONT);
startAadWait(348);
@@ -64,7 +64,7 @@ void Room62::entry() {
goAutoXy(160, 240, P_CHEWY, ANI_WAIT);
_G(spieler_mi)[P_CHEWY].Mode = false;
_G(det)->del_static_ani(5);
- startSetailWait(7, 1, ANI_FRONT);
+ startSetAILWait(7, 1, ANI_FRONT);
showCur();
_G(spieler).R64Moni1Ani = 3;
_G(spieler).R64Moni2Ani = 4;
diff --git a/engines/chewy/rooms/room63.cpp b/engines/chewy/rooms/room63.cpp
index 479a2ed8d8c..8360b77276b 100644
--- a/engines/chewy/rooms/room63.cpp
+++ b/engines/chewy/rooms/room63.cpp
@@ -141,7 +141,7 @@ void Room63::bork_platt() {
autoMove(6, P_CHEWY);
_G(spieler_mi)[P_CHEWY].Mode = false;
startAadWait(370);
- startSetailWait(4, 1, ANI_FRONT);
+ startSetAILWait(4, 1, ANI_FRONT);
_G(det)->showStaticSpr(13);
startAadWait(361);
_G(out)->cls();
@@ -203,11 +203,11 @@ int16 Room63::use_fx_man() {
remove_inventory(34);
startAadWait(359);
_G(det)->del_static_ani(5);
- startSetailWait(6, 1, ANI_FRONT);
+ startSetAILWait(6, 1, ANI_FRONT);
_G(det)->startDetail(7, 255, ANI_FRONT);
startAadWait(362);
_G(det)->stop_detail(7);
- startSetailWait(8, 1, ANI_FRONT);
+ startSetAILWait(8, 1, ANI_FRONT);
_G(spieler).R63FxMannWeg = true;
_G(atds)->set_steuer_bit(384, ATS_AKTIV_BIT, ATS_DATA);
showCur();
@@ -230,11 +230,11 @@ int16 Room63::use_schalter() {
start_spz_wait(CH_ROCK_GET2, 1, false, P_CHEWY);
_G(det)->showStaticSpr(2);
setPersonSpr(P_LEFT, P_CHEWY);
- startSetailWait(21, 1, ANI_FRONT);
+ startSetAILWait(21, 1, ANI_FRONT);
_G(det)->showStaticSpr(14);
waitShowScreen(18);
_G(det)->hideStaticSpr(14);
- startSetailWait(24, 1, ANI_FRONT);
+ startSetAILWait(24, 1, ANI_FRONT);
_G(det)->showStaticSpr(1);
_G(det)->hideStaticSpr(2);
startAadWait(364);
@@ -253,7 +253,7 @@ int16 Room63::use_schalter() {
void Room63::talk_girl() {
autoMove(2, P_CHEWY);
_G(det)->stop_detail(12);
- startSetailWait(13, 1, ANI_FRONT);
+ startSetAILWait(13, 1, ANI_FRONT);
_G(det)->set_static_ani(14, -1);
startAdsWait(17);
_G(det)->del_static_ani(14);
@@ -268,14 +268,14 @@ int16 Room63::use_girl() {
autoMove(2, P_CHEWY);
delInventory(_G(spieler).AkInvent);
_G(det)->stop_detail(12);
- startSetailWait(13, 1, ANI_FRONT);
+ startSetAILWait(13, 1, ANI_FRONT);
_G(det)->set_static_ani(14, -1);
startAadWait(365);
_G(det)->del_static_ani(14);
_G(det)->startDetail(15, 255, ANI_FRONT);
startAadWait(360);
_G(det)->stop_detail(15);
- startSetailWait(16, 1, ANI_FRONT);
+ startSetAILWait(16, 1, ANI_FRONT);
_G(spieler).R63Uhr = true;
_G(det)->stop_detail(10);
_G(det)->stop_detail(18);
diff --git a/engines/chewy/rooms/room66.cpp b/engines/chewy/rooms/room66.cpp
index 66b12fad590..0c9663893ab 100644
--- a/engines/chewy/rooms/room66.cpp
+++ b/engines/chewy/rooms/room66.cpp
@@ -53,11 +53,11 @@ void Room66::entry(int16 eib_nr) {
_G(SetUpScreenFunc) = setup_func;
startAadWait(403);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(0, 1, ANI_FRONT);
+ startSetAILWait(0, 1, ANI_FRONT);
_G(det)->showStaticSpr(14);
waitShowScreen(15);
_G(det)->hideStaticSpr(14);
- startSetailWait(1, 1, ANI_FRONT);
+ startSetAILWait(1, 1, ANI_FRONT);
load_chewy_taf(CHEWY_NORMAL);
_G(spieler)._personHide[P_CHEWY] = false;
start_spz(CH_TALK12, 255, false, P_CHEWY);
@@ -195,7 +195,7 @@ int Room66::proc7() {
_G(cur_hide_flag) = 0;
hideCur();
if (_G(spieler).flags26_20)
- startSetailWait(4, 1, ANI_FRONT);
+ startSetAILWait(4, 1, ANI_FRONT);
showCur();
return 1;
diff --git a/engines/chewy/rooms/room68.cpp b/engines/chewy/rooms/room68.cpp
index 880ef137e41..ed2df03cff5 100644
--- a/engines/chewy/rooms/room68.cpp
+++ b/engines/chewy/rooms/room68.cpp
@@ -194,8 +194,8 @@ int16 Room68::use_indigo() {
_G(room)->set_timer_status(8, TIMER_STOP);
_G(det)->del_static_ani(8);
_G(det)->stop_detail(8);
- startSetailWait(13, 3, ANI_FRONT);
- startSetailWait(25, 1, ANI_FRONT);
+ startSetAILWait(13, 3, ANI_FRONT);
+ startSetAILWait(25, 1, ANI_FRONT);
_G(det)->set_static_ani(12, -1);
talk_indigo(398);
_G(cur_hide_flag) = false;
@@ -203,7 +203,7 @@ int16 Room68::use_indigo() {
_G(room)->set_timer_status(8, TIMER_STOP);
_G(det)->del_static_ani(8);
_G(det)->stop_detail(8);
- startSetailWait(26, 1, ANI_FRONT);
+ startSetAILWait(26, 1, ANI_FRONT);
_G(room)->set_timer_status(8, TIMER_START);
_G(det)->set_static_ani(8, -1);
new_invent_2_cur(KARTE_INV);
@@ -224,7 +224,7 @@ void Room68::talk_keeper() {
autoMove(2, P_CHEWY);
_G(room)->set_timer_status(20, TIMER_STOP);
_G(det)->del_static_ani(20);
- startSetailWait(15, 1, ANI_FRONT);
+ startSetAILWait(15, 1, ANI_FRONT);
_G(det)->set_static_ani(16, -1);
showCur();
_G(ssi)[3].X = _G(spieler_vector)[P_CHEWY].Xypos[0] - _G(spieler).scrollx + _G(spieler_mi)[P_CHEWY].HotX;;
@@ -234,7 +234,7 @@ void Room68::talk_keeper() {
_G(cur_hide_flag) = false;
hideCur();
_G(det)->del_static_ani(16);
- startSetailWait(15, 1, ANI_BACK);
+ startSetAILWait(15, 1, ANI_BACK);
_G(room)->set_timer_status(20, TIMER_START);
_G(det)->set_static_ani(20, -1);
showCur();
@@ -309,7 +309,7 @@ int16 Room68::use_diva() {
autoMove(4, P_CHEWY);
_G(uhr)->resetTimer(_G(timer_nr)[0], 0);
_G(det)->hideStaticSpr(3);
- startSetailWait(4, 1, ANI_FRONT);
+ startSetAILWait(4, 1, ANI_FRONT);
_G(spieler).R68Gutschein = false;
_G(det)->showStaticSpr(3);
} else if (isCurInventory(B_MARY2_INV)) {
@@ -323,7 +323,7 @@ int16 Room68::use_diva() {
_G(det)->del_static_ani(18);
register_cutscene(22);
_G(det)->del_static_ani(18);
- startSetailWait(7, 1, ANI_FRONT);
+ startSetAILWait(7, 1, ANI_FRONT);
_G(atds)->set_steuer_bit(407, ATS_AKTIV_BIT, ATS_DATA);
_G(atds)->set_steuer_bit(412, ATS_AKTIV_BIT, ATS_DATA);
setPersonSpr(P_RIGHT, P_CHEWY);
@@ -357,12 +357,12 @@ void Room68::kostuem_aad(int16 aad_nr) {
goAutoXy(161, 59, P_HOWARD, ANI_GO);
autoMove(4, P_CHEWY);
startAadWait(390);
- startSetailWait(22, 1, ANI_FRONT);
+ startSetAILWait(22, 1, ANI_FRONT);
_G(spieler)._personHide[P_HOWARD] = true;
_G(det)->startDetail(27, 255, ANI_FRONT);
if (_G(spieler).DisplayText)
- startSetailWait(23, 3, ANI_FRONT);
+ startSetAILWait(23, 3, ANI_FRONT);
else {
_G(det)->startDetail(23, 255, ANI_FRONT);
g_engine->_sound->playSound(109, 1, false);
@@ -389,7 +389,7 @@ void Room68::kostuem_aad(int16 aad_nr) {
_G(room)->set_timer_status(8, TIMER_STOP);
_G(det)->del_static_ani(8);
- startSetailWait(10, 1, ANI_FRONT);
+ startSetAILWait(10, 1, ANI_FRONT);
_G(det)->startDetail(11, 255, ANI_FRONT);
startAadWait(396);
_G(det)->stop_detail(11);
diff --git a/engines/chewy/rooms/room71.cpp b/engines/chewy/rooms/room71.cpp
index 671ce94a6ca..8bedcab41d5 100644
--- a/engines/chewy/rooms/room71.cpp
+++ b/engines/chewy/rooms/room71.cpp
@@ -209,7 +209,7 @@ void Room71::proc2() {
_G(det)->startDetail(5, 255, false);
auto_scroll(160, 0);
_G(det)->hideStaticSpr(5);
- startSetailWait(1, 1, ANI_FRONT);
+ startSetAILWait(1, 1, ANI_FRONT);
_G(det)->startDetail(2, 255, false);
_G(det)->stop_detail(5);
_G(det)->showStaticSpr(8);
@@ -252,7 +252,7 @@ void Room71::proc4() {
void Room71::proc5(int16 val) {
_state = 1 + (_G(spieler).flags28_4 ? 1 : 0);
_G(det)->hideStaticSpr(2);
- startSetailWait(val, 5, ANI_FRONT);
+ startSetAILWait(val, 5, ANI_FRONT);
_G(det)->showStaticSpr(2);
_state = 0;
}
diff --git a/engines/chewy/rooms/room74.cpp b/engines/chewy/rooms/room74.cpp
index 077fc20056f..7f73e77a434 100644
--- a/engines/chewy/rooms/room74.cpp
+++ b/engines/chewy/rooms/room74.cpp
@@ -96,7 +96,7 @@ int Room74::proc1() {
_G(spieler).R74CutRubberPlant = true;
autoMove(4, P_CHEWY);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(1, 1, ANI_FRONT);
+ startSetAILWait(1, 1, ANI_FRONT);
setPersonPos(272, 116, P_CHEWY, P_RIGHT);
_G(spieler)._personHide[P_CHEWY] = false;
_G(det)->startDetail(0, 255, false);
diff --git a/engines/chewy/rooms/room76.cpp b/engines/chewy/rooms/room76.cpp
index fe19256ebd5..d38017a530d 100644
--- a/engines/chewy/rooms/room76.cpp
+++ b/engines/chewy/rooms/room76.cpp
@@ -128,8 +128,8 @@ void Room76::talk2() {
void Room76::proc3(int diaNr) {
startAadWait(diaNr);
_G(det)->del_static_ani(2);
- startSetailWait(3, 1, ANI_FRONT);
- startSetailWait(4, 2, ANI_FRONT);
+ startSetAILWait(3, 1, ANI_FRONT);
+ startSetAILWait(4, 2, ANI_FRONT);
_G(det)->set_static_ani(2, -1);
}
@@ -163,10 +163,10 @@ int Room76::proc6() {
proc3(424);
start_spz_wait(13, 1, false, P_CHEWY);
_G(det)->del_static_ani(2);
- startSetailWait(5, 1, ANI_FRONT);
+ startSetAILWait(5, 1, ANI_FRONT);
_G(det)->set_static_ani(2, -1);
- startSetailWait(9, 1, ANI_FRONT);
- startSetailWait(10, 1, ANI_FRONT);
+ startSetAILWait(9, 1, ANI_FRONT);
+ startSetAILWait(10, 1, ANI_FRONT);
showCur();
} else if (isCurInventory(94)) {
hideCur();
diff --git a/engines/chewy/rooms/room78.cpp b/engines/chewy/rooms/room78.cpp
index e3ca9f58e84..65a10968d82 100644
--- a/engines/chewy/rooms/room78.cpp
+++ b/engines/chewy/rooms/room78.cpp
@@ -98,7 +98,7 @@ void Room78::entry() {
if (flag1 == 0) {
_G(det)->startDetail(5, 1, false);
} else {
- startSetailWait(5, 1, ANI_FRONT);
+ startSetAILWait(5, 1, ANI_FRONT);
}
} else {
if (det4DestX <= 0)
diff --git a/engines/chewy/rooms/room81.cpp b/engines/chewy/rooms/room81.cpp
index 0543dda6f36..f494ee93323 100644
--- a/engines/chewy/rooms/room81.cpp
+++ b/engines/chewy/rooms/room81.cpp
@@ -81,11 +81,11 @@ void Room81::proc1() {
startAadWait(461);
goAutoXy(143, 62, P_CHEWY, ANI_WAIT);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(0, 1, ANI_FRONT);
+ startSetAILWait(0, 1, ANI_FRONT);
_G(det)->startDetail(1, 255, false);
startAadWait(459);
_G(det)->stop_detail(1);
- startSetailWait(0, 1, ANI_GO);
+ startSetAILWait(0, 1, ANI_GO);
_G(spieler)._personHide[P_CHEWY] = false;
goAutoXy(171, 93, P_CHEWY, ANI_WAIT);
goAutoXy(100, 96, P_CHEWY, ANI_WAIT);
diff --git a/engines/chewy/rooms/room82.cpp b/engines/chewy/rooms/room82.cpp
index 1ac4a0f7f4a..ca310395510 100644
--- a/engines/chewy/rooms/room82.cpp
+++ b/engines/chewy/rooms/room82.cpp
@@ -151,8 +151,8 @@ int Room82::proc3() {
start_spz_wait(13, 1, false, P_CHEWY);
_G(room)->set_timer_status(0, TIMER_STOP);
_G(det)->del_static_ani(0);
- startSetailWait(2, 1, ANI_FRONT);
- startSetailWait(3, 1, ANI_FRONT);
+ startSetAILWait(2, 1, ANI_FRONT);
+ startSetAILWait(3, 1, ANI_FRONT);
_G(det)->set_static_ani(0, -1);
start_spz_wait(13, 1, false, P_CHEWY);
@@ -235,7 +235,7 @@ void Room82::proc8() {
_G(spieler)._personHide[P_NICHELLE] = false;
startAadWait(448);
_G(det)->del_static_ani(4);
- startSetailWait(6, 2, ANI_FRONT);
+ startSetAILWait(6, 2, ANI_FRONT);
_G(det)->set_static_ani(4, -1);
showCur();
}
diff --git a/engines/chewy/rooms/room84.cpp b/engines/chewy/rooms/room84.cpp
index 6ea931e7f4b..1dbdf8e1222 100644
--- a/engines/chewy/rooms/room84.cpp
+++ b/engines/chewy/rooms/room84.cpp
@@ -145,7 +145,7 @@ void Room84::setup_func() {
startAadWait(455);
_G(det)->del_static_ani(4);
start_spz(62, 1, false, P_HOWARD);
- startSetailWait(5, 1, ANI_FRONT);
+ startSetAILWait(5, 1, ANI_FRONT);
_G(det)->set_static_ani(3, -1);
startAadWait(456);
_G(flags).NoScroll = false;
@@ -193,7 +193,7 @@ int Room84::proc4() {
if (_G(spieler).flags32_10) {
_G(det)->stop_detail(7);
- startSetailWait(8, 1, ANI_FRONT);
+ startSetAILWait(8, 1, ANI_FRONT);
} else {
_G(spieler)._personRoomNr[P_NICHELLE] = 88;
}
diff --git a/engines/chewy/rooms/room85.cpp b/engines/chewy/rooms/room85.cpp
index b82af74250c..d93b4454b34 100644
--- a/engines/chewy/rooms/room85.cpp
+++ b/engines/chewy/rooms/room85.cpp
@@ -155,7 +155,7 @@ int Room85::proc2() {
autoMove(2, P_CHEWY);
_G(det)->stop_detail(1);
- startSetailWait(2, 1, ANI_FRONT);
+ startSetAILWait(2, 1, ANI_FRONT);
_G(spieler)._personRoomNr[P_HOWARD] = 89;
cur_2_inventory();
remove_inventory(109);
diff --git a/engines/chewy/rooms/room88.cpp b/engines/chewy/rooms/room88.cpp
index bf0115f34db..9307c6646d5 100644
--- a/engines/chewy/rooms/room88.cpp
+++ b/engines/chewy/rooms/room88.cpp
@@ -77,7 +77,7 @@ int Room88::proc2() {
autoMove(1, P_CHEWY);
start_spz_wait(13, 1, false, P_CHEWY);
_G(det)->showStaticSpr(0);
- startSetailWait(0, 1, _G(spieler).flags30_10 ? ANI_GO : ANI_FRONT);
+ startSetAILWait(0, 1, _G(spieler).flags30_10 ? ANI_GO : ANI_FRONT);
_G(det)->hideStaticSpr(1 + (_G(spieler).flags30_10 ? 1 : 0));
_G(spieler).flags31_10 = false;
_G(det)->showStaticSpr(1 + (!_G(spieler).flags30_10 ? 1 : 0));
@@ -117,8 +117,8 @@ int Room88::proc3() {
const int aniNr = 1 + (_G(spieler).flags31_10 ? 1 : 0);
for (int i = 0; i < 3; ++i) {
- startSetailWait(aniNr, 1, ANI_FRONT);
- startSetailWait(aniNr, 1, ANI_GO);
+ startSetAILWait(aniNr, 1, ANI_FRONT);
+ startSetAILWait(aniNr, 1, ANI_GO);
}
_G(out)->setPointer(nullptr);
@@ -130,7 +130,7 @@ int Room88::proc3() {
_G(out)->raster_col(0, 0, 0, 0);
switchRoom(80);
hideCur();
- startSetailWait(1, 1, ANI_FRONT);
+ startSetAILWait(1, 1, ANI_FRONT);
_G(out)->setPointer(nullptr);
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
diff --git a/engines/chewy/rooms/room90.cpp b/engines/chewy/rooms/room90.cpp
index 187a986ee0c..e33baa6e378 100644
--- a/engines/chewy/rooms/room90.cpp
+++ b/engines/chewy/rooms/room90.cpp
@@ -83,7 +83,7 @@ void Room90::entry(int16 eib_nr) {
autoMove(1, P_CHEWY);
startDetailFrame(2, 1, ANI_FRONT, 3);
_G(det)->startDetail(0, 1, false);
- startSetailWait(1, 1, ANI_FRONT);
+ startSetAILWait(1, 1, ANI_FRONT);
_G(spieler).flags33_10 = true;
_G(spieler)._personRoomNr[P_HOWARD] = 91;
switchRoom(91);
@@ -292,7 +292,7 @@ int Room90::shootControlUnit() {
goAutoXy(232, 142, P_CHEWY, ANI_WAIT);
_G(flags).NoScroll = true;
auto_scroll(176, 0);
- startSetailWait(13, 1, ANI_FRONT);
+ startSetAILWait(13, 1, ANI_FRONT);
_G(flags).NoPalAfterFlc = true;
flic_cut(FCUT_107);
_G(spieler).scrollx = 0;
diff --git a/engines/chewy/rooms/room91.cpp b/engines/chewy/rooms/room91.cpp
index 6067e4ba1e8..c60f0e2ee21 100644
--- a/engines/chewy/rooms/room91.cpp
+++ b/engines/chewy/rooms/room91.cpp
@@ -115,7 +115,7 @@ void Room91::setup_func() {
const int aniNr = 1 + (g_events->_mousePos.y <= 100 ? 1 : 0);
hideCur();
_G(det)->stop_detail(0);
- startSetailWait(aniNr, 1, ANI_FRONT);
+ startSetAILWait(aniNr, 1, ANI_FRONT);
_click = oldClick;
_G(det)->startDetail(0, 255, false);
_G(det)->startDetail(aniNr + 2, 1, false);
@@ -131,7 +131,7 @@ void Room91::setup_func() {
stop_spz();
startAadWait(505);
_G(spieler)._personHide[P_HOWARD] = true;
- startSetailWait(9, 1, ANI_FRONT);
+ startSetAILWait(9, 1, ANI_FRONT);
_G(spieler)._personHide[P_HOWARD] = false;
_G(spieler)._personRoomNr[P_HOWARD] = 50;
_G(spieler).flags34_4 = false;
diff --git a/engines/chewy/rooms/room93.cpp b/engines/chewy/rooms/room93.cpp
index 501acce4fee..45d6055761d 100644
--- a/engines/chewy/rooms/room93.cpp
+++ b/engines/chewy/rooms/room93.cpp
@@ -34,28 +34,28 @@ void Room93::entry() {
_G(spieler).scrollx = 0;
hide_person();
- startSetailWait(3, 0, ANI_GO);
+ startSetAILWait(3, 0, ANI_GO);
_G(det)->set_static_ani(0, -1);
startAadWait(616);
_G(det)->del_static_ani(0);
- startSetailWait(3, 1, ANI_FRONT);
+ startSetAILWait(3, 1, ANI_FRONT);
_G(det)->set_static_ani(1, -1);
startAdsWait(27);
if (!_G(spieler).flags37_40) {
_G(det)->del_static_ani(1);
hideCur();
- startSetailWait(3, 1, ANI_GO);
+ startSetAILWait(3, 1, ANI_GO);
_G(det)->set_static_ani(0, -1);
startAadWait(549);
_G(det)->del_static_ani(0);
- startSetailWait(3, 1, ANI_FRONT);
- startSetailWait(6, 1, ANI_FRONT);
+ startSetAILWait(3, 1, ANI_FRONT);
+ startSetAILWait(6, 1, ANI_FRONT);
_G(det)->set_static_ani(7, -1);
startAadWait(550);
_G(det)->del_static_ani(7);
- startSetailWait(6, 1, ANI_GO);
- startSetailWait(2, 1, ANI_FRONT);
+ startSetAILWait(6, 1, ANI_GO);
+ startSetAILWait(2, 1, ANI_FRONT);
setupScreen(DO_SETUP);
showCur();
}
diff --git a/engines/chewy/rooms/room94.cpp b/engines/chewy/rooms/room94.cpp
index 3cdf417b5fa..57651e3ee99 100644
--- a/engines/chewy/rooms/room94.cpp
+++ b/engines/chewy/rooms/room94.cpp
@@ -155,7 +155,7 @@ int Room94::giveGhostBottle() {
_G(det)->startDetail(6, 1, false);
_G(room)->set_timer_status(3, TIMER_STOP);
_G(det)->del_static_ani(3);
- startSetailWait(4, 1, ANI_FRONT);
+ startSetAILWait(4, 1, ANI_FRONT);
_G(spieler).flags35_10 = true;
_G(spieler).room_e_obj[138].Attribut = EXIT_TOP;
_G(atds)->set_steuer_bit(522, ATS_AKTIV_BIT, ATS_DATA);
diff --git a/engines/chewy/rooms/room97.cpp b/engines/chewy/rooms/room97.cpp
index 175cf992d13..e3f743a238a 100644
--- a/engines/chewy/rooms/room97.cpp
+++ b/engines/chewy/rooms/room97.cpp
@@ -113,7 +113,7 @@ void Room97::entry() {
_G(spieler).SVal2 = 0;
_G(spieler).flags35_4 = true;
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(19, 1, ANI_FRONT);
+ startSetAILWait(19, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
showCur();
switchRoom(89);
@@ -339,7 +339,7 @@ void Room97::proc4() {
stopPerson(P_CHEWY);
g_engine->_sound->playSound(9, 0);
g_engine->_sound->stopSound(1);
- startSetailWait(9, 1, ANI_FRONT);
+ startSetAILWait(9, 1, ANI_FRONT);
_G(det)->showStaticSpr(21);
while (_G(spieler_vector)[P_HOWARD].Xypos[0] > 996) {
@@ -357,11 +357,11 @@ void Room97::proc4() {
goAutoXy(995, 77, P_HOWARD, ANI_WAIT);
goAutoXy(1047, 87, P_HOWARD, ANI_WAIT);
- startSetailWait(29, 1, ANI_FRONT);
+ startSetAILWait(29, 1, ANI_FRONT);
_G(det)->hideStaticSpr(21);
g_engine->_sound->playSound(9, 1);
g_engine->_sound->stopSound(0);
- startSetailWait(9, 0, ANI_BACK);
+ startSetAILWait(9, 0, ANI_BACK);
goAutoXy(1008, 93, P_CHEWY, ANI_WAIT);
goAutoXy(967, 111, P_CHEWY, ANI_WAIT);
@@ -405,7 +405,7 @@ int Room97::proc5() {
_G(det)->hideStaticSpr(21);
g_engine->_sound->playSound(9, 1);
g_engine->_sound->stopSound(0);
- startSetailWait(9, 0, ANI_GO);
+ startSetAILWait(9, 0, ANI_GO);
showCur();
return 1;
@@ -422,11 +422,11 @@ int Room97::proc6() {
setPersonSpr(P_LEFT, P_CHEWY);
start_spz_wait(CH_LGET_O, 1, false, P_CHEWY);
_G(det)->hideStaticSpr(15);
- startSetailWait(1, 1, ANI_FRONT);
+ startSetAILWait(1, 1, ANI_FRONT);
_G(det)->showStaticSpr(28);
autoMove(1, P_CHEWY);
_G(det)->hideStaticSpr(18);
- startSetailWait(15, 1, ANI_FRONT);
+ startSetAILWait(15, 1, ANI_FRONT);
_G(det)->showStaticSpr(17);
start_spz(CH_TALK5, 255, false, P_CHEWY);
startAadWait(558);
@@ -454,7 +454,7 @@ int Room97::proc7() {
_G(spieler_mi)[P_CHEWY].Mode = true;
_G(spieler)._personHide[P_CHEWY] = true;
_G(det)->hideStaticSpr(17);
- startSetailWait(22, 1, ANI_FRONT);
+ startSetAILWait(22, 1, ANI_FRONT);
_G(atds)->set_steuer_bit(538, ATS_AKTIV_BIT, ATS_DATA);
_G(atds)->set_ats_str(530, 2, ATS_DATA);
new_invent_2_cur(SLIME_INV);
@@ -497,7 +497,7 @@ int Room97::proc8() {
_G(det)->stop_detail(24);
g_engine->_sound->playSound(26, 0);
g_engine->_sound->playSound(26);
- startSetailWait(25, 1, ANI_FRONT);
+ startSetAILWait(25, 1, ANI_FRONT);
_G(det)->startDetail(26, 255, false);
_G(det)->stop_detail(23);
_G(det)->startDetail(27, 255, false);
@@ -538,9 +538,9 @@ int Room97::proc9() {
startAadWait(556);
} else {
start_spz_wait(13, 1, false, P_CHEWY);
- startSetailWait(0, 1, ANI_FRONT);
+ startSetAILWait(0, 1, ANI_FRONT);
_G(det)->showStaticSpr(13);
- startSetailWait(13, 1, ANI_FRONT);
+ startSetAILWait(13, 1, ANI_FRONT);
_G(det)->startDetail(14, 255, false);
startAadWait(555);
_G(spieler).flags36_40 = true;
@@ -563,7 +563,7 @@ int Room97::proc10() {
start_spz_wait(13, 1, false, P_CHEWY);
g_engine->_sound->playSound(7, 0);
g_engine->_sound->stopSound(1);
- startSetailWait(7, 1, ANI_FRONT);
+ startSetAILWait(7, 1, ANI_FRONT);
_G(det)->showStaticSpr(19);
_G(spieler).flags37_1 = true;
_G(atds)->set_steuer_bit(543, ATS_AKTIV_BIT, ATS_DATA);
@@ -695,10 +695,10 @@ void Room97::sensorAnim() {
hideCur();
if (!_slimeThrown) {
- startSetailWait(17, 1, ANI_FRONT);
+ startSetAILWait(17, 1, ANI_FRONT);
_G(det)->startDetail(16, 1, true);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(20, 1, false);
+ startSetAILWait(20, 1, false);
setPersonPos(318, 42, P_CHEWY, P_LEFT);
_G(spieler)._personHide[P_CHEWY] = false;
} else {
@@ -706,14 +706,14 @@ void Room97::sensorAnim() {
delInventory(_G(spieler).AkInvent);
_G(det)->showStaticSpr(27);
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(21, 1, ANI_FRONT);
+ startSetAILWait(21, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
_G(det)->hideStaticSpr(27);
- startSetailWait(18, 1, ANI_FRONT);
+ startSetAILWait(18, 1, ANI_FRONT);
g_engine->_sound->playSound(8, 0);
g_engine->_sound->stopSound(1);
- startSetailWait(8, 1, ANI_FRONT);
+ startSetAILWait(8, 1, ANI_FRONT);
_G(det)->showStaticSpr(20);
autoMove(10, P_CHEWY);
auto_scroll(60, 0);
diff --git a/engines/chewy/sprite.cpp b/engines/chewy/sprite.cpp
index a70f34b511b..11b061656a2 100644
--- a/engines/chewy/sprite.cpp
+++ b/engines/chewy/sprite.cpp
@@ -394,7 +394,7 @@ void stopPerson(int16 personNr) {
}
-void startSetailWait(int16 aniNr, int16 rep, int16 mode) {
+void startSetAILWait(int16 aniNr, int16 rep, int16 mode) {
const int16 oldMouseLeftClick = _G(mouseLeftClick);
_G(mouseLeftClick) = false;
_G(det)->startDetail(aniNr, rep, mode);
@@ -442,7 +442,7 @@ void startAniBlock(int16 nr, const AniBlock *ab) {
_G(mouseLeftClick) = false;
for (int16 i = 0; i < nr; i++) {
if (ab[i].Mode == ANI_WAIT)
- startSetailWait(ab[i].Nr, ab[i].Repeat, ab[i].Dir);
+ startSetAILWait(ab[i].Nr, ab[i].Repeat, ab[i].Dir);
else
_G(det)->startDetail(ab[i].Nr, ab[i].Repeat, ab[i].Dir);
}
diff --git a/engines/chewy/t_event.cpp b/engines/chewy/t_event.cpp
index fb9c01d7ace..7d596a0ea62 100644
--- a/engines/chewy/t_event.cpp
+++ b/engines/chewy/t_event.cpp
@@ -144,7 +144,7 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
case 73:
if (!_G(spieler).R9Gitter) {
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(5, 1, ANI_FRONT);
+ startSetAILWait(5, 1, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
} else {
retValue = false;
@@ -396,11 +396,11 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
break;
case 263:
- retValue = Room42::use_beamter();
+ retValue = Room42::useStationEmployee();
break;
case 264:
- retValue = Room42::use_psack();
+ retValue = Room42::useMailBag();
break;
case 266:
@@ -1105,7 +1105,7 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
break;
case 263:
- Room42::talk_beamter();
+ Room42::talkToStationEmployee();
break;
default:
@@ -1129,7 +1129,8 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
return retValue;
}
-void adsAction(int16 diaNr, int16 blkNr, int16 strEndNr) {
+// Original name: adsAction
+void selectDialogOption(int16 diaNr, int16 blkNr, int16 strEndNr) {
if (_G(flags).AdsAction == false) {
_G(flags).AdsAction = true;
@@ -1151,7 +1152,7 @@ void adsAction(int16 diaNr, int16 blkNr, int16 strEndNr) {
break;
case 10:
- Room42::dia_beamter(strEndNr);
+ Room42::dialogWithStationEmployee(strEndNr);
break;
case 11:
@@ -1198,7 +1199,7 @@ void adsAction(int16 diaNr, int16 blkNr, int16 strEndNr) {
case 20:
if (blkNr == 0 && strEndNr == 1) {
_G(spieler)._personHide[P_CHEWY] = true;
- startSetailWait(28, 3, ANI_FRONT);
+ startSetAILWait(28, 3, ANI_FRONT);
_G(spieler)._personHide[P_CHEWY] = false;
}
break;
@@ -1224,7 +1225,7 @@ void ads_ende(int16 diaNr, int16 blkNr, int16 strEndNr) {
case 22:
if (strEndNr == 1) {
_G(det)->del_static_ani(3);
- startSetailWait(5, 1, ANI_FRONT);
+ startSetAILWait(5, 1, ANI_FRONT);
_G(det)->set_static_ani(3, -1);
startAadWait(456);
}
More information about the Scummvm-git-logs
mailing list