[Scummvm-git-logs] scummvm master -> da2f0200c3a29cf4cddee29ca5cf2871c99e6858
bluegr
noreply at scummvm.org
Sat Jul 11 16:13:01 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
da2f0200c3 CHEWY: Rename startSetAILWait -> startDetailWait
Commit: da2f0200c3a29cf4cddee29ca5cf2871c99e6858
https://github.com/scummvm/scummvm/commit/da2f0200c3a29cf4cddee29ca5cf2871c99e6858
Author: Max H. Gerlach (git at maxgerlach.de)
Date: 2026-07-11T19:12:58+03:00
Commit Message:
CHEWY: Rename startSetAILWait -> startDetailWait
Rationale: The function starts a detail animation and waits.
Changed paths:
engines/chewy/globals.h
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/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 9ca4028c83a..97cbdcf4854 100644
--- a/engines/chewy/globals.h
+++ b/engines/chewy/globals.h
@@ -457,7 +457,7 @@ void calc_z_ebene();
void startAniBlock(int16 nr, const AniBlock *ab);
-void startSetAILWait(int16 aniNr, int16 rep, int16 mode);
+void startDetailWait(int16 aniNr, int16 rep, int16 mode);
void startDetailFrame(int16 aniNr, int16 rep, int16 mode,
int16 frame);
diff --git a/engines/chewy/r_event.cpp b/engines/chewy/r_event.cpp
index 2ddb455c070..d1ea598238e 100644
--- a/engines/chewy/r_event.cpp
+++ b/engines/chewy/r_event.cpp
@@ -61,7 +61,7 @@ void play_scene_ani(int16 nr, int16 direction) {
break;
}
- startSetAILWait(nr, 1, direction);
+ startDetailWait(nr, 1, direction);
switch (r_nr) {
case ROOM_1_1:
diff --git a/engines/chewy/rooms/room00.cpp b/engines/chewy/rooms/room00.cpp
index 25f6ab18cf3..738e403d0ec 100644
--- a/engines/chewy/rooms/room00.cpp
+++ b/engines/chewy/rooms/room00.cpp
@@ -151,8 +151,8 @@ bool Room0::pullSlime() {
_G(flags).AutoAniPlay = true;
autoMove(2, P_CHEWY);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(3, 1, ANI_FRONT);
- startSetAILWait(17, 2, ANI_FRONT);
+ startDetailWait(3, 1, ANI_FRONT);
+ startDetailWait(17, 2, ANI_FRONT);
setPersonPos(222, 106, P_CHEWY, P_LEFT);
_G(gameState)._personHide[P_CHEWY] = false;
invent_2_slot(1);
diff --git a/engines/chewy/rooms/room01.cpp b/engines/chewy/rooms/room01.cpp
index 68254f5c21f..828aa735d1e 100644
--- a/engines/chewy/rooms/room01.cpp
+++ b/engines/chewy/rooms/room01.cpp
@@ -31,7 +31,7 @@ namespace Rooms {
void Room1::gottenCard() {
_G(det)->hideStaticSpr(2);
- startSetAILWait(4, 1, ANI_FRONT);
+ startDetailWait(4, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
_G(atds)->delControlBit(7, ATS_COUNT_BIT);
}
diff --git a/engines/chewy/rooms/room02.cpp b/engines/chewy/rooms/room02.cpp
index c8bf479b86f..59f1628680b 100644
--- a/engines/chewy/rooms/room02.cpp
+++ b/engines/chewy/rooms/room02.cpp
@@ -45,7 +45,7 @@ void Room2::entry() {
void Room2::jump_out_r1(int16 nr) {
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(nr, 1, ANI_FRONT);
+ startDetailWait(nr, 1, ANI_FRONT);
setupScreen(DO_SETUP);
_G(det)->stopDetail(6);
setPersonPos(32, 127, P_CHEWY, P_LEFT);
diff --git a/engines/chewy/rooms/room03.cpp b/engines/chewy/rooms/room03.cpp
index 16ff98bf4fa..27bc75ddc87 100644
--- a/engines/chewy/rooms/room03.cpp
+++ b/engines/chewy/rooms/room03.cpp
@@ -113,7 +113,7 @@ void Room3::terminal() {
_G(gameState).room_s_obj[SIB_SLIME].ZustandFlipFlop = 1;
}
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(8, 1, ANI_FRONT);
+ startDetailWait(8, 1, ANI_FRONT);
setupScreen(DO_SETUP);
_G(det)->stopDetail(6);
clear_prog_ani();
diff --git a/engines/chewy/rooms/room05.cpp b/engines/chewy/rooms/room05.cpp
index 00deecf6665..05ef3a582d8 100644
--- a/engines/chewy/rooms/room05.cpp
+++ b/engines/chewy/rooms/room05.cpp
@@ -38,11 +38,11 @@ void Room5::pushButton() {
if (_G(gameState).R5Terminal) {
int16 strNr;
if (_G(gameState).R5Door == false) {
- startSetAILWait(9, 1, ANI_FRONT);
+ startDetailWait(9, 1, ANI_FRONT);
_G(gameState).room_e_obj[6].Attribut = EXIT_TOP;
strNr = 1;
} else {
- startSetAILWait(9, 1, ANI_BACK);
+ startDetailWait(9, 1, ANI_BACK);
_G(gameState).room_e_obj[6].Attribut = 255;
strNr = 0;
}
diff --git a/engines/chewy/rooms/room06.cpp b/engines/chewy/rooms/room06.cpp
index 69cc50f5b66..7ec4a9bdaf7 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(gameState).R6BolaBecher) {
_G(det)->hideStaticSpr(0);
- startSetAILWait(0, 1, ANI_FRONT);
+ startDetailWait(0, 1, ANI_FRONT);
if (_G(gameState).R6BolaOk) {
_G(gameState).R6BolaBecher = true;
_G(det)->showStaticSpr(0);
diff --git a/engines/chewy/rooms/room07.cpp b/engines/chewy/rooms/room07.cpp
index afb101c6680..95346e7762b 100644
--- a/engines/chewy/rooms/room07.cpp
+++ b/engines/chewy/rooms/room07.cpp
@@ -84,8 +84,8 @@ void Room7::bell() {
startAniBlock(3, ABLOCK25);
_G(det)->showStaticSpr(7);
- startSetAILWait(12, 1, ANI_FRONT);
- startSetAILWait(11, 1, ANI_FRONT);
+ startDetailWait(12, 1, ANI_FRONT);
+ startDetailWait(11, 1, ANI_FRONT);
_G(det)->hideStaticSpr(7);
_G(det)->stopDetail(5);
setPersonPos(95, 94, P_CHEWY, P_RIGHT);
@@ -95,7 +95,7 @@ void Room7::bell() {
start_aad(6, 0);
startAniBlock(3, ABLOCK25);
_G(det)->showStaticSpr(7);
- startSetAILWait(10, 1, ANI_FRONT);
+ startDetailWait(10, 1, ANI_FRONT);
_G(det)->startDetail(13, 1, ANI_FRONT);
setPersonPos(95, 94, P_CHEWY, P_RIGHT);
_G(det)->stopDetail(5);
@@ -106,7 +106,7 @@ void Room7::bell() {
_G(gameState)._personHide[P_CHEWY] = true;
_G(det)->startDetail(0, 255, ANI_FRONT);
- startSetAILWait(13, 1, ANI_FRONT);
+ startDetailWait(13, 1, ANI_FRONT);
flic_cut(FCUT_001);
_G(det)->stopDetail(0);
_G(gameState).scrollx = 0;
@@ -153,7 +153,7 @@ void Room7::bell() {
_G(gameState).R7BorkFlug = true;
_G(gameState)._personHide[P_CHEWY] = true;
start_aad(8, 0);
- startSetAILWait(1, 1, ANI_FRONT);
+ startDetailWait(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;
@@ -174,7 +174,7 @@ void Room7::gedAction(int index) {
if (index == 0 && _G(gameState).R7BorkFlug && _G(gameState).R7ChewyFlug) {
_G(gameState)._personHide[P_CHEWY] = true;
setPersonPos(180, 124, P_CHEWY, P_LEFT);
- startSetAILWait(20, 1, ANI_FRONT);
+ startDetailWait(20, 1, ANI_FRONT);
_G(det)->showStaticSpr(10);
waitShowScreen(10 * _G(gameState).DelaySpeed);
_G(det)->hideStaticSpr(10);
diff --git a/engines/chewy/rooms/room08.cpp b/engines/chewy/rooms/room08.cpp
index 6040d72e577..0649f2895d0 100644
--- a/engines/chewy/rooms/room08.cpp
+++ b/engines/chewy/rooms/room08.cpp
@@ -74,7 +74,7 @@ void Room8::hole_kohle() {
_G(gameState).R8Kohle = true;
autoMove(4, P_CHEWY);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(12, 1, ANI_FRONT);
+ startDetailWait(12, 1, ANI_FRONT);
cur_2_inventory();
invent_2_slot(KOHLE_HEISS_INV);
_G(gameState)._personHide[P_CHEWY] = false;
@@ -124,11 +124,11 @@ bool Room8::gips_wurf() {
_G(gameState)._personHide[P_CHEWY] = true;
delInventory(GIPS_EIMER_INV);
- startSetAILWait(4, 1, ANI_FRONT);
+ startDetailWait(4, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
startDetailFrame(5, 1, ANI_FRONT, 16);
- startSetAILWait(6, 1, ANI_FRONT);
+ startDetailWait(6, 1, ANI_FRONT);
_G(obj)->show_sib(33);
_G(det)->showStaticSpr(14);
waitDetail(5);
@@ -142,7 +142,7 @@ bool Room8::gips_wurf() {
Dialogs::Inventory::look_screen(INVENTORY_NORMAL, 178);
_G(flags).AtsAction = true;
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(20, 1, ANI_FRONT);
+ startDetailWait(20, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
invent_2_slot(MASKE_INV);
cursorChoice(_G(menu_item));
@@ -156,7 +156,7 @@ void Room8::open_gdoor() {
_G(gameState)._personHide[P_CHEWY] = true;
_G(det)->showStaticSpr(17);
setupScreen(DO_SETUP);
- startSetAILWait(7, 1, ANI_FRONT);
+ startDetailWait(7, 1, ANI_FRONT);
_G(det)->showStaticSpr(15);
_G(det)->hideStaticSpr(17);
_G(gameState)._personHide[P_CHEWY] = false;
diff --git a/engines/chewy/rooms/room09.cpp b/engines/chewy/rooms/room09.cpp
index be27f61ef54..98add9936ab 100644
--- a/engines/chewy/rooms/room09.cpp
+++ b/engines/chewy/rooms/room09.cpp
@@ -62,7 +62,7 @@ void Room9::entry() {
void Room9::gtuer() {
_G(gameState).R9Grid = true;
_G(det)->showStaticSpr(5);
- startSetAILWait(6, 1, ANI_FRONT);
+ startDetailWait(6, 1, ANI_FRONT);
setPersonPos(74, 93, P_CHEWY, P_LEFT);
_G(atds)->delControlBit(74, ATS_ACTIVE_BIT);
_G(atds)->delControlBit(75, ATS_ACTIVE_BIT);
@@ -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);
+ startDetailWait(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 423ddcd122c..15c8535fc90 100644
--- a/engines/chewy/rooms/room12.cpp
+++ b/engines/chewy/rooms/room12.cpp
@@ -180,7 +180,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);
+ startDetailWait(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 376f249854d..127f672060b 100644
--- a/engines/chewy/rooms/room13.cpp
+++ b/engines/chewy/rooms/room13.cpp
@@ -164,7 +164,7 @@ void Room13::jmp_band() {
_G(gameState).R13Band = true;
autoMove(3, P_CHEWY);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(8, 1, ANI_FRONT);
+ startDetailWait(8, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
setPersonPos(292, 98, P_CHEWY, P_RIGHT);
@@ -208,7 +208,7 @@ void Room13::jmp_floor() {
_G(gameState).R13Band = false;
autoMove(5, P_CHEWY);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(7, 1, ANI_FRONT);
+ startDetailWait(7, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
setPersonPos(176, 138, P_CHEWY, P_LEFT);
}
@@ -226,7 +226,7 @@ int16 Room13::monitor_button() {
action_flag = true;
autoMove(8, P_CHEWY);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(6, 1, ANI_FRONT);
+ startDetailWait(6, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
if (_G(gameState).R13MonitorStatus)
diff --git a/engines/chewy/rooms/room14.cpp b/engines/chewy/rooms/room14.cpp
index f716888877e..058384a458f 100644
--- a/engines/chewy/rooms/room14.cpp
+++ b/engines/chewy/rooms/room14.cpp
@@ -62,7 +62,7 @@ void Room14::eremit_feuer(int16 t_nr, int16 ani_nr) {
if (!_G(flags).AutoAniPlay && !_G(gameState).R14Feuer) {
_G(flags).AutoAniPlay = true;
_G(det)->hideStaticSpr(9);
- startSetAILWait(_G(room)->_roomTimer._objNr[ani_nr], 1, ANI_FRONT);
+ startDetailWait(_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);
@@ -76,7 +76,7 @@ int16 Room14::use_schrott() {
if (!_G(cur)->usingInventoryCursor()) {
autoMove(3, P_CHEWY);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(12, 1, ANI_FRONT);
+ startDetailWait(12, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
if (!_G(gameState).R14Waffe) {
@@ -99,7 +99,7 @@ int16 Room14::use_gleiter() {
if (!_G(gameState).R14GleiterAuf) {
_G(gameState).R14GleiterAuf = true;
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(10, 1, ANI_FRONT);
+ startDetailWait(10, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
_G(det)->showStaticSpr(6);
_G(atds)->set_ats_str(107, TXT_MARK_LOOK, 1, ATS_DATA);
@@ -135,7 +135,7 @@ int16 Room14::use_schleim() {
if (!_G(cur)->usingInventoryCursor()) {
autoMove(2, P_CHEWY);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(11, 1, ANI_FRONT);
+ startDetailWait(11, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
if (!_G(gameState).R14Sicherung) {
@@ -161,7 +161,7 @@ void Room14::feuer() {
waffe = true;
_G(gameState)._personHide[P_CHEWY] = true;
startDetailFrame(8, 1, ANI_FRONT, 11);
- startSetAILWait(9, 1, ANI_FRONT);
+ startDetailWait(9, 1, ANI_FRONT);
waitDetail(8);
_G(gameState)._personHide[P_CHEWY] = false;
} else {
@@ -169,10 +169,10 @@ void Room14::feuer() {
_G(det)->hideStaticSpr(9);
startDetailFrame(2, 1, ANI_FRONT, 9);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(13, 1, ANI_FRONT);
+ startDetailWait(13, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
waitDetail(2);
- startSetAILWait(5, 1, ANI_FRONT);
+ startDetailWait(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);
+ startDetailWait(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 fb269ba3b4f..d28aea61fdb 100644
--- a/engines/chewy/rooms/room17.cpp
+++ b/engines/chewy/rooms/room17.cpp
@@ -146,7 +146,7 @@ int16 Room17::use_seil() {
_G(flags).AutoAniPlay = true;
autoMove(5, P_CHEWY);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(10, 1, ANI_FRONT);
+ startDetailWait(10, 1, ANI_FRONT);
_G(gameState).R17Rope = true;
_G(atds)->delControlBit(139, ATS_ACTIVE_BIT);
plot_seil();
@@ -172,7 +172,7 @@ void Room17::kletter_down() {
autoMove(5, P_CHEWY);
_G(det)->load_taf_seq(177, 1, nullptr);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(14, 1, ANI_FRONT);
+ startDetailWait(14, 1, ANI_FRONT);
_G(flags).ZoomMov = false;
_G(zoom_mov_fak) = 1;
_G(gameState).ScrollyStep = 2;
@@ -188,7 +188,7 @@ void Room17::kletter_up() {
autoMove(6, P_CHEWY);
_G(det)->load_taf_seq(141, 4, nullptr);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(11, 1, ANI_FRONT);
+ startDetailWait(11, 1, ANI_FRONT);
_G(flags).ZoomMov = true;
_G(zoom_mov_fak) = 3;
_G(gameState).ScrollyStep = 1;
@@ -245,7 +245,7 @@ void Room17::door_kommando(int16 mode) {
if (!_G(gameState).R17DoorCommand) {
_G(gameState).room_e_obj[36].Attribut = EXIT_TOP;
_G(gameState).R17DoorCommand = true;
- startSetAILWait(4, 1, ANI_FRONT);
+ startDetailWait(4, 1, ANI_FRONT);
stopPerson(P_CHEWY);
_G(det)->showStaticSpr(7);
}
@@ -327,7 +327,7 @@ int16 Room17::get_oel() {
close_door();
autoMove(4, P_CHEWY);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(13, 1, ANI_FRONT);
+ startDetailWait(13, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
delInventory(_G(cur)->getInventoryCursor());
_G(obj)->addInventory(BECHER_VOLL_INV, &_G(room_blk));
diff --git a/engines/chewy/rooms/room18.cpp b/engines/chewy/rooms/room18.cpp
index 14832be9f64..aa95e100e28 100644
--- a/engines/chewy/rooms/room18.cpp
+++ b/engines/chewy/rooms/room18.cpp
@@ -146,20 +146,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);
+ startDetailWait(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);
+ startDetailWait(9, 1, ANI_FRONT);
_G(det)->showStaticSpr(17);
if (!_G(gameState).R18SondeMoni) {
_G(gameState).R18SondeMoni = true;
- startSetAILWait(2, 1, ANI_FRONT);
+ startDetailWait(2, 1, ANI_FRONT);
_G(det)->showStaticSpr(9);
- startSetAILWait(4, 1, ANI_FRONT);
+ startDetailWait(4, 1, ANI_FRONT);
_G(det)->showStaticSpr(11);
waitShowScreen(50);
_G(det)->hideStaticSpr(9);
@@ -219,7 +219,7 @@ int16 Room18::sonden_moni() {
if (!_G(cur)->usingInventoryCursor() && !_G(gameState).R18Grid) {
hideCur();
autoMove(8, P_CHEWY);
- startSetAILWait(3, 1, ANI_FRONT);
+ startDetailWait(3, 1, ANI_FRONT);
_G(det)->showStaticSpr(10);
startAniBlock(3, ABLOCK20);
@@ -362,10 +362,10 @@ short Room18::use_cart_moni() {
if (!_G(gameState).R18CartTerminal) {
_G(atds)->set_ats_str(147, TXT_MARK_LOOK, 0, ATS_DATA);
_G(det)->hideStaticSpr(23);
- startSetAILWait(20, 1, ANI_BACK);
+ startDetailWait(20, 1, ANI_BACK);
} else {
_G(atds)->set_ats_str(147, TXT_MARK_LOOK, 1, ATS_DATA);
- startSetAILWait(20, 1, ANI_FRONT);
+ startDetailWait(20, 1, ANI_FRONT);
_G(det)->showStaticSpr(23);
if (_G(gameState).R18CartridgeInSlot) {
diff --git a/engines/chewy/rooms/room21.cpp b/engines/chewy/rooms/room21.cpp
index 7d89a7a4e2a..3acc02bd0fe 100644
--- a/engines/chewy/rooms/room21.cpp
+++ b/engines/chewy/rooms/room21.cpp
@@ -196,7 +196,7 @@ void Room21::chewy_kolli() {
_G(gameState)._personHide[P_CHEWY] = true;
int16 ani_nr = (_G(moveState)[P_CHEWY].Xyvo[0] < 0) ? 10 : 11;
_G(det)->setDetailPos(ani_nr, _G(moveState)[P_CHEWY].Xypos[0], _G(moveState)[P_CHEWY].Xypos[1]);
- startSetAILWait(ani_nr, 1, ANI_FRONT);
+ startDetailWait(ani_nr, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
_G(flags).AutoAniPlay = false;
_G(moveState)[P_CHEWY].Count = tmp;
@@ -232,7 +232,7 @@ void Room21::use_gitter_energy() {
switchRoom(17);
_G(det)->hideStaticSpr(5);
- startSetAILWait(9, 1, ANI_FRONT);
+ startDetailWait(9, 1, ANI_FRONT);
_G(gameState).R17GridWeg = true;
_G(gameState)._personHide[P_CHEWY] = false;
}
diff --git a/engines/chewy/rooms/room22.cpp b/engines/chewy/rooms/room22.cpp
index 9738feab51c..d13111bae5d 100644
--- a/engines/chewy/rooms/room22.cpp
+++ b/engines/chewy/rooms/room22.cpp
@@ -86,7 +86,7 @@ int16 Room22::chewy_amboss() {
autoMove(5, P_CHEWY);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(1, 1, ANI_FRONT);
+ startDetailWait(1, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
autoMove(2, P_CHEWY);
_G(flags).NoPalAfterFlc = false;
@@ -141,7 +141,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);
+ startDetailWait(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 c64aac289bd..122bc52eafe 100644
--- a/engines/chewy/rooms/room23.cpp
+++ b/engines/chewy/rooms/room23.cpp
@@ -135,7 +135,7 @@ void Room23::use_cartridge() {
if (_G(gameState).R18CartSave) {
_G(atds)->delControlBit(171, ATS_ACTIVE_BIT);
_G(atds)->set_all_ats_str(111, 2, ATS_DATA);
- startSetAILWait(4, 1, ANI_FRONT);
+ startDetailWait(4, 1, ANI_FRONT);
_G(det)->showStaticSpr(3);
} else {
_G(atds)->set_all_ats_str(111, 1, ATS_DATA);
diff --git a/engines/chewy/rooms/room24.cpp b/engines/chewy/rooms/room24.cpp
index e06806a274e..7088d78b675 100644
--- a/engines/chewy/rooms/room24.cpp
+++ b/engines/chewy/rooms/room24.cpp
@@ -136,8 +136,8 @@ void Room24::calc_animation(int16 crystal_nr) {
_G(det)->playSound(ani_nr + crystal_nr * 4, 0);
_G(det)->stopSound(0);
_G(det)->hideStaticSpr(_G(gameState).R24CrystalLast[crystal_nr] + crystal_nr * 2);
- startSetAILWait(ani_nr + crystal_nr * 4, 1, ANI_BACK);
- startSetAILWait(6 + crystal_nr * 4, 1, ANI_BACK);
+ startDetailWait(ani_nr + crystal_nr * 4, 1, ANI_BACK);
+ startDetailWait(6 + crystal_nr * 4, 1, ANI_BACK);
_G(det)->startDetail(5 + crystal_nr * 4, 255, ANI_BACK);
} else if (_G(gameState).R24CrystalLast[crystal_nr] == 20) {
@@ -145,8 +145,8 @@ void Room24::calc_animation(int16 crystal_nr) {
_G(det)->stopSound(0);
_G(det)->playSound(5 + ani_nr + crystal_nr * 4, 0);
_G(det)->stopDetail(5 + crystal_nr * 4);
- startSetAILWait(6 + crystal_nr * 4, 1, ANI_FRONT);
- startSetAILWait(ani_nr + crystal_nr * 4, 1, ANI_FRONT);
+ startDetailWait(6 + crystal_nr * 4, 1, ANI_FRONT);
+ startDetailWait(ani_nr + crystal_nr * 4, 1, ANI_FRONT);
}
showCur();
diff --git a/engines/chewy/rooms/room27.cpp b/engines/chewy/rooms/room27.cpp
index b27d65ecff8..8fe973c6636 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);
+ startDetailWait(2, 1, ANI_FRONT);
_G(gameState)._personRoomNr[P_HOWARD] = 28;
_G(spieler_mi)[P_HOWARD].Id = HOWARD_OBJ;
} else if (_G(gameState).R27HowardGed < 3 && eib_nr != -1) {
diff --git a/engines/chewy/rooms/room28.cpp b/engines/chewy/rooms/room28.cpp
index 6b639c07dd8..ed196f6ed11 100644
--- a/engines/chewy/rooms/room28.cpp
+++ b/engines/chewy/rooms/room28.cpp
@@ -257,7 +257,7 @@ void Room28::set_pump() {
++_G(gameState).R28PumpTxt1;
}
- startSetAILWait(tmp, 1, ANI_FRONT);
+ startDetailWait(tmp, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
load_chewy_taf(CHEWY_PUMPKIN);
@@ -298,7 +298,7 @@ void Room28::get_pump() {
_G(gameState)._personHide[P_CHEWY] = true;
int16 tmp = (_G(person_end_phase)[P_CHEWY] == P_RIGHT) ? 1 : 0;
_G(det)->setDetailPos(tmp, _G(moveState)[P_CHEWY].Xypos[0], _G(moveState)[P_CHEWY].Xypos[1]);
- startSetAILWait(tmp, 1, ANI_BACK);
+ startDetailWait(tmp, 1, ANI_BACK);
invent_2_slot(K_MASKE_INV);
_G(atds)->set_all_ats_str(209, 0, ATS_DATA);
diff --git a/engines/chewy/rooms/room29.cpp b/engines/chewy/rooms/room29.cpp
index 4ae54a7c720..f709d912fd4 100644
--- a/engines/chewy/rooms/room29.cpp
+++ b/engines/chewy/rooms/room29.cpp
@@ -118,7 +118,7 @@ bool Room29::useWaterHose() {
start_spz_wait(CH_LGET_U, 1, false, P_CHEWY);
_G(det)->hideStaticSpr(7);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(4, 1, ANI_FRONT);
+ startDetailWait(4, 1, ANI_FRONT);
_G(det)->showStaticSpr(8);
_G(det)->showStaticSpr(10);
_G(atds)->delControlBit(219, ATS_ACTIVE_BIT);
diff --git a/engines/chewy/rooms/room32.cpp b/engines/chewy/rooms/room32.cpp
index a404687d8f0..59ca8fb2f25 100644
--- a/engines/chewy/rooms/room32.cpp
+++ b/engines/chewy/rooms/room32.cpp
@@ -60,12 +60,12 @@ int16 Room32::use_howard() {
_G(det)->hideStaticSpr(0);
startDetailFrame(0, 1, ANI_FRONT, 9);
- startSetAILWait(1, 1, ANI_BACK);
+ startDetailWait(1, 1, ANI_BACK);
_G(det)->showStaticSpr(7);
_G(det)->showStaticSpr(6);
waitShowScreen(20);
_G(det)->hideStaticSpr(7);
- startSetAILWait(1, 1, ANI_FRONT);
+ startDetailWait(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 49a52cb9469..16e059ea03f 100644
--- a/engines/chewy/rooms/room33.cpp
+++ b/engines/chewy/rooms/room33.cpp
@@ -135,7 +135,7 @@ void Room33::use_maschine() {
if (action) {
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(0, 1, ANI_FRONT);
+ startDetailWait(0, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
setPersonPos(128, 65, P_CHEWY, P_LEFT);
start_spz_wait(CH_LGET_O, 1, false, P_CHEWY);
@@ -163,7 +163,7 @@ void Room33::use_maschine() {
if (_G(gameState).R33MunterOk) {
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(2, 1, ANI_FRONT);
+ startDetailWait(2, 1, ANI_FRONT);
flic_cut(FCUT_031);
_G(gameState)._personHide[P_CHEWY] = false;
start_spz(CH_TALK3, 255, ANI_FRONT, P_CHEWY);
@@ -173,7 +173,7 @@ void Room33::use_maschine() {
if (hocker) {
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(1, 1, ANI_FRONT);
+ startDetailWait(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 35741c564b7..ac2c6d6affe 100644
--- a/engines/chewy/rooms/room35.cpp
+++ b/engines/chewy/rooms/room35.cpp
@@ -94,9 +94,9 @@ int16 Room35::use_cat() {
delInventory(_G(cur)->getInventoryCursor());
_G(det)->stopDetail(0);
_G(det)->del_static_ani(0);
- startSetAILWait(1, 1, ANI_FRONT);
+ startDetailWait(1, 1, ANI_FRONT);
_G(det)->startDetail(2, 1, ANI_FRONT);
- startSetAILWait(3, 1, ANI_FRONT);
+ startDetailWait(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 6b6e55277f6..d2c9707b295 100644
--- a/engines/chewy/rooms/room37.cpp
+++ b/engines/chewy/rooms/room37.cpp
@@ -185,13 +185,13 @@ void Room37::dog_bell() {
disable_timer();
_G(det)->stopDetail(3);
_G(det)->del_static_ani(3);
- startSetAILWait(5, 1, ANI_FRONT);
+ startDetailWait(5, 1, ANI_FRONT);
_G(det)->hideStaticSpr(9);
- startSetAILWait(6, 1, ANI_FRONT);
+ startDetailWait(6, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = true;
_G(det)->startDetail(11, 255, ANI_FRONT);
flic_cut(FCUT_050);
- startSetAILWait(6, 1, ANI_BACK);
+ startDetailWait(6, 1, ANI_BACK);
_G(det)->stopDetail(11);
setPersonPos(326, 85, P_CHEWY, P_LEFT);
_G(gameState)._personHide[P_CHEWY] = false;
@@ -212,7 +212,7 @@ void Room37::dog_bell() {
_G(room)->set_timer_status(3, TIMER_STOP);
_G(det)->del_static_ani(3);
_G(det)->stopDetail(3);
- startSetAILWait(4, 1, ANI_FRONT);
+ startDetailWait(4, 1, ANI_FRONT);
flic_cut(FCUT_051);
_G(gameState).scrollx = 104;
flic_cut(FCUT_054);
diff --git a/engines/chewy/rooms/room39.cpp b/engines/chewy/rooms/room39.cpp
index a2f76231e90..7bf93c307f7 100644
--- a/engines/chewy/rooms/room39.cpp
+++ b/engines/chewy/rooms/room39.cpp
@@ -85,7 +85,7 @@ short Room39::use_howard() {
_G(det)->startDetail(6, 255, ANI_FRONT);
startAadWait(170);
_G(det)->stopDetail(6);
- startSetAILWait(7, 1, ANI_FRONT);
+ startDetailWait(7, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
delInventory(_G(cur)->getInventoryCursor());
@@ -94,7 +94,7 @@ short Room39::use_howard() {
start_spz(CH_TALK6, 255, ANI_FRONT, P_CHEWY);
startAadWait(167);
_G(det)->stopDetail(3);
- startSetAILWait(4, 1, ANI_FRONT);
+ startDetailWait(4, 1, ANI_FRONT);
_G(det)->set_static_ani(5, -1);
_G(atds)->set_all_ats_str(62, 1, ATS_DATA);
startAadWait(169);
diff --git a/engines/chewy/rooms/room40.cpp b/engines/chewy/rooms/room40.cpp
index 04186d8888a..11c83c58c35 100644
--- a/engines/chewy/rooms/room40.cpp
+++ b/engines/chewy/rooms/room40.cpp
@@ -292,7 +292,7 @@ void Room40::setup_func() {
_G(det)->stopDetail(17);
_G(gameState).R40HoUse = true;
_G(person_end_phase)[P_CHEWY] = P_RIGHT;
- startSetAILWait(10, 1, ANI_FRONT);
+ startDetailWait(10, 1, ANI_FRONT);
_G(person_end_phase)[P_HOWARD] = P_RIGHT;
startAadWait(224);
_G(gameState).R40PoliceAway = true;
@@ -330,7 +330,7 @@ int16 Room40::use_mr_pumpkin() {
action_ret = true;
autoMove(5, P_CHEWY);
delInventory(_G(cur)->getInventoryCursor());
- startSetAILWait(15, 1, ANI_FRONT);
+ startDetailWait(15, 1, ANI_FRONT);
start_spz(CH_PUMP_TALK, 255, ANI_FRONT, P_CHEWY);
startAadWait(200);
break;
@@ -402,11 +402,11 @@ int16 Room40::use_schalter(int16 aad_nr) {
}
_G(det)->hideStaticSpr(15);
- startSetAILWait(12, 1, ANI_FRONT);
+ startDetailWait(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);
+ startDetailWait(13, 1, ANI_FRONT);
_G(det)->showStaticSpr(15);
_G(room)->set_timer_status(255, TIMER_START);
_G(uhr)->resetTimer(_G(timer_nr)[0], 0);
@@ -552,7 +552,7 @@ void Room40::bmeister_dia(int16 aad_nr) {
_G(det)->del_static_ani(0);
_G(room)->set_timer_status(0, TIMER_STOP);
_G(det)->stopDetail(0);
- startSetAILWait(1, 1, ANI_FRONT);
+ startDetailWait(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 a3b20d320b0..3d0a7699380 100644
--- a/engines/chewy/rooms/room42.cpp
+++ b/engines/chewy/rooms/room42.cpp
@@ -80,13 +80,13 @@ void Room42::getPumpkin(int16 aad_nr) {
hideCur();
autoMove(1, P_CHEWY);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(7, 1, ANI_BACK);
+ startDetailWait(7, 1, ANI_BACK);
_G(gameState)._personHide[P_CHEWY] = false;
start_spz(CH_TALK5, 255, ANI_FRONT, P_CHEWY);
startAadWait(aad_nr);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(7, 1, ANI_FRONT);
+ startDetailWait(7, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
showCur();
}
@@ -105,11 +105,11 @@ int16 Room42::useMailBag() {
action_flag = true;
autoMove(3, P_CHEWY);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(10, 1, ANI_FRONT);
+ startDetailWait(10, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
startAadWait(187);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(9, 1, ANI_FRONT);
+ startDetailWait(9, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
new_invent_2_cur(BMARKE_INV);
startAadWait(181);
@@ -121,7 +121,7 @@ int16 Room42::useMailBag() {
action_flag = true;
autoMove(3, P_CHEWY);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(10, 1, ANI_FRONT);
+ startDetailWait(10, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
delInventory(_G(cur)->getInventoryCursor());
startAadWait(183);
@@ -189,16 +189,16 @@ void Room42::dialogWithStationEmployee(int16 str_end_nr) {
switch (str_end_nr) {
case 1:
- startSetAILWait(3, 4, ANI_FRONT);
+ startDetailWait(3, 4, ANI_FRONT);
break;
case 2:
_G(det)->playSound(4, 0);
- startSetAILWait(4, 13, ANI_FRONT);
+ startDetailWait(4, 13, ANI_FRONT);
break;
case 3:
- startSetAILWait(5, 2, ANI_FRONT);
+ startDetailWait(5, 2, ANI_FRONT);
break;
default:
@@ -212,7 +212,7 @@ void Room42::dialogWithStationEmployee(int16 str_end_nr) {
_G(det)->stopDetail(0);
_G(det)->stopSound(0);
- startSetAILWait(1, 1, ANI_FRONT);
+ startDetailWait(1, 1, ANI_FRONT);
_G(det)->startDetail(2, 255, ANI_FRONT);
while (_G(atds)->aadGetStatus() != -1) {
diff --git a/engines/chewy/rooms/room45.cpp b/engines/chewy/rooms/room45.cpp
index b3a536efd33..334fda9ff44 100644
--- a/engines/chewy/rooms/room45.cpp
+++ b/engines/chewy/rooms/room45.cpp
@@ -200,11 +200,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);
+ startDetailWait(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);
+ startDetailWait(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(det)->hideStaticSpr(11);
_G(det)->playSound(15, 2);
_G(det)->playSound(15, 0);
- startSetAILWait(15, 1, ANI_FRONT);
+ startDetailWait(15, 1, ANI_FRONT);
_G(det)->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);
+ startDetailWait(1, 1, ANI_FRONT);
_G(room)->set_timer_status(0, TIMER_START);
_G(det)->set_static_ani(0, -1);
_G(gameState).R45MagOk = true;
diff --git a/engines/chewy/rooms/room46.cpp b/engines/chewy/rooms/room46.cpp
index 7734dbf9324..e8a0dfa1dd3 100644
--- a/engines/chewy/rooms/room46.cpp
+++ b/engines/chewy/rooms/room46.cpp
@@ -112,15 +112,15 @@ void Room46::bodo() {
autoMove(2, P_CHEWY);
_G(spieler_mi)[P_CHEWY].Mode = false;
- startSetAILWait(0, 1, ANI_FRONT);
+ startDetailWait(0, 1, ANI_FRONT);
_G(det)->startDetail(5, 255, ANI_FRONT);
startAadWait(241);
_G(det)->stopDetail(5);
_G(det)->showStaticSpr(5);
startAadWait(609);
_G(det)->hideStaticSpr(5);
- startSetAILWait(2, 1, ANI_FRONT);
- startSetAILWait(3, 1, ANI_FRONT);
+ startDetailWait(2, 1, ANI_FRONT);
+ startDetailWait(3, 1, ANI_FRONT);
_G(det)->startDetail(4, 255, ANI_FRONT);
startAadWait(242);
_G(det)->stopDetail(4);
@@ -128,10 +128,10 @@ void Room46::bodo() {
_G(det)->showStaticSpr(6);
startAadWait(610);
_G(det)->hideStaticSpr(6);
- startSetAILWait(6, 1, ANI_FRONT);
+ startDetailWait(6, 1, ANI_FRONT);
_G(det)->showStaticSpr(3);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(1, 1, ANI_FRONT);
+ startDetailWait(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 ad0d6538ad1..6bbe21e0a1a 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);
+ startDetailWait(1, 1, ANI_FRONT);
_G(det)->showStaticSpr(6);
- startSetAILWait(1, 1, ANI_BACK);
+ startDetailWait(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)->stopDetail(0);
_G(det)->del_static_ani(0);
- startSetAILWait(2, 1, ANI_FRONT);
+ startDetailWait(2, 1, ANI_FRONT);
_G(det)->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 0308131ae0c..d563b96a240 100644
--- a/engines/chewy/rooms/room49.cpp
+++ b/engines/chewy/rooms/room49.cpp
@@ -132,14 +132,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);
+ startDetailWait(3, 1, ANI_FRONT);
_G(det)->showStaticSpr(9);
_G(gameState)._personHide[P_HOWARD] = true;
- startSetAILWait(8, 1, ANI_FRONT);
+ startDetailWait(8, 1, ANI_FRONT);
_G(gameState)._personHide[P_HOWARD] = false;
_G(det)->hideStaticSpr(9);
- startSetAILWait(4, 1, ANI_GO);
+ startDetailWait(4, 1, ANI_GO);
_G(SetUpScreenFunc) = setup_func;
_G(det)->set_static_ani(_G(gameState).R49BoyAni ? 1 : 0, -1);
@@ -260,7 +260,7 @@ int16 Room49::use_taxi() {
}
_G(det)->hideStaticSpr(7);
- startSetAILWait(5, 1, ANI_FRONT);
+ startDetailWait(5, 1, ANI_FRONT);
_G(det)->stopSound(0);
switchRoom(48);
}
diff --git a/engines/chewy/rooms/room50.cpp b/engines/chewy/rooms/room50.cpp
index bbb8e4072a4..a26d4e2063a 100644
--- a/engines/chewy/rooms/room50.cpp
+++ b/engines/chewy/rooms/room50.cpp
@@ -191,7 +191,7 @@ int16 Room50::use_gum() {
_G(room)->set_timer_status(1, TIMER_STOP);
_wasser = false;
stop_page();
- startSetAILWait(6, 1, ANI_FRONT);
+ startDetailWait(6, 1, ANI_FRONT);
_G(det)->set_static_ani(5, -1);
autoMove(3, P_CHEWY);
_G(spieler_mi)[P_CHEWY].Mode = true;
@@ -202,14 +202,14 @@ int16 Room50::use_gum() {
setPersonSpr(P_LEFT, P_HOWARD);
delInventory(_G(cur)->getInventoryCursor());
hide_person();
- startSetAILWait(2, 1, ANI_FRONT);
+ startDetailWait(2, 1, ANI_FRONT);
_G(det)->showStaticSpr(4);
- startSetAILWait(2, 1, ANI_BACK);
+ startDetailWait(2, 1, ANI_BACK);
show_person();
setPersonSpr(P_LEFT, P_CHEWY);
startAadWait(275);
_G(det)->del_static_ani(5);
- startSetAILWait(9, 1, ANI_FRONT);
+ startDetailWait(9, 1, ANI_FRONT);
_G(det)->del_static_ani(5);
_G(det)->set_static_ani(10, -1);
startAadWait(277);
@@ -238,7 +238,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);
+ startDetailWait(6, 1, ANI_BACK);
go_page();
if (!_G(gameState).R50KeyOK)
diff --git a/engines/chewy/rooms/room51.cpp b/engines/chewy/rooms/room51.cpp
index c2a20804bff..7fcf2757ecb 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_events->getSwitchCode() == 28) && !_flag) {
_flag = true;
_G(det)->setDetailPos(8, _tmpx - 20, _tmpy + 41);
- startSetAILWait(8, 1, ANI_FRONT);
+ startDetailWait(8, 1, ANI_FRONT);
_flag = false;
++_index;
@@ -239,7 +239,7 @@ int16 Room51::use_door(int16 txt_nr) {
if (!_G(gameState).R51KillerWeg) {
_G(det)->playSound(2, 0);
_G(det)->showStaticSpr(1);
- startSetAILWait(2, 1, ANI_FRONT);
+ startDetailWait(2, 1, ANI_FRONT);
_G(det)->startDetail(5, 255, ANI_FRONT);
if (!_G(gameState).R52HotDogOk) {
@@ -318,7 +318,7 @@ int16 Room51::use_door(int16 txt_nr) {
case 1:
_G(det)->showStaticSpr(3);
startAadWait(280);
- startSetAILWait(1, 1, ANI_FRONT);
+ startDetailWait(1, 1, ANI_FRONT);
++_G(gameState).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 35b07371136..689e9b3dbae 100644
--- a/engines/chewy/rooms/room52.cpp
+++ b/engines/chewy/rooms/room52.cpp
@@ -91,7 +91,7 @@ int16 Room52::use_hot_dog() {
action_ret = true;
autoMove(5, P_CHEWY);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(7, 1, ANI_FRONT);
+ startDetailWait(7, 1, ANI_FRONT);
_G(det)->playSound(7, 0);
_G(det)->startDetail(8, 255, ANI_FRONT);
@@ -103,7 +103,7 @@ int16 Room52::use_hot_dog() {
_G(det)->stopSound(0);
_G(det)->stopDetail(0);
_G(det)->stopDetail(8);
- startSetAILWait(7, 1, ANI_BACK);
+ startDetailWait(7, 1, ANI_BACK);
_G(det)->stopSound(0);
_G(gameState)._personHide[P_CHEWY] = false;
_G(atds)->setControlBit(341, ATS_ACTIVE_BIT);
diff --git a/engines/chewy/rooms/room53.cpp b/engines/chewy/rooms/room53.cpp
index ddd39764474..de5caf0e974 100644
--- a/engines/chewy/rooms/room53.cpp
+++ b/engines/chewy/rooms/room53.cpp
@@ -45,7 +45,7 @@ void Room53::entry() {
hideCur();
_G(obj)->hide_sib(SIB_VISIT_R53);
_G(atds)->delControlBit(319, ATS_ACTIVE_BIT);
- startSetAILWait(0, 1, ANI_FRONT);
+ startDetailWait(0, 1, ANI_FRONT);
_G(det)->set_static_ani(1, -1);
_G(timer_nr)[0] = _G(room)->set_timer(1, 7);
showCur();
@@ -54,7 +54,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);
+ startDetailWait(5, 1, ANI_FRONT);
_G(atds)->setControlBit(319, ATS_ACTIVE_BIT);
if (!_G(gameState).R53Visit)
_G(obj)->show_sib(SIB_VISIT_R53);
@@ -65,11 +65,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);
+ startDetailWait(2, 1, ANI_FRONT);
_G(det)->set_static_ani(3, -1);
startAadWait(269 + (_G(gameState).R53Kostuem ? 1 : 0));
_G(det)->del_static_ani(3);
- startSetAILWait(4, 1, ANI_FRONT);
+ startDetailWait(4, 1, ANI_FRONT);
man_go();
showCur();
}
diff --git a/engines/chewy/rooms/room54.cpp b/engines/chewy/rooms/room54.cpp
index a110388d17f..ea42a6be806 100644
--- a/engines/chewy/rooms/room54.cpp
+++ b/engines/chewy/rooms/room54.cpp
@@ -142,7 +142,7 @@ int16 Room54::use_schalter() {
_G(det)->playSound(0, 1);
_G(det)->stopSound(2);
- startSetAILWait(1, 1, ANI_FRONT);
+ startDetailWait(1, 1, ANI_FRONT);
_G(det)->startDetail(3, 255, ANI_FRONT);
startAadWait(292 + _G(gameState).R54LiftCount);
_G(det)->stopDetail(3);
@@ -150,19 +150,19 @@ int16 Room54::use_schalter() {
int16 aad_nr;
if (_G(gameState).R54LiftCount < 3) {
- startSetAILWait(2, 1, ANI_FRONT);
+ startDetailWait(2, 1, ANI_FRONT);
_G(det)->hideStaticSpr(0);
_G(det)->stopSound(0);
_G(det)->stopSound(1);
_G(det)->playSound(1, 2);
- startSetAILWait(1, 1, ANI_BACK);
+ startDetailWait(1, 1, ANI_BACK);
_G(det)->stopSound(2);
aad_nr = 295;
} else {
- startSetAILWait(5, 1, ANI_FRONT);
+ startDetailWait(5, 1, ANI_FRONT);
_G(det)->showStaticSpr(9);
- startSetAILWait(4, 1, ANI_FRONT);
+ startDetailWait(4, 1, ANI_FRONT);
aad_nr = 296;
_G(gameState).R54FputzerWeg = true;
_G(atds)->delControlBit(345, ATS_ACTIVE_BIT);
@@ -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);
+ startDetailWait(7, 1, ANI_FRONT);
_G(det)->startDetail(8, 255, ANI_FRONT);
startAadWait(310);
_G(det)->stopDetail(8);
- startSetAILWait(9, 1, ANI_FRONT);
- startSetAILWait(10, 1, ANI_FRONT);
+ startDetailWait(9, 1, ANI_FRONT);
+ startDetailWait(10, 1, ANI_FRONT);
_G(det)->startDetail(11, 255, ANI_FRONT);
startAadWait(311);
_G(det)->stopDetail(11);
diff --git a/engines/chewy/rooms/room55.cpp b/engines/chewy/rooms/room55.cpp
index 732b88e149d..428794134ed 100644
--- a/engines/chewy/rooms/room55.cpp
+++ b/engines/chewy/rooms/room55.cpp
@@ -76,7 +76,7 @@ void Room55::entry() {
if (_G(gameState).R55Location) {
_G(gameState).scrollx = 136;
setPersonPos(404, 66, P_CHEWY, P_RIGHT);
- startSetAILWait(3, 1, ANI_FRONT);
+ startDetailWait(3, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
_G(zoom_horizont) = 1;
_G(atds)->delControlBit(340, ATS_ACTIVE_BIT);
@@ -189,11 +189,11 @@ int16 Room55::use_telefon() {
_G(gameState).R55RaumOk = true;
autoMove(6, P_CHEWY);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(10, 1, ANI_FRONT);
+ startDetailWait(10, 1, ANI_FRONT);
_G(det)->startDetail(11, 255, ANI_FRONT);
startAadWait(329);
_G(det)->stopDetail(11);
- startSetAILWait(10, 1, ANI_BACK);
+ startDetailWait(10, 1, ANI_BACK);
_G(gameState)._personHide[P_CHEWY] = false;
autoMove(7, P_CHEWY);
@@ -201,7 +201,7 @@ int16 Room55::use_telefon() {
auto_scroll(0, 0);
startAadWait(330);
_G(det)->showStaticSpr(8);
- startSetAILWait(0, 1, ANI_FRONT);
+ startDetailWait(0, 1, ANI_FRONT);
_G(det)->startDetail(1, 255, ANI_FRONT);
startAadWait(331);
_G(det)->stopDetail(1);
@@ -209,7 +209,7 @@ int16 Room55::use_telefon() {
_G(det)->showStaticSpr(16);
startAadWait(608);
_G(det)->hideStaticSpr(16);
- startSetAILWait(2, 1, ANI_FRONT);
+ startDetailWait(2, 1, ANI_FRONT);
_G(det)->hideStaticSpr(0);
_G(det)->hideStaticSpr(8);
_G(atds)->set_all_ats_str(354, 1, ATS_DATA);
@@ -327,16 +327,16 @@ void Room55::rock2mans() {
}
void Room55::verleger_mov(int16 mode) {
- startSetAILWait(7, 1, ANI_FRONT);
+ startDetailWait(7, 1, ANI_FRONT);
_G(det)->showStaticSpr(11);
- startSetAILWait(13, 1, ANI_FRONT);
- startSetAILWait(14, 1, ANI_FRONT);
+ startDetailWait(13, 1, ANI_FRONT);
+ startDetailWait(14, 1, ANI_FRONT);
if (_G(gameState).ChewyAni == CHEWY_JMANS)
start_spz(CH_JM_TITS, 1, ANI_FRONT, P_CHEWY);
if (mode)
- startSetAILWait(15, 1, ANI_FRONT);
+ startDetailWait(15, 1, ANI_FRONT);
_G(det)->set_static_ani(16, -1);
}
@@ -348,7 +348,7 @@ void Room55::strasse(int16 mode) {
_G(det)->del_static_ani(4);
_G(det)->stopDetail(4);
_G(atds)->setControlBit(340, ATS_ACTIVE_BIT);
- startSetAILWait(3, 1, ANI_BACK);
+ startDetailWait(3, 1, ANI_BACK);
_G(gameState).scrollx = 0;
switchRoom(54);
@@ -366,7 +366,7 @@ int16 Room55::use_kammeraus() {
else if (!_G(gameState).R55SekWeg) {
hideCur();
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(5, 1, ANI_FRONT);
+ startDetailWait(5, 1, ANI_FRONT);
_G(det)->showStaticSpr(10);
flic_cut(FCUT_070);
register_cutscene(18);
@@ -431,7 +431,7 @@ void Room55::talk_line() {
_G(room)->set_timer_status(aniNr, TIMER_STOP);
_G(det)->stopDetail(aniNr);
_G(det)->del_static_ani(aniNr);
- startSetAILWait(22, 1, ANI_FRONT);
+ startDetailWait(22, 1, ANI_FRONT);
_G(det)->set_static_ani(21, -1);
} else if (!_G(gameState).R55RaumOk) {
autoMove(3, P_CHEWY);
@@ -443,10 +443,10 @@ void Room55::talk_line() {
if (_G(gameState).R55SekWeg) {
_G(det)->del_static_ani(16);
- startSetAILWait(14, 1, ANI_FRONT);
+ startDetailWait(14, 1, ANI_FRONT);
} else {
_G(det)->del_static_ani(21);
- startSetAILWait(22, 1, ANI_FRONT);
+ startDetailWait(22, 1, ANI_FRONT);
}
_G(flags).NoScroll = false;
diff --git a/engines/chewy/rooms/room56.cpp b/engines/chewy/rooms/room56.cpp
index c850494fa2f..60d58d03869 100644
--- a/engines/chewy/rooms/room56.cpp
+++ b/engines/chewy/rooms/room56.cpp
@@ -59,11 +59,11 @@ void Room56::entry() {
setPersonPos(3, 42, P_CHEWY, P_RIGHT);
_G(det)->stopSound(0);
_G(det)->playSound(7, 1);
- startSetAILWait(7, 1, ANI_BACK);
- startSetAILWait(8, 1, ANI_FRONT);
+ startDetailWait(7, 1, ANI_BACK);
+ startDetailWait(8, 1, ANI_FRONT);
_G(det)->stopSound(1);
_G(det)->playSound(7, 0);
- startSetAILWait(7, 1, ANI_FRONT);
+ startDetailWait(7, 1, ANI_FRONT);
setupScreen(DO_SETUP);
if (!_G(gameState).R56GetTabak) {
@@ -213,7 +213,7 @@ int16 Room56::use_taxi() {
autoMove(1, P_CHEWY);
_G(det)->stopSound(0);
_G(det)->playSound(7, 1);
- startSetAILWait(7, 1, ANI_BACK);
+ startDetailWait(7, 1, ANI_BACK);
_G(det)->startDetail(8, 1, ANI_FRONT);
_G(zoom_horizont) = 0;
_G(room)->set_zoom(23);
@@ -259,7 +259,7 @@ int16 Room56::use_man() {
_G(det)->del_static_ani(0);
if (!_G(gameState).R56WhiskyMix) {
- startSetAILWait(4, 1, ANI_FRONT);
+ startDetailWait(4, 1, ANI_FRONT);
_G(det)->set_static_ani(5, -1);
startAadWait(304);
@@ -269,7 +269,7 @@ int16 Room56::use_man() {
} else {
delInventory(_G(cur)->getInventoryCursor());
_G(gameState).R56AbfahrtOk = true;
- startSetAILWait(6, 1, ANI_FRONT);
+ startDetailWait(6, 1, ANI_FRONT);
_G(det)->set_static_ani(1, -1);
startAadWait(305);
@@ -299,7 +299,7 @@ int16 Room56::use_kneipe() {
_G(gameState).R56Kneipe = true;
_G(flags).NoScroll = true;
auto_scroll(0, 0);
- startSetAILWait(12, 3, ANI_FRONT);
+ startDetailWait(12, 3, ANI_FRONT);
flic_cut(FCUT_075);
_G(det)->stopSound(0);
_G(det)->playSound(9, 0);
diff --git a/engines/chewy/rooms/room57.cpp b/engines/chewy/rooms/room57.cpp
index 7c3d1b047b7..de681108c79 100644
--- a/engines/chewy/rooms/room57.cpp
+++ b/engines/chewy/rooms/room57.cpp
@@ -101,7 +101,7 @@ int16 Room57::use_taxi() {
_G(det)->playSound(3, 0);
_G(room)->set_timer_status(3, TIMER_STOP);
_G(det)->del_static_ani(3);
- startSetAILWait(5, 1, ANI_FRONT);
+ startDetailWait(5, 1, ANI_FRONT);
_G(det)->stopSound(0);
switchRoom(48);
}
@@ -138,7 +138,7 @@ int16 Room57::use_pfoertner() {
_G(gameState).R57StudioAuf = true;
_G(gameState).room_e_obj[91].Attribut = EXIT_TOP;
_G(det)->hideStaticSpr(4);
- startSetAILWait(6, 1, ANI_WAIT);
+ startDetailWait(6, 1, ANI_WAIT);
_G(det)->stopSound(0);
_G(atds)->setControlBit(358, ATS_ACTIVE_BIT);
} else {
diff --git a/engines/chewy/rooms/room62.cpp b/engines/chewy/rooms/room62.cpp
index 24f2b9c59e8..e17bb91d89c 100644
--- a/engines/chewy/rooms/room62.cpp
+++ b/engines/chewy/rooms/room62.cpp
@@ -51,7 +51,7 @@ void Room62::entry() {
_G(det)->startDetail(6, 255, ANI_FRONT);
startAadWait(347);
_G(det)->stopDetail(6);
- startSetAILWait(7, 1, ANI_FRONT);
+ startDetailWait(7, 1, ANI_FRONT);
_G(det)->set_static_ani(5, -1);
_G(det)->startDetail(0, 255, ANI_FRONT);
startAadWait(348);
@@ -63,7 +63,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);
+ startDetailWait(7, 1, ANI_FRONT);
showCur();
_G(gameState).R64Moni1Ani = 3;
_G(gameState).R64Moni2Ani = 4;
diff --git a/engines/chewy/rooms/room63.cpp b/engines/chewy/rooms/room63.cpp
index 3e6be643862..98d85b73d90 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);
+ startDetailWait(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);
+ startDetailWait(6, 1, ANI_FRONT);
_G(det)->startDetail(7, 255, ANI_FRONT);
startAadWait(362);
_G(det)->stopDetail(7);
- startSetAILWait(8, 1, ANI_FRONT);
+ startDetailWait(8, 1, ANI_FRONT);
_G(gameState).R63FxManAway = true;
_G(atds)->setControlBit(384, ATS_ACTIVE_BIT);
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);
+ startDetailWait(21, 1, ANI_FRONT);
_G(det)->showStaticSpr(14);
waitShowScreen(18);
_G(det)->hideStaticSpr(14);
- startSetAILWait(24, 1, ANI_FRONT);
+ startDetailWait(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)->stopDetail(12);
- startSetAILWait(13, 1, ANI_FRONT);
+ startDetailWait(13, 1, ANI_FRONT);
_G(det)->set_static_ani(14, -1);
startDialogCloseupWait(17);
_G(det)->del_static_ani(14);
@@ -268,14 +268,14 @@ int16 Room63::use_girl() {
autoMove(2, P_CHEWY);
delInventory(_G(cur)->getInventoryCursor());
_G(det)->stopDetail(12);
- startSetAILWait(13, 1, ANI_FRONT);
+ startDetailWait(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)->stopDetail(15);
- startSetAILWait(16, 1, ANI_FRONT);
+ startDetailWait(16, 1, ANI_FRONT);
_G(gameState).R63Uhr = true;
_G(det)->stopDetail(10);
_G(det)->stopDetail(18);
diff --git a/engines/chewy/rooms/room66.cpp b/engines/chewy/rooms/room66.cpp
index 6aedc8b5e40..31998e3272c 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(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(0, 1, ANI_FRONT);
+ startDetailWait(0, 1, ANI_FRONT);
_G(det)->showStaticSpr(14);
waitShowScreen(15);
_G(det)->hideStaticSpr(14);
- startSetAILWait(1, 1, ANI_FRONT);
+ startDetailWait(1, 1, ANI_FRONT);
load_chewy_taf(CHEWY_NORMAL);
_G(gameState)._personHide[P_CHEWY] = false;
start_spz(CH_TALK12, 255, false, P_CHEWY);
@@ -194,7 +194,7 @@ int Room66::proc7() {
proc8(7, 2, 3, 411 + (_G(gameState).changedArtifactOrigin ? 1 : 0));
hideCur();
if (_G(gameState).flags26_20)
- startSetAILWait(4, 1, ANI_FRONT);
+ startDetailWait(4, 1, ANI_FRONT);
showCur();
return 1;
diff --git a/engines/chewy/rooms/room68.cpp b/engines/chewy/rooms/room68.cpp
index b0fd017ba65..56276b78080 100644
--- a/engines/chewy/rooms/room68.cpp
+++ b/engines/chewy/rooms/room68.cpp
@@ -194,15 +194,15 @@ int16 Room68::useIndigo() {
_G(room)->set_timer_status(8, TIMER_STOP);
_G(det)->del_static_ani(8);
_G(det)->stopDetail(8);
- startSetAILWait(13, 3, ANI_FRONT);
- startSetAILWait(25, 1, ANI_FRONT);
+ startDetailWait(13, 3, ANI_FRONT);
+ startDetailWait(25, 1, ANI_FRONT);
_G(det)->set_static_ani(12, -1);
talkToIndigo(398);
hideCur();
_G(room)->set_timer_status(8, TIMER_STOP);
_G(det)->del_static_ani(8);
_G(det)->stopDetail(8);
- startSetAILWait(26, 1, ANI_FRONT);
+ startDetailWait(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);
@@ -223,7 +223,7 @@ void Room68::talkToBartender() {
autoMove(2, P_CHEWY);
_G(room)->set_timer_status(20, TIMER_STOP);
_G(det)->del_static_ani(20);
- startSetAILWait(15, 1, ANI_FRONT);
+ startDetailWait(15, 1, ANI_FRONT);
_G(det)->set_static_ani(16, -1);
showCur();
int16 x = _G(moveState)[P_CHEWY].Xypos[0] - _G(gameState).scrollx + _G(spieler_mi)[P_CHEWY].HotX;
@@ -232,7 +232,7 @@ void Room68::talkToBartender() {
startDialogCloseupWait(20);
hideCur();
_G(det)->del_static_ani(16);
- startSetAILWait(15, 1, ANI_BACK);
+ startDetailWait(15, 1, ANI_BACK);
_G(room)->set_timer_status(20, TIMER_START);
_G(det)->set_static_ani(20, -1);
showCur();
@@ -307,7 +307,7 @@ int16 Room68::useDiva() {
autoMove(4, P_CHEWY);
_G(uhr)->resetTimer(_G(timer_nr)[0], 0);
_G(det)->hideStaticSpr(3);
- startSetAILWait(4, 1, ANI_FRONT);
+ startDetailWait(4, 1, ANI_FRONT);
_G(gameState).R68DrinkCoupon = false;
_G(det)->showStaticSpr(3);
} else if (isCurInventory(B_MARY2_INV)) {
@@ -321,7 +321,7 @@ int16 Room68::useDiva() {
_G(det)->del_static_ani(18);
register_cutscene(22);
_G(det)->del_static_ani(18);
- startSetAILWait(7, 1, ANI_FRONT);
+ startDetailWait(7, 1, ANI_FRONT);
_G(atds)->setControlBit(407, ATS_ACTIVE_BIT);
_G(atds)->setControlBit(412, ATS_ACTIVE_BIT);
setPersonSpr(P_RIGHT, P_CHEWY);
@@ -352,7 +352,7 @@ void Room68::useDressOnNichelle(int16 aad_nr) {
goAutoXy(161, 59, P_HOWARD, ANI_GO);
autoMove(4, P_CHEWY);
startAadWait(390);
- startSetAILWait(22, 1, ANI_FRONT);
+ startDetailWait(22, 1, ANI_FRONT);
_G(gameState)._personHide[P_HOWARD] = true;
_G(det)->startDetail(27, 255, ANI_FRONT);
@@ -377,7 +377,7 @@ void Room68::useDressOnNichelle(int16 aad_nr) {
_G(room)->set_timer_status(8, TIMER_STOP);
_G(det)->del_static_ani(8);
- startSetAILWait(10, 1, ANI_FRONT);
+ startDetailWait(10, 1, ANI_FRONT);
_G(det)->startDetail(11, 255, ANI_FRONT);
startAadWait(396);
_G(det)->stopDetail(11);
diff --git a/engines/chewy/rooms/room71.cpp b/engines/chewy/rooms/room71.cpp
index fbefa912427..a18f311717e 100644
--- a/engines/chewy/rooms/room71.cpp
+++ b/engines/chewy/rooms/room71.cpp
@@ -208,7 +208,7 @@ void Room71::proc2() {
_G(det)->startDetail(5, 255, false);
auto_scroll(160, 0);
_G(det)->hideStaticSpr(5);
- startSetAILWait(1, 1, ANI_FRONT);
+ startDetailWait(1, 1, ANI_FRONT);
_G(det)->startDetail(2, 255, false);
_G(det)->stopDetail(5);
_G(det)->showStaticSpr(8);
@@ -251,7 +251,7 @@ void Room71::proc4() {
void Room71::proc5(int16 val) {
_state = 1 + (_G(gameState).flags28_4 ? 1 : 0);
_G(det)->hideStaticSpr(2);
- startSetAILWait(val, 5, ANI_FRONT);
+ startDetailWait(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 2afd99e1337..cc8ec13c81c 100644
--- a/engines/chewy/rooms/room74.cpp
+++ b/engines/chewy/rooms/room74.cpp
@@ -96,7 +96,7 @@ int Room74::proc1() {
_G(gameState).R74CutRubberPlant = true;
autoMove(4, P_CHEWY);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(1, 1, ANI_FRONT);
+ startDetailWait(1, 1, ANI_FRONT);
setPersonPos(272, 116, P_CHEWY, P_RIGHT);
_G(gameState)._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 3d8788bf1b4..4c0c6aebd86 100644
--- a/engines/chewy/rooms/room76.cpp
+++ b/engines/chewy/rooms/room76.cpp
@@ -127,8 +127,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);
+ startDetailWait(3, 1, ANI_FRONT);
+ startDetailWait(4, 2, ANI_FRONT);
_G(det)->set_static_ani(2, -1);
}
@@ -162,10 +162,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);
+ startDetailWait(5, 1, ANI_FRONT);
_G(det)->set_static_ani(2, -1);
- startSetAILWait(9, 1, ANI_FRONT);
- startSetAILWait(10, 1, ANI_FRONT);
+ startDetailWait(9, 1, ANI_FRONT);
+ startDetailWait(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 d1fbc8b825f..4b9d6051a55 100644
--- a/engines/chewy/rooms/room78.cpp
+++ b/engines/chewy/rooms/room78.cpp
@@ -100,7 +100,7 @@ void Room78::entry() {
if (!chewysBoatFinished) {
_G(det)->startDetail(5, 1, false);
} else {
- startSetAILWait(5, 1, ANI_FRONT);
+ startDetailWait(5, 1, ANI_FRONT);
}
} else {
// Chief's boat has no hole
diff --git a/engines/chewy/rooms/room81.cpp b/engines/chewy/rooms/room81.cpp
index 24fef3a6894..d3d1813cc2c 100644
--- a/engines/chewy/rooms/room81.cpp
+++ b/engines/chewy/rooms/room81.cpp
@@ -82,11 +82,11 @@ void Room81::proc1() {
startAadWait(461);
goAutoXy(143, 62, P_CHEWY, ANI_WAIT);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(0, 1, ANI_FRONT);
+ startDetailWait(0, 1, ANI_FRONT);
_G(det)->startDetail(1, 255, false);
startAadWait(459);
_G(det)->stopDetail(1);
- startSetAILWait(0, 1, ANI_GO);
+ startDetailWait(0, 1, ANI_GO);
_G(gameState)._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 b78533dad01..1914ca34ffe 100644
--- a/engines/chewy/rooms/room82.cpp
+++ b/engines/chewy/rooms/room82.cpp
@@ -152,8 +152,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);
+ startDetailWait(2, 1, ANI_FRONT);
+ startDetailWait(3, 1, ANI_FRONT);
_G(det)->set_static_ani(0, -1);
start_spz_wait(13, 1, false, P_CHEWY);
@@ -236,7 +236,7 @@ void Room82::proc8() {
_G(gameState)._personHide[P_NICHELLE] = false;
startAadWait(448);
_G(det)->del_static_ani(4);
- startSetAILWait(6, 2, ANI_FRONT);
+ startDetailWait(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 919fbfb1254..d4b151f0ddc 100644
--- a/engines/chewy/rooms/room84.cpp
+++ b/engines/chewy/rooms/room84.cpp
@@ -144,7 +144,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);
+ startDetailWait(5, 1, ANI_FRONT);
_G(det)->set_static_ani(3, -1);
startAadWait(456);
_G(flags).NoScroll = false;
@@ -192,7 +192,7 @@ int Room84::proc4() {
if (_G(gameState).flags32_10) {
_G(det)->stopDetail(7);
- startSetAILWait(8, 1, ANI_FRONT);
+ startDetailWait(8, 1, ANI_FRONT);
} else {
_G(gameState)._personRoomNr[P_NICHELLE] = 88;
}
diff --git a/engines/chewy/rooms/room85.cpp b/engines/chewy/rooms/room85.cpp
index 710c89c0648..a97efa696d7 100644
--- a/engines/chewy/rooms/room85.cpp
+++ b/engines/chewy/rooms/room85.cpp
@@ -154,7 +154,7 @@ int Room85::proc2() {
autoMove(2, P_CHEWY);
_G(det)->stopDetail(1);
- startSetAILWait(2, 1, ANI_FRONT);
+ startDetailWait(2, 1, ANI_FRONT);
_G(gameState)._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 837c23075c9..8ff8274b63d 100644
--- a/engines/chewy/rooms/room88.cpp
+++ b/engines/chewy/rooms/room88.cpp
@@ -76,7 +76,7 @@ int Room88::proc2() {
autoMove(1, P_CHEWY);
start_spz_wait(13, 1, false, P_CHEWY);
_G(det)->showStaticSpr(0);
- startSetAILWait(0, 1, _G(gameState).flags30_10 ? ANI_GO : ANI_FRONT);
+ startDetailWait(0, 1, _G(gameState).flags30_10 ? ANI_GO : ANI_FRONT);
_G(det)->hideStaticSpr(1 + (_G(gameState).flags30_10 ? 1 : 0));
_G(gameState).flags31_10 = false;
_G(det)->showStaticSpr(1 + (!_G(gameState).flags30_10 ? 1 : 0));
@@ -116,8 +116,8 @@ int Room88::proc3() {
const int aniNr = 1 + (_G(gameState).flags31_10 ? 1 : 0);
for (int i = 0; i < 3; ++i) {
- startSetAILWait(aniNr, 1, ANI_FRONT);
- startSetAILWait(aniNr, 1, ANI_GO);
+ startDetailWait(aniNr, 1, ANI_FRONT);
+ startDetailWait(aniNr, 1, ANI_GO);
}
_G(out)->setPointer(nullptr);
@@ -129,7 +129,7 @@ int Room88::proc3() {
_G(out)->raster_col(0, 0, 0, 0);
switchRoom(80);
hideCur();
- startSetAILWait(1, 1, ANI_FRONT);
+ startDetailWait(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 09fb411951f..f1ea88648c7 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);
+ startDetailWait(1, 1, ANI_FRONT);
_G(gameState).flags33_10 = true;
_G(gameState)._personRoomNr[P_HOWARD] = 91;
switchRoom(91);
@@ -291,7 +291,7 @@ int Room90::shootControlUnit() {
goAutoXy(232, 142, P_CHEWY, ANI_WAIT);
_G(flags).NoScroll = true;
auto_scroll(176, 0);
- startSetAILWait(13, 1, ANI_FRONT);
+ startDetailWait(13, 1, ANI_FRONT);
_G(flags).NoPalAfterFlc = true;
flic_cut(FCUT_107);
_G(gameState).scrollx = 0;
diff --git a/engines/chewy/rooms/room91.cpp b/engines/chewy/rooms/room91.cpp
index 46784568a8b..1a2fca13a75 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)->stopDetail(0);
- startSetAILWait(aniNr, 1, ANI_FRONT);
+ startDetailWait(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(gameState)._personHide[P_HOWARD] = true;
- startSetAILWait(9, 1, ANI_FRONT);
+ startDetailWait(9, 1, ANI_FRONT);
_G(gameState)._personHide[P_HOWARD] = false;
_G(gameState)._personRoomNr[P_HOWARD] = 50;
_G(gameState).flags34_4 = false;
diff --git a/engines/chewy/rooms/room93.cpp b/engines/chewy/rooms/room93.cpp
index ea58bad20ce..33c30a2daea 100644
--- a/engines/chewy/rooms/room93.cpp
+++ b/engines/chewy/rooms/room93.cpp
@@ -34,28 +34,28 @@ void Room93::entry() {
_G(gameState).scrollx = 0;
hide_person();
- startSetAILWait(3, 0, ANI_GO);
+ startDetailWait(3, 0, ANI_GO);
_G(det)->set_static_ani(0, -1);
startAadWait(616);
_G(det)->del_static_ani(0);
- startSetAILWait(3, 1, ANI_FRONT);
+ startDetailWait(3, 1, ANI_FRONT);
_G(det)->set_static_ani(1, -1);
startDialogCloseupWait(27);
if (!_G(gameState).flags37_40) {
_G(det)->del_static_ani(1);
hideCur();
- startSetAILWait(3, 1, ANI_GO);
+ startDetailWait(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);
+ startDetailWait(3, 1, ANI_FRONT);
+ startDetailWait(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);
+ startDetailWait(6, 1, ANI_GO);
+ startDetailWait(2, 1, ANI_FRONT);
setupScreen(DO_SETUP);
showCur();
}
diff --git a/engines/chewy/rooms/room94.cpp b/engines/chewy/rooms/room94.cpp
index a881ca3e6bf..640479cac3f 100644
--- a/engines/chewy/rooms/room94.cpp
+++ b/engines/chewy/rooms/room94.cpp
@@ -156,7 +156,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);
+ startDetailWait(4, 1, ANI_FRONT);
_G(gameState).flags35_10 = true;
_G(gameState).room_e_obj[138].Attribut = EXIT_TOP;
_G(atds)->setControlBit(522, ATS_ACTIVE_BIT);
diff --git a/engines/chewy/rooms/room97.cpp b/engines/chewy/rooms/room97.cpp
index 2d9b9d8557c..fae9de09037 100644
--- a/engines/chewy/rooms/room97.cpp
+++ b/engines/chewy/rooms/room97.cpp
@@ -113,7 +113,7 @@ void Room97::entry() {
_G(gameState).SVal2 = 0;
_G(gameState).flags35_4 = true;
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(19, 1, ANI_FRONT);
+ startDetailWait(19, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
showCur();
switchRoom(89);
@@ -339,7 +339,7 @@ void Room97::proc4() {
stopPerson(P_CHEWY);
_G(det)->playSound(9, 0);
_G(det)->stopSound(1);
- startSetAILWait(9, 1, ANI_FRONT);
+ startDetailWait(9, 1, ANI_FRONT);
_G(det)->showStaticSpr(21);
while (_G(moveState)[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);
+ startDetailWait(29, 1, ANI_FRONT);
_G(det)->hideStaticSpr(21);
_G(det)->playSound(9, 1);
_G(det)->stopSound(0);
- startSetAILWait(9, 0, ANI_BACK);
+ startDetailWait(9, 0, ANI_BACK);
goAutoXy(1008, 93, P_CHEWY, ANI_WAIT);
goAutoXy(967, 111, P_CHEWY, ANI_WAIT);
@@ -404,7 +404,7 @@ int Room97::proc5() {
_G(det)->hideStaticSpr(21);
_G(det)->playSound(9, 1);
_G(det)->stopSound(0);
- startSetAILWait(9, 0, ANI_GO);
+ startDetailWait(9, 0, ANI_GO);
showCur();
return 1;
@@ -421,11 +421,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);
+ startDetailWait(1, 1, ANI_FRONT);
_G(det)->showStaticSpr(28);
autoMove(1, P_CHEWY);
_G(det)->hideStaticSpr(18);
- startSetAILWait(15, 1, ANI_FRONT);
+ startDetailWait(15, 1, ANI_FRONT);
_G(det)->showStaticSpr(17);
start_spz(CH_TALK5, 255, false, P_CHEWY);
startAadWait(558);
@@ -453,7 +453,7 @@ int Room97::proc7() {
_G(spieler_mi)[P_CHEWY].Mode = true;
_G(gameState)._personHide[P_CHEWY] = true;
_G(det)->hideStaticSpr(17);
- startSetAILWait(22, 1, ANI_FRONT);
+ startDetailWait(22, 1, ANI_FRONT);
_G(atds)->setControlBit(538, ATS_ACTIVE_BIT);
_G(atds)->set_all_ats_str(530, 2, ATS_DATA);
new_invent_2_cur(SLIME_INV);
@@ -495,7 +495,7 @@ int Room97::proc8() {
waitShowScreen(40);
_G(det)->stopDetail(24);
_G(det)->playSound(26, 0);
- startSetAILWait(25, 1, ANI_FRONT);
+ startDetailWait(25, 1, ANI_FRONT);
_G(det)->startDetail(26, 255, false);
_G(det)->stopDetail(23);
_G(det)->startDetail(27, 255, false);
@@ -536,9 +536,9 @@ int Room97::proc9() {
startAadWait(556);
} else {
start_spz_wait(13, 1, false, P_CHEWY);
- startSetAILWait(0, 1, ANI_FRONT);
+ startDetailWait(0, 1, ANI_FRONT);
_G(det)->showStaticSpr(13);
- startSetAILWait(13, 1, ANI_FRONT);
+ startDetailWait(13, 1, ANI_FRONT);
_G(det)->startDetail(14, 255, false);
startAadWait(555);
_G(gameState).flags36_40 = true;
@@ -561,7 +561,7 @@ int Room97::proc10() {
start_spz_wait(13, 1, false, P_CHEWY);
_G(det)->playSound(7, 0);
_G(det)->stopSound(1);
- startSetAILWait(7, 1, ANI_FRONT);
+ startDetailWait(7, 1, ANI_FRONT);
_G(det)->showStaticSpr(19);
_G(gameState).flags37_1 = true;
_G(atds)->setControlBit(543, ATS_ACTIVE_BIT);
@@ -692,10 +692,10 @@ void Room97::sensorAnim() {
hideCur();
if (!_slimeThrown) {
- startSetAILWait(17, 1, ANI_FRONT);
+ startDetailWait(17, 1, ANI_FRONT);
_G(det)->startDetail(16, 1, true);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(20, 1, false);
+ startDetailWait(20, 1, false);
setPersonPos(318, 42, P_CHEWY, P_LEFT);
_G(gameState)._personHide[P_CHEWY] = false;
} else {
@@ -703,14 +703,14 @@ void Room97::sensorAnim() {
delInventory(_G(cur)->getInventoryCursor());
_G(det)->showStaticSpr(27);
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(21, 1, ANI_FRONT);
+ startDetailWait(21, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
_G(det)->hideStaticSpr(27);
- startSetAILWait(18, 1, ANI_FRONT);
+ startDetailWait(18, 1, ANI_FRONT);
_G(det)->playSound(8, 0);
_G(det)->stopSound(1);
- startSetAILWait(8, 1, ANI_FRONT);
+ startDetailWait(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 09b39ad4683..f5c27b922a1 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 startDetailWait(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);
+ startDetailWait(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 4d3e6acaec4..7c3f1ba20c2 100644
--- a/engines/chewy/t_event.cpp
+++ b/engines/chewy/t_event.cpp
@@ -143,7 +143,7 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
case 73:
if (!_G(gameState).R9Grid) {
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(5, 1, ANI_FRONT);
+ startDetailWait(5, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
} else {
retValue = false;
@@ -1198,7 +1198,7 @@ void selectDialogOption(int16 diaNr, int16 blkNr, int16 strEndNr) {
case 20:
if (blkNr == 0 && strEndNr == 1) {
_G(gameState)._personHide[P_CHEWY] = true;
- startSetAILWait(28, 3, ANI_FRONT);
+ startDetailWait(28, 3, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
}
break;
@@ -1224,7 +1224,7 @@ void endDialogCloseup(int16 diaNr, int16 blkNr, int16 strEndNr) {
case 22:
if (strEndNr == 1) {
_G(det)->del_static_ani(3);
- startSetAILWait(5, 1, ANI_FRONT);
+ startDetailWait(5, 1, ANI_FRONT);
_G(det)->set_static_ani(3, -1);
startAadWait(456);
}
More information about the Scummvm-git-logs
mailing list