[Scummvm-git-logs] scummvm master -> e91bd68c2d509ad74642903486e20ce4722b8c9d
bluegr
noreply at scummvm.org
Tue Mar 29 22:11:08 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:
e91bd68c2d CHEWY: Remove superfluous parameter from the control bit functions
Commit: e91bd68c2d509ad74642903486e20ce4722b8c9d
https://github.com/scummvm/scummvm/commit/e91bd68c2d509ad74642903486e20ce4722b8c9d
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-03-30T01:10:35+03:00
Commit Message:
CHEWY: Remove superfluous parameter from the control bit functions
This is always set to ATS_DATA, so it can be safely removed
Changed paths:
engines/chewy/atds.cpp
engines/chewy/atds.h
engines/chewy/dialogs/inventory.cpp
engines/chewy/main.cpp
engines/chewy/r_event.cpp
engines/chewy/rooms/room00.cpp
engines/chewy/rooms/room01.cpp
engines/chewy/rooms/room02.cpp
engines/chewy/rooms/room06.cpp
engines/chewy/rooms/room07.cpp
engines/chewy/rooms/room08.cpp
engines/chewy/rooms/room09.cpp
engines/chewy/rooms/room11.cpp
engines/chewy/rooms/room13.cpp
engines/chewy/rooms/room16.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/room27.cpp
engines/chewy/rooms/room29.cpp
engines/chewy/rooms/room31.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/room41.cpp
engines/chewy/rooms/room48.cpp
engines/chewy/rooms/room49.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/room63.cpp
engines/chewy/rooms/room64.cpp
engines/chewy/rooms/room66.cpp
engines/chewy/rooms/room67.cpp
engines/chewy/rooms/room68.cpp
engines/chewy/rooms/room71.cpp
engines/chewy/rooms/room72.cpp
engines/chewy/rooms/room73.cpp
engines/chewy/rooms/room74.cpp
engines/chewy/rooms/room76.cpp
engines/chewy/rooms/room77.cpp
engines/chewy/rooms/room80.cpp
engines/chewy/rooms/room81.cpp
engines/chewy/rooms/room82.cpp
engines/chewy/rooms/room84.cpp
engines/chewy/rooms/room85.cpp
engines/chewy/rooms/room86.cpp
engines/chewy/rooms/room87.cpp
engines/chewy/rooms/room88.cpp
engines/chewy/rooms/room90.cpp
engines/chewy/rooms/room94.cpp
engines/chewy/rooms/room97.cpp
engines/chewy/t_event.cpp
diff --git a/engines/chewy/atds.cpp b/engines/chewy/atds.cpp
index 58ff76d00f6..2492563327b 100644
--- a/engines/chewy/atds.cpp
+++ b/engines/chewy/atds.cpp
@@ -622,7 +622,7 @@ char *Atdsys::ats_get_txt(int16 txtNr, int16 txtMode, int16 *retNr, int16 mode)
_atsv._txtMode = txtMode;
- if (!getControlBit(txtNr, ATS_ACTIVE_BIT, mode)) {
+ if (!getControlBit(txtNr, ATS_ACTIVE_BIT)) {
uint8 status = _ats_sheader[(txtNr * MAX_ATS_STATUS) + (_atsv._txtMode + 1) / 2];
int16 ak_nybble = (_atsv._txtMode + 1) % 2;
@@ -708,18 +708,18 @@ int16 Atdsys::get_ats_str(int16 txtNr, int16 txtMode, int16 mode) {
return (int16)lo_hi[ak_nybble];
}
-int16 Atdsys::getControlBit(int16 txtNr, int16 bitIdx, int16 mode) {
- set_ats_mem(mode);
+int16 Atdsys::getControlBit(int16 txtNr, int16 bitIdx) {
+ set_ats_mem(ATS_DATA);
return (_ats_sheader[txtNr * MAX_ATS_STATUS] & bitIdx) != 0;
}
-void Atdsys::setControlBit(int16 txtNr, int16 bitIdx, int16 mode) {
- set_ats_mem(mode);
+void Atdsys::setControlBit(int16 txtNr, int16 bitIdx) {
+ set_ats_mem(ATS_DATA);
_ats_sheader[txtNr * MAX_ATS_STATUS] |= bitIdx;
}
-void Atdsys::delControlBit(int16 txtNr, int16 bitIdx, int16 mode) {
- set_ats_mem(mode);
+void Atdsys::delControlBit(int16 txtNr, int16 bitIdx) {
+ set_ats_mem(ATS_DATA);
_ats_sheader[txtNr * MAX_ATS_STATUS] &= ~bitIdx;
}
diff --git a/engines/chewy/atds.h b/engines/chewy/atds.h
index 2ee18088de9..806864921da 100644
--- a/engines/chewy/atds.h
+++ b/engines/chewy/atds.h
@@ -268,9 +268,9 @@ public:
void stop_ats();
DisplayMode &ats_get_status();
void print_ats(int16 x, int16 y, int16 scrX, int16 scrY);
- int16 getControlBit(int16 txtNr, int16 bitIdx, int16 mode);
- void setControlBit(int16 txtNr, int16 bitIdx, int16 mode);
- void delControlBit(int16 txtNr, int16 bitIdx, int16 mode);
+ int16 getControlBit(int16 txtNr, int16 bitIdx);
+ void setControlBit(int16 txtNr, int16 bitIdx);
+ void delControlBit(int16 txtNr, int16 bitIdx);
void set_ats_str(int16 txtNr, int16 txtMode, int16 strNr, int16 mode);
void set_ats_str(int16 txtNr, int16 strNr, int16 mode);
int16 get_ats_str(int16 txtNr, int16 txtMode, int16 mode);
diff --git a/engines/chewy/dialogs/inventory.cpp b/engines/chewy/dialogs/inventory.cpp
index 529f4ec8608..212e5711ca3 100644
--- a/engines/chewy/dialogs/inventory.cpp
+++ b/engines/chewy/dialogs/inventory.cpp
@@ -592,14 +592,14 @@ void Inventory::look_screen(int16 txt_mode, int16 txt_nr) {
break;
}
- if (_G(atds)->getControlBit(txt_nr, ATS_ACTION_BIT, ATS_DATA)) {
+ if (_G(atds)->getControlBit(txt_nr, ATS_ACTION_BIT)) {
atsAction(txt_nr, m_mode, ATS_ACTION_VOR);
}
if (ok) {
startAtsWait(txt_nr, m_mode, 14, ATS_DATA);
}
- if (_G(atds)->getControlBit(txt_nr, ATS_ACTION_BIT, ATS_DATA))
+ if (_G(atds)->getControlBit(txt_nr, ATS_ACTION_BIT))
atsAction(txt_nr, m_mode, ATS_ACTION_NACH);
if (_G(menu_item) == CUR_USE)
_G(flags).StaticUseTxt = true;
diff --git a/engines/chewy/main.cpp b/engines/chewy/main.cpp
index d7ba43fe9a0..16413240f9b 100644
--- a/engines/chewy/main.cpp
+++ b/engines/chewy/main.cpp
@@ -1364,7 +1364,7 @@ int16 calcMouseText(int16 x, int16 y, int16 mode) {
}
int16 action_ret = 0;
- if (!_G(atds)->getControlBit(txtNr, ATS_ACTIVE_BIT, ATS_DATA)) {
+ if (!_G(atds)->getControlBit(txtNr, ATS_ACTIVE_BIT)) {
if (_G(menu_item) != CUR_WALK && _G(menu_item) != CUR_USE) {
if (x + _G(gameState).scrollx > _G(spieler_vector)[P_CHEWY].Xypos[0])
setPersonSpr(P_RIGHT, P_CHEWY);
@@ -1373,18 +1373,18 @@ int16 calcMouseText(int16 x, int16 y, int16 mode) {
}
}
- if (_G(atds)->getControlBit(txtNr, ATS_ACTION_BIT, ATS_DATA)) {
+ if (_G(atds)->getControlBit(txtNr, ATS_ACTION_BIT)) {
action_ret = atsAction(txtNr, txtMode, ATS_ACTION_VOR);
}
- if (ok && !_G(atds)->getControlBit(txtNr, ATS_ACTIVE_BIT, ATS_DATA)) {
+ if (ok && !_G(atds)->getControlBit(txtNr, ATS_ACTIVE_BIT)) {
if (startAtsWait(txtNr, txtMode, 14, ATS_DATA))
dispFl = false;
} else {
ret = -1;
}
- if (_G(atds)->getControlBit(txtNr, ATS_ACTION_BIT, ATS_DATA)) {
+ if (_G(atds)->getControlBit(txtNr, ATS_ACTION_BIT)) {
action_ret = atsAction(txtNr, txtMode, ATS_ACTION_NACH);
actionFl = true;
if (action_ret)
@@ -1392,7 +1392,7 @@ int16 calcMouseText(int16 x, int16 y, int16 mode) {
}
if (!ok && !action_ret) {
- if (inv_no_use_mode != -1 && !_G(atds)->getControlBit(txtNr, ATS_ACTIVE_BIT, ATS_DATA)) {
+ if (inv_no_use_mode != -1 && !_G(atds)->getControlBit(txtNr, ATS_ACTIVE_BIT)) {
actionFl = calc_inv_no_use(idx + (_G(gameState)._personRoomNr[P_CHEWY] * 100), inv_no_use_mode);
if (actionFl)
ret = txtNr;
@@ -1400,7 +1400,7 @@ int16 calcMouseText(int16 x, int16 y, int16 mode) {
}
if (ok && !action_ret && txtMode == TXT_MARK_USE && dispFl) {
- if (!_G(atds)->getControlBit(txtNr, ATS_ACTIVE_BIT, ATS_DATA)) {
+ if (!_G(atds)->getControlBit(txtNr, ATS_ACTIVE_BIT)) {
if (_G(menu_item) != CUR_WALK) {
if (x + _G(gameState).scrollx > _G(spieler_vector)[P_CHEWY].Xypos[0])
setPersonSpr(P_RIGHT, P_CHEWY);
diff --git a/engines/chewy/r_event.cpp b/engines/chewy/r_event.cpp
index 4fa629ada12..d64b415c29a 100644
--- a/engines/chewy/r_event.cpp
+++ b/engines/chewy/r_event.cpp
@@ -457,7 +457,7 @@ void exit_room(int16 eib_nr) {
break;
case 11:
- _G(atds)->setControlBit(121, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(121, ATS_ACTIVE_BIT);
break;
case 13:
@@ -974,14 +974,14 @@ int16 sib_event_no_inv(int16 sib_nr) {
_G(gameState).R0Monocle = true;
_G(obj)->hide_sib(SIB_MONOCLE);
if (_G(gameState).R0Noteboook)
- _G(atds)->delControlBit(12, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(12, ATS_ACTIVE_BIT);
break;
case SIB_NOTEBOOK:
_G(gameState).R0Noteboook = true;
_G(obj)->hide_sib(SIB_NOTEBOOK);
if (_G(gameState).R0Monocle)
- _G(atds)->delControlBit(12, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(12, ATS_ACTIVE_BIT);
break;
case SIB_TERMINAL_R5:
@@ -1055,7 +1055,7 @@ int16 sib_event_no_inv(int16 sib_nr) {
_G(obj)->calc_rsi_flip_flop(SIB_RHAKEN_R7);
_G(atds)->set_ats_str(54, TXT_MARK_LOOK, 1, ATS_DATA);
_G(atds)->set_ats_str(55, TXT_MARK_LOOK, 1, ATS_DATA);
- _G(atds)->delControlBit(56, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(56, ATS_ACTIVE_BIT);
start_aad(9);
} else {
_G(obj)->set_rsi_flip_flop(SIB_LHAKEN_R7, 2);
@@ -1146,7 +1146,7 @@ int16 sib_event_no_inv(int16 sib_nr) {
break;
case SIB_SEIL_R21:
- _G(atds)->setControlBit(129, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(129, ATS_ACTIVE_BIT);
break;
case SIB_GITTER1_R21:
@@ -1154,7 +1154,7 @@ int16 sib_event_no_inv(int16 sib_nr) {
break;
case SIB_CART1_R18:
- _G(atds)->setControlBit(155, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(155, ATS_ACTIVE_BIT);
break;
case SIB_DOORKNOB_R18:
@@ -1241,7 +1241,7 @@ int16 sib_event_no_inv(int16 sib_nr) {
break;
case SIB_LAMPE_R52:
- _G(atds)->delControlBit(338, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(338, ATS_ACTIVE_BIT);
_G(gameState).R52LichtAn ^= 1;
check_shad(2 * (_G(gameState).R52LichtAn + 1), 1);
break;
diff --git a/engines/chewy/rooms/room00.cpp b/engines/chewy/rooms/room00.cpp
index a3d96a9c18c..861dbba05b7 100644
--- a/engines/chewy/rooms/room00.cpp
+++ b/engines/chewy/rooms/room00.cpp
@@ -130,7 +130,7 @@ bool Room0::getPillow() {
invent_2_slot(0);
_G(menu_item) = CUR_WALK;
cursorChoice(CUR_WALK);
- _G(atds)->setControlBit(174, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(174, ATS_ACTIVE_BIT);
_G(det)->hideStaticSpr(6);
_G(flags).AutoAniPlay = false;
@@ -156,7 +156,7 @@ bool Room0::pullSlime() {
invent_2_slot(1);
_G(menu_item) = CUR_WALK;
cursorChoice(CUR_WALK);
- _G(atds)->setControlBit(175, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(175, ATS_ACTIVE_BIT);
_G(flags).AutoAniPlay = false;
showCur();
diff --git a/engines/chewy/rooms/room01.cpp b/engines/chewy/rooms/room01.cpp
index e91340a6ef7..0b21a3ac48b 100644
--- a/engines/chewy/rooms/room01.cpp
+++ b/engines/chewy/rooms/room01.cpp
@@ -32,7 +32,7 @@ void Room1::gottenCard() {
_G(det)->hideStaticSpr(2);
startSetAILWait(4, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
- _G(atds)->delControlBit(7, ATS_COUNT_BIT, ATS_DATA);
+ _G(atds)->delControlBit(7, ATS_COUNT_BIT);
}
void Room1::gedAction(int index) {
diff --git a/engines/chewy/rooms/room02.cpp b/engines/chewy/rooms/room02.cpp
index 43febf086db..d98ce782881 100644
--- a/engines/chewy/rooms/room02.cpp
+++ b/engines/chewy/rooms/room02.cpp
@@ -64,11 +64,11 @@ void Room2::electrifyWalkway1() {
_G(gameState).R2ElectrocutedBork = true;
delInventory(_G(gameState).AkInvent);
- _G(atds)->delControlBit(11, ATS_COUNT_BIT, ATS_DATA);
- _G(atds)->delControlBit(11, ATS_ACTION_BIT, ATS_DATA);
- _G(atds)->delControlBit(19, ATS_COUNT_BIT, ATS_DATA);
- _G(atds)->delControlBit(25, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->setControlBit(8, ATS_COUNT_BIT, ATS_DATA);
+ _G(atds)->delControlBit(11, ATS_COUNT_BIT);
+ _G(atds)->delControlBit(11, ATS_ACTION_BIT);
+ _G(atds)->delControlBit(19, ATS_COUNT_BIT);
+ _G(atds)->delControlBit(25, ATS_ACTIVE_BIT);
+ _G(atds)->setControlBit(8, ATS_COUNT_BIT);
_G(atds)->set_ats_str(11, 1, ATS_DATA);
}
diff --git a/engines/chewy/rooms/room06.cpp b/engines/chewy/rooms/room06.cpp
index 57cda6f7ead..ae94c6553bc 100644
--- a/engines/chewy/rooms/room06.cpp
+++ b/engines/chewy/rooms/room06.cpp
@@ -60,7 +60,7 @@ void Room6::entry() {
if (_G(gameState).R6BolaSchild && _G(gameState).R6RaumBetreten < 2) {
_G(det)->startDetail(7, 255, ANI_FRONT);
- _G(atds)->delControlBit(44, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(44, ATS_ACTIVE_BIT);
if (!_G(flags).LoadGame)
++_G(gameState).R6RaumBetreten;
@@ -72,7 +72,7 @@ void Room6::entry() {
_G(gameState).R6BolaOk = true;
_G(obj)->show_sib(SIB_BOLA_BUTTON_R6);
_G(obj)->hide_sib(SIB_BOLA_R6);
- _G(atds)->setControlBit(44, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(44, ATS_ACTIVE_BIT);
showCur();
}
}
@@ -102,7 +102,7 @@ void Room6::bola_button() {
_G(obj)->calc_rsi_flip_flop(SIB_BOLA_FLECK_R6);
waitDetail(2);
_G(obj)->calc_rsi_flip_flop(SIB_BOLA_SCHACHT);
- _G(atds)->delControlBit(42, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(42, ATS_ACTIVE_BIT);
_G(atds)->set_ats_str(41, TXT_MARK_LOOK, 1, ATS_DATA);
_G(obj)->calc_rsi_flip_flop(SIB_BOLA_BUTTON_R6);
_G(obj)->hide_sib(SIB_BOLA_BUTTON_R6);
diff --git a/engines/chewy/rooms/room07.cpp b/engines/chewy/rooms/room07.cpp
index e756c0cddbd..a14106c1ad6 100644
--- a/engines/chewy/rooms/room07.cpp
+++ b/engines/chewy/rooms/room07.cpp
@@ -60,7 +60,7 @@ void Room7::hook(int16 sibNr) {
_G(obj)->calc_rsi_flip_flop(SIB_LHAKEN_R7);
_G(obj)->calc_rsi_flip_flop(SIB_RHAKEN_R7);
}
- _G(atds)->delControlBit(56, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(56, ATS_ACTIVE_BIT);
_G(atds)->set_ats_str(55, TXT_MARK_LOOK, 1, ATS_DATA);
diaNr = 9;
} else {
diff --git a/engines/chewy/rooms/room08.cpp b/engines/chewy/rooms/room08.cpp
index 2bb388b744c..98cf81f6fe8 100644
--- a/engines/chewy/rooms/room08.cpp
+++ b/engines/chewy/rooms/room08.cpp
@@ -160,7 +160,7 @@ void Room8::open_gdoor() {
_G(det)->hideStaticSpr(17);
_G(gameState)._personHide[P_CHEWY] = false;
setPersonPos(204, 274, P_CHEWY, P_LEFT);
- _G(atds)->delControlBit(69, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(69, ATS_ACTIVE_BIT);
_G(obj)->hide_sib(31);
_G(gameState).R8GTuer = true;
_G(gameState).room_e_obj[15].Attribut = EXIT_BOTTOM;
diff --git a/engines/chewy/rooms/room09.cpp b/engines/chewy/rooms/room09.cpp
index 9f024aa454d..978ceeed9d1 100644
--- a/engines/chewy/rooms/room09.cpp
+++ b/engines/chewy/rooms/room09.cpp
@@ -64,9 +64,9 @@ void Room9::gtuer() {
_G(det)->showStaticSpr(5);
startSetAILWait(6, 1, ANI_FRONT);
setPersonPos(74, 93, P_CHEWY, P_LEFT);
- _G(atds)->delControlBit(74, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->delControlBit(75, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->delControlBit(76, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(74, ATS_ACTIVE_BIT);
+ _G(atds)->delControlBit(75, ATS_ACTIVE_BIT);
+ _G(atds)->delControlBit(76, ATS_ACTIVE_BIT);
_G(obj)->show_sib(34);
_G(atds)->set_ats_str(73, 1, ATS_DATA);
}
@@ -76,7 +76,7 @@ void Room9::surimy() {
_G(gameState).R9Surimy = true;
const int16 tmp = _G(spieler_vector)[P_CHEWY].Count;
stopPerson(P_CHEWY);
- _G(atds)->setControlBit(75, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(75, ATS_ACTIVE_BIT);
_G(det)->hideStaticSpr(4);
_G(room)->set_timer_status(7, TIMER_STOP);
surimy_ani();
diff --git a/engines/chewy/rooms/room11.cpp b/engines/chewy/rooms/room11.cpp
index 54af8b027c6..1720f9e0302 100644
--- a/engines/chewy/rooms/room11.cpp
+++ b/engines/chewy/rooms/room11.cpp
@@ -59,7 +59,7 @@ void Room11::entry() {
_G(obj)->hide_sib(SIB_TBUTTON3_R11);
_G(gameState).room_e_obj[20].Attribut = 255;
_G(gameState).room_e_obj[21].Attribut = 255;
- _G(atds)->delControlBit(121, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(121, ATS_ACTIVE_BIT);
if (!_G(flags).LoadGame) {
startAniBlock(2, ABLOCK17);
diff --git a/engines/chewy/rooms/room13.cpp b/engines/chewy/rooms/room13.cpp
index 37642ff708d..8f4b0782c85 100644
--- a/engines/chewy/rooms/room13.cpp
+++ b/engines/chewy/rooms/room13.cpp
@@ -75,7 +75,7 @@ void Room13::entry() {
if (!_G(flags).LoadGame && _G(gameState).R13Band) {
_G(gameState).room_e_obj[25].Attribut = EXIT_TOP;
- _G(atds)->setControlBit(100, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(100, ATS_ACTIVE_BIT);
_G(gameState).R13Band = false;
}
@@ -86,7 +86,7 @@ void Room13::entry() {
void Room13::xit() {
_G(gameState).room_e_obj[25].Attribut = EXIT_TOP;
- _G(atds)->setControlBit(100, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(100, ATS_ACTIVE_BIT);
_G(gameState).R13Band = false;
}
@@ -133,8 +133,8 @@ void Room13::talk_bork() {
_G(auto_obj) = 0;
_G(flags).NoScroll = false;
- _G(atds)->setControlBit(122, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->delControlBit(92, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(122, ATS_ACTIVE_BIT);
+ _G(atds)->delControlBit(92, ATS_ACTIVE_BIT);
_G(obj)->show_sib(SIB_BANDBUTTON_R13);
setPersonPos(153, 138, P_CHEWY, P_LEFT);
@@ -157,7 +157,7 @@ void Room13::jmp_band() {
if (!_G(gameState).R13Bandlauf) {
_G(obj)->hide_sib(SIB_BANDBUTTON_R13);
_G(gameState).room_e_obj[25].Attribut = 255;
- _G(atds)->delControlBit(100, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(100, ATS_ACTIVE_BIT);
_G(gameState).R13Band = true;
autoMove(3, P_CHEWY);
_G(gameState)._personHide[P_CHEWY] = true;
@@ -201,7 +201,7 @@ void Room13::jmp_floor() {
_G(obj)->show_sib(SIB_BANDBUTTON_R13);
_G(gameState).room_e_obj[25].Attribut = EXIT_TOP;
- _G(atds)->setControlBit(100, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(100, ATS_ACTIVE_BIT);
_G(gameState).R13Band = false;
autoMove(5, P_CHEWY);
_G(gameState)._personHide[P_CHEWY] = true;
diff --git a/engines/chewy/rooms/room16.cpp b/engines/chewy/rooms/room16.cpp
index 2cae87ed214..46791fe2833 100644
--- a/engines/chewy/rooms/room16.cpp
+++ b/engines/chewy/rooms/room16.cpp
@@ -35,11 +35,11 @@ void Room16::entry() {
if (!_G(gameState).R16F5Exit) {
_G(det)->showStaticSpr(4);
_G(gameState).room_e_obj[32].Attribut = 255;
- _G(atds)->delControlBit(124, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(124, ATS_ACTIVE_BIT);
} else {
_G(det)->hideStaticSpr(4);
_G(gameState).room_e_obj[32].Attribut = EXIT_LEFT;
- _G(atds)->setControlBit(124, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(124, ATS_ACTIVE_BIT);
}
}
diff --git a/engines/chewy/rooms/room17.cpp b/engines/chewy/rooms/room17.cpp
index 87a650cf6f7..4ebb941fb31 100644
--- a/engines/chewy/rooms/room17.cpp
+++ b/engines/chewy/rooms/room17.cpp
@@ -147,7 +147,7 @@ int16 Room17::use_seil() {
_G(gameState)._personHide[P_CHEWY] = true;
startSetAILWait(10, 1, ANI_FRONT);
_G(gameState).R17Seil = true;
- _G(atds)->delControlBit(139, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(139, ATS_ACTIVE_BIT);
plot_seil();
_G(gameState)._personHide[P_CHEWY] = false;
_G(flags).AutoAniPlay = false;
diff --git a/engines/chewy/rooms/room18.cpp b/engines/chewy/rooms/room18.cpp
index 944226c3648..4ac1d7f88d6 100644
--- a/engines/chewy/rooms/room18.cpp
+++ b/engines/chewy/rooms/room18.cpp
@@ -315,9 +315,9 @@ int16 Room18::calc_surimy() {
_G(atds)->set_ats_str(149, TXT_MARK_LOOK, 1, ATS_DATA);
for (int16 i = 0; i < 3; i++)
- _G(atds)->delControlBit(158 + i, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(158 + i, ATS_ACTIVE_BIT);
- _G(atds)->delControlBit(179, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(179, ATS_ACTIVE_BIT);
showCur();
_G(det)->del_taf_tbl(245, 50, nullptr);
}
diff --git a/engines/chewy/rooms/room21.cpp b/engines/chewy/rooms/room21.cpp
index 4a92f20d022..4a380f02101 100644
--- a/engines/chewy/rooms/room21.cpp
+++ b/engines/chewy/rooms/room21.cpp
@@ -86,31 +86,31 @@ void Room21::calc_laser() {
if (_G(gameState).R21Hebel1 && !_G(gameState).R21Hebel2 && _G(gameState).R21Hebel3) {
_G(gameState).R21Laser1Weg = true;
_G(det)->stop_detail(3);
- _G(atds)->setControlBit(134, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->delControlBit(133, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(134, ATS_ACTIVE_BIT);
+ _G(atds)->delControlBit(133, ATS_ACTIVE_BIT);
} else {
_G(gameState).R21Laser1Weg = false;
_G(det)->startDetail(3, 255, ANI_FRONT);
- _G(atds)->delControlBit(134, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->setControlBit(133, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(134, ATS_ACTIVE_BIT);
+ _G(atds)->setControlBit(133, ATS_ACTIVE_BIT);
}
if (!_G(gameState).R21Hebel1 && _G(gameState).R21Hebel2 && !_G(gameState).R21Hebel3) {
if (!_G(obj)->checkInventory(SEIL_INV) && !_G(gameState).R17Seil) {
_G(obj)->show_sib(SIB_SEIL_R21);
- _G(atds)->delControlBit(129, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(129, ATS_ACTIVE_BIT);
}
_G(gameState).R21Laser2Weg = true;
_G(det)->stop_detail(4);
- _G(atds)->setControlBit(135, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(135, ATS_ACTIVE_BIT);
} else {
_G(obj)->hide_sib(SIB_SEIL_R21);
- _G(atds)->setControlBit(129, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(129, ATS_ACTIVE_BIT);
_G(gameState).R21Laser2Weg = false;
_G(det)->startDetail(4, 255, ANI_FRONT);
- _G(atds)->delControlBit(135, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(135, ATS_ACTIVE_BIT);
}
}
diff --git a/engines/chewy/rooms/room22.cpp b/engines/chewy/rooms/room22.cpp
index 59e3064e1ce..eda0676c639 100644
--- a/engines/chewy/rooms/room22.cpp
+++ b/engines/chewy/rooms/room22.cpp
@@ -121,7 +121,7 @@ void Room22::bork(int16 t_nr) {
bork_walk1();
} else {
if (!_G(gameState).R22ChewyPlatt) {
- _G(atds)->setControlBit(79, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(79, ATS_ACTIVE_BIT);
_G(gameState).R22ChewyPlatt = true;
}
@@ -154,9 +154,9 @@ void Room22::bork_walk2() {
flic_cut(FCUT_008);
register_cutscene(3);
_G(det)->showStaticSpr(4);
- _G(atds)->delControlBit(81, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(81, ATS_ACTIVE_BIT);
_G(gameState).R22BorkPlatt = true;
- _G(atds)->setControlBit(79, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(79, ATS_ACTIVE_BIT);
}
void Room22::get_bork() {
@@ -169,7 +169,7 @@ void Room22::get_bork() {
startAadWait(11);
_G(det)->stop_detail(3);
_G(gameState)._personHide[P_CHEWY] = false;
- _G(atds)->setControlBit(81, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(81, ATS_ACTIVE_BIT);
invent_2_slot(BORK_INV);
_G(gameState).R22GetBork = true;
@@ -196,7 +196,7 @@ int16 Room22::malen() {
if (!_G(gameState).R22ChewyPlatt) {
_G(gameState).R22ChewyPlatt = true;
- _G(atds)->setControlBit(79, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(79, ATS_ACTIVE_BIT);
}
}
diff --git a/engines/chewy/rooms/room23.cpp b/engines/chewy/rooms/room23.cpp
index 86c1e60575d..d53e873a368 100644
--- a/engines/chewy/rooms/room23.cpp
+++ b/engines/chewy/rooms/room23.cpp
@@ -132,7 +132,7 @@ void Room23::use_cartridge() {
_G(gameState).R23Cartridge = true;
if (_G(gameState).R18CartSave) {
- _G(atds)->delControlBit(171, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(171, ATS_ACTIVE_BIT);
_G(atds)->set_ats_str(111, 2, ATS_DATA);
startSetAILWait(4, 1, ANI_FRONT);
_G(det)->showStaticSpr(3);
@@ -145,7 +145,7 @@ void Room23::use_cartridge() {
void Room23::get_cartridge() {
_G(atds)->set_ats_str(111, 0, ATS_DATA);
- _G(atds)->setControlBit(171, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(171, ATS_ACTIVE_BIT);
_G(gameState).R23Cartridge = false;
_G(det)->hideStaticSpr(3);
diff --git a/engines/chewy/rooms/room27.cpp b/engines/chewy/rooms/room27.cpp
index 3b34049d081..b27d65ecff8 100644
--- a/engines/chewy/rooms/room27.cpp
+++ b/engines/chewy/rooms/room27.cpp
@@ -32,9 +32,9 @@ void Room27::entry() {
if (_G(gameState)._personRoomNr[P_HOWARD] == 27) {
_G(timer_nr)[0] = _G(room)->set_timer(0, 5);
_G(det)->set_static_ani(0, -1);
- _G(atds)->delControlBit(274, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(274, ATS_ACTIVE_BIT);
} else {
- _G(atds)->setControlBit(274, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(274, ATS_ACTIVE_BIT);
}
_G(gameState)._personHide[P_HOWARD] = true;
diff --git a/engines/chewy/rooms/room29.cpp b/engines/chewy/rooms/room29.cpp
index 53301449559..edb7008e1d1 100644
--- a/engines/chewy/rooms/room29.cpp
+++ b/engines/chewy/rooms/room29.cpp
@@ -52,7 +52,7 @@ void Room29::entry() {
if (_G(gameState).R29AutoSitz) {
if (_G(gameState).ChewyAni == CHEWY_ROCKER)
- _G(atds)->setControlBit(212, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(212, ATS_ACTIVE_BIT);
else
_G(det)->showStaticSpr(9);
}
@@ -78,7 +78,7 @@ int16 Room29::use_pumpe() {
autoMove(1, P_CHEWY);
start_spz_wait(CH_LGET_O, 1, false, P_CHEWY);
_G(det)->showStaticSpr(7);
- _G(atds)->delControlBit(218, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(218, ATS_ACTIVE_BIT);
delInventory(SCHLAUCH_INV);
} else if (!_G(gameState).inv_cur) {
action_flag = true;
@@ -120,7 +120,7 @@ bool Room29::use_schlauch() {
startSetAILWait(4, 1, ANI_FRONT);
_G(det)->showStaticSpr(8);
_G(det)->showStaticSpr(10);
- _G(atds)->delControlBit(219, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(219, ATS_ACTIVE_BIT);
_G(atds)->set_ats_str(218, 1, ATS_DATA);
_G(gameState).R29Schlauch1 = false;
@@ -148,7 +148,7 @@ void Room29::schlitz_sitz() {
startAadWait(63);
_G(det)->stop_detail(2);
- _G(atds)->delControlBit(212, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(212, ATS_ACTIVE_BIT);
_G(gameState)._personHide[P_CHEWY] = false;
_G(mouseLeftClick) = false;
g_events->_kbInfo._scanCode = Common::KEYCODE_INVALID;
diff --git a/engines/chewy/rooms/room31.cpp b/engines/chewy/rooms/room31.cpp
index 22d0b0a584a..feaa899a9f1 100644
--- a/engines/chewy/rooms/room31.cpp
+++ b/engines/chewy/rooms/room31.cpp
@@ -78,7 +78,7 @@ void Room31::calc_luke() {
_G(det)->showStaticSpr(5 + i);
_G(atds)->set_ats_str(244, 1, ATS_DATA);
- _G(atds)->delControlBit(245, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(245, ATS_ACTIVE_BIT);
_G(gameState).room_e_obj[75].Attribut = EXIT_BOTTOM;
} else {
@@ -86,7 +86,7 @@ void Room31::calc_luke() {
_G(det)->hideStaticSpr(5 + i);
_G(atds)->set_ats_str(244, 0, ATS_DATA);
- _G(atds)->setControlBit(245, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(245, ATS_ACTIVE_BIT);
_G(gameState).room_e_obj[75].Attribut = 255;
}
}
diff --git a/engines/chewy/rooms/room32.cpp b/engines/chewy/rooms/room32.cpp
index 6e12337983f..d9325a20145 100644
--- a/engines/chewy/rooms/room32.cpp
+++ b/engines/chewy/rooms/room32.cpp
@@ -47,7 +47,7 @@ int16 Room32::use_howard() {
remove_inventory(MUNTER_INV);
register_cutscene(11);
flic_cut(FCUT_043);
- _G(atds)->setControlBit(230, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(230, ATS_ACTIVE_BIT);
start_spz(CH_TALK12, 255, ANI_FRONT, P_CHEWY);
startAadWait(75);
waitShowScreen(5);
diff --git a/engines/chewy/rooms/room33.cpp b/engines/chewy/rooms/room33.cpp
index 447ff1c7beb..3a41ee311e6 100644
--- a/engines/chewy/rooms/room33.cpp
+++ b/engines/chewy/rooms/room33.cpp
@@ -167,7 +167,7 @@ void Room33::use_maschine() {
_G(gameState)._personHide[P_CHEWY] = false;
start_spz(CH_TALK3, 255, ANI_FRONT, P_CHEWY);
startAadWait(71);
- _G(atds)->delControlBit(225, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(225, ATS_ACTIVE_BIT);
}
if (hocker) {
@@ -205,7 +205,7 @@ int16 Room33::get_munter() {
autoMove(4, P_CHEWY);
start_spz_wait(CH_LGET_O, 1, false, P_CHEWY);
invent_2_slot(MUNTER_INV);
- _G(atds)->setControlBit(225, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(225, ATS_ACTIVE_BIT);
_G(det)->hideStaticSpr(3);
start_spz(CH_TALK3, 255, ANI_FRONT, P_CHEWY);
startAadWait(72);
diff --git a/engines/chewy/rooms/room35.cpp b/engines/chewy/rooms/room35.cpp
index 6e578b4d1e0..2fa3be379c9 100644
--- a/engines/chewy/rooms/room35.cpp
+++ b/engines/chewy/rooms/room35.cpp
@@ -99,7 +99,7 @@ int16 Room35::use_cat() {
_G(obj)->show_sib(SIB_KNOCHEN_R35);
_G(obj)->calc_rsi_flip_flop(SIB_KNOCHEN_R35);
_G(det)->showStaticSpr(7);
- _G(atds)->delControlBit(237, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(237, ATS_ACTIVE_BIT);
while (_G(det)->get_ani_status(2) && !SHOULD_QUIT) {
setupScreen(DO_SETUP);
diff --git a/engines/chewy/rooms/room37.cpp b/engines/chewy/rooms/room37.cpp
index 0cdb5461830..d2e98918181 100644
--- a/engines/chewy/rooms/room37.cpp
+++ b/engines/chewy/rooms/room37.cpp
@@ -150,7 +150,7 @@ int16 Room37::use_glas() {
_G(det)->hideStaticSpr(9);
_G(atds)->set_ats_str(250, 1, ATS_DATA);
_G(atds)->set_ats_str(256, 1, ATS_DATA);
- _G(atds)->delControlBit(251, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(251, ATS_ACTIVE_BIT);
_G(obj)->show_sib(SIB_HFUTTER2_R37);
_G(gameState).R37Gebiss = true;
start_spz(CH_TALK3, 255, ANI_FRONT, P_CHEWY);
@@ -292,9 +292,9 @@ void Room37::use_hahn() {
_G(gameState).scrollx = 320;
_G(flags).NoScroll = false;
- _G(atds)->setControlBit(251, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->setControlBit(250, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->setControlBit(256, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(251, ATS_ACTIVE_BIT);
+ _G(atds)->setControlBit(250, ATS_ACTIVE_BIT);
+ _G(atds)->setControlBit(256, ATS_ACTIVE_BIT);
_G(det)->hideStaticSpr(8);
start_spz(CH_TALK5, 255, ANI_FRONT, P_CHEWY);
startAadWait(141);
diff --git a/engines/chewy/rooms/room39.cpp b/engines/chewy/rooms/room39.cpp
index 3519ef3e057..4d9f5af251b 100644
--- a/engines/chewy/rooms/room39.cpp
+++ b/engines/chewy/rooms/room39.cpp
@@ -59,10 +59,10 @@ void Room39::entry() {
else
_G(det)->set_static_ani(5, -1);
- _G(atds)->delControlBit(62, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(62, ATS_ACTIVE_BIT);
}
} else {
- _G(atds)->setControlBit(62, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(62, ATS_ACTIVE_BIT);
}
set_tv();
diff --git a/engines/chewy/rooms/room40.cpp b/engines/chewy/rooms/room40.cpp
index 4777f94cdec..dc3a9ad552c 100644
--- a/engines/chewy/rooms/room40.cpp
+++ b/engines/chewy/rooms/room40.cpp
@@ -55,7 +55,7 @@ void Room40::entry(int16 eib_nr) {
if (_G(gameState).R40PoliceWeg == false) {
_G(timer_nr)[0] = _G(room)->set_timer(255, 10);
- _G(atds)->delControlBit(275, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(275, ATS_ACTIVE_BIT);
} else {
_G(det)->hideStaticSpr(15);
}
@@ -246,7 +246,7 @@ void Room40::setup_func() {
_G(uhr)->resetTimer(_G(timer_nr)[0], 0);
_G(det)->hideStaticSpr(15);
_G(det)->startDetail(POLICE_LEFT, 1, ANI_FRONT);
- _G(atds)->setControlBit(275, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(275, ATS_ACTIVE_BIT);
}
switch (_G(gameState).R40PoliceAniStatus) {
@@ -271,7 +271,7 @@ void Room40::setup_func() {
_G(gameState).R40PoliceAniStatus = 255;
_G(room)->set_timer_status(255, TIMER_START);
_G(uhr)->resetTimer(_G(timer_nr)[0], 0);
- _G(atds)->delControlBit(275, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(275, ATS_ACTIVE_BIT);
}
break;
@@ -295,7 +295,7 @@ void Room40::setup_func() {
_G(flags).MouseLeft = false;
_G(flags).MainInput = true;
_G(gameState).R40HoUse = false;
- _G(atds)->setControlBit(276, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(276, ATS_ACTIVE_BIT);
} else {
_G(det)->startDetail(POLICE_RIGHT, 1, ANI_FRONT);
@@ -454,7 +454,7 @@ int16 Room40::use_haendler() {
_G(gameState).R40HaendlerOk = true;
_G(gameState).R40TeilKarte = true;
_G(gameState).R40DuengerMit = true;
- _G(atds)->setControlBit(283, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(283, ATS_ACTIVE_BIT);
autoMove(10, P_CHEWY);
autoMove(11, P_HOWARD);
startAadWait(208);
diff --git a/engines/chewy/rooms/room41.cpp b/engines/chewy/rooms/room41.cpp
index 0b486c9a6d2..099485924fb 100644
--- a/engines/chewy/rooms/room41.cpp
+++ b/engines/chewy/rooms/room41.cpp
@@ -54,13 +54,13 @@ void Room41::entry() {
}
if (_G(gameState).R41Einbruch) {
- _G(atds)->delControlBit(271, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(271, ATS_ACTIVE_BIT);
_G(det)->showStaticSpr(6);
_G(det)->showStaticSpr(7);
}
if (_G(gameState).ChewyAni == CHEWY_ROCKER) {
- _G(atds)->setControlBit(269, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(269, ATS_ACTIVE_BIT);
}
if (!_G(flags).LoadGame)
@@ -200,7 +200,7 @@ int16 Room41::use_lola() {
setPersonPos(127, 112, P_CHEWY, P_LEFT);
_G(det)->stop_detail(6);
- _G(atds)->delControlBit(267, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(267, ATS_ACTIVE_BIT);
_G(atds)->set_ats_str(267, 1, ATS_DATA);
_G(atds)->hide_item(11, 0, 3);
showCur();
diff --git a/engines/chewy/rooms/room48.cpp b/engines/chewy/rooms/room48.cpp
index 8568ee4d3b7..8fed2c52660 100644
--- a/engines/chewy/rooms/room48.cpp
+++ b/engines/chewy/rooms/room48.cpp
@@ -50,7 +50,7 @@ bool Room48::timer(int16 t_nr, int16 ani_nr) {
void Room48::calc_pic() {
for (int16 i = 0; i < 2; i++) {
- _G(atds)->setControlBit(312 + i, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(312 + i, ATS_ACTIVE_BIT);
_G(gameState).R48Auswahl[3 + i] = 0;
}
@@ -60,13 +60,13 @@ void Room48::calc_pic() {
if (_G(obj)->checkInventory(VCARD_INV)) {
_G(gameState).R48Auswahl[3] = 1;
- _G(atds)->delControlBit(312, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(312, ATS_ACTIVE_BIT);
_G(det)->showStaticSpr(4);
}
if (_G(obj)->checkInventory(KAPPE_INV)) {
_G(gameState).R48Auswahl[4] = 1;
- _G(atds)->delControlBit(313, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(313, ATS_ACTIVE_BIT);
_G(det)->showStaticSpr(4);
}
}
diff --git a/engines/chewy/rooms/room49.cpp b/engines/chewy/rooms/room49.cpp
index d87cebbcbf4..e0d7f2843c4 100644
--- a/engines/chewy/rooms/room49.cpp
+++ b/engines/chewy/rooms/room49.cpp
@@ -197,7 +197,7 @@ void Room49::use_boy_cigar() {
_G(obj)->addInventory(GUM_INV, &_G(room_blk));
inventory_2_cur(GUM_INV);
- _G(atds)->setControlBit(318, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(318, ATS_ACTIVE_BIT);
_G(SetUpScreenFunc) = setup_func;
_G(gameState).R49BoyWeg = true;
diff --git a/engines/chewy/rooms/room52.cpp b/engines/chewy/rooms/room52.cpp
index 017ba680a22..047364ae971 100644
--- a/engines/chewy/rooms/room52.cpp
+++ b/engines/chewy/rooms/room52.cpp
@@ -108,7 +108,7 @@ int16 Room52::use_hot_dog() {
startSetAILWait(7, 1, ANI_BACK);
g_engine->_sound->stopSound(0);
_G(gameState)._personHide[P_CHEWY] = false;
- _G(atds)->setControlBit(341, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(341, ATS_ACTIVE_BIT);
startAadWait(303);
_G(atds)->set_ats_str(KILLER_INV, 1, INV_ATS_DATA);
_G(gameState).R52KakerWeg = true;
diff --git a/engines/chewy/rooms/room53.cpp b/engines/chewy/rooms/room53.cpp
index b870500af3d..903a533c87c 100644
--- a/engines/chewy/rooms/room53.cpp
+++ b/engines/chewy/rooms/room53.cpp
@@ -43,7 +43,7 @@ static const AniBlock ABLOCK35[7] = {
void Room53::entry() {
hideCur();
_G(obj)->hide_sib(SIB_VISIT_R53);
- _G(atds)->delControlBit(319, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(319, ATS_ACTIVE_BIT);
startSetAILWait(0, 1, ANI_FRONT);
_G(det)->set_static_ani(1, -1);
_G(timer_nr)[0] = _G(room)->set_timer(1, 7);
@@ -54,7 +54,7 @@ void Room53::man_go() {
_G(room)->set_timer_status(1, TIMER_STOP);
_G(det)->del_static_ani(1);
startSetAILWait(5, 1, ANI_FRONT);
- _G(atds)->setControlBit(319, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(319, ATS_ACTIVE_BIT);
if (!_G(gameState).R53Visit)
_G(obj)->show_sib(SIB_VISIT_R53);
}
@@ -88,7 +88,7 @@ int16 Room53::use_man() {
startAniBlock(7, ABLOCK35);
_G(obj)->addInventory(JMKOST_INV, &_G(room_blk));
inventory_2_cur(JMKOST_INV);
- _G(atds)->setControlBit(319, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(319, ATS_ACTIVE_BIT);
showCur();
}
diff --git a/engines/chewy/rooms/room54.cpp b/engines/chewy/rooms/room54.cpp
index 69ceebea235..3e59d736bac 100644
--- a/engines/chewy/rooms/room54.cpp
+++ b/engines/chewy/rooms/room54.cpp
@@ -165,7 +165,7 @@ int16 Room54::use_schalter() {
startSetAILWait(4, 1, ANI_FRONT);
aad_nr = 296;
_G(gameState).R54FputzerWeg = true;
- _G(atds)->delControlBit(345, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(345, ATS_ACTIVE_BIT);
_G(atds)->set_ats_str(349, 1, ATS_DATA);
_G(atds)->set_ats_str(351, 1, ATS_DATA);
}
diff --git a/engines/chewy/rooms/room55.cpp b/engines/chewy/rooms/room55.cpp
index f9b9d4ce4b2..a6e75fd6282 100644
--- a/engines/chewy/rooms/room55.cpp
+++ b/engines/chewy/rooms/room55.cpp
@@ -78,7 +78,7 @@ void Room55::entry() {
startSetAILWait(3, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
_G(zoom_horizont) = 1;
- _G(atds)->delControlBit(340, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(340, ATS_ACTIVE_BIT);
} else {
_G(gameState).scrollx = 0;
@@ -289,9 +289,9 @@ void Room55::get_job() {
int16 r_nr;
if (_G(gameState).R55Job) {
r_nr = 55;
- _G(atds)->delControlBit(357, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->delControlBit(354, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->delControlBit(355, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(357, ATS_ACTIVE_BIT);
+ _G(atds)->delControlBit(354, ATS_ACTIVE_BIT);
+ _G(atds)->delControlBit(355, ATS_ACTIVE_BIT);
} else {
r_nr = 54;
mans2rock();
@@ -346,7 +346,7 @@ void Room55::strasse(int16 mode) {
_G(room)->set_timer_status(4, TIMER_STOP);
_G(det)->del_static_ani(4);
_G(det)->stop_detail(4);
- _G(atds)->setControlBit(340, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(340, ATS_ACTIVE_BIT);
startSetAILWait(3, 1, ANI_BACK);
_G(gameState).scrollx = 0;
@@ -377,10 +377,10 @@ int16 Room55::use_kammeraus() {
_G(det)->hideStaticSpr(10);
_G(gameState).R55ExitDia = 322;
_G(gameState).R55SekWeg = true;
- _G(atds)->setControlBit(352, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(352, ATS_ACTIVE_BIT);
delInventory(_G(gameState).AkInvent);
- _G(atds)->setControlBit(345, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->setControlBit(346, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(345, ATS_ACTIVE_BIT);
+ _G(atds)->setControlBit(346, ATS_ACTIVE_BIT);
strasse(1);
showCur();
}
diff --git a/engines/chewy/rooms/room56.cpp b/engines/chewy/rooms/room56.cpp
index b95edd24d6b..a8e795ef320 100644
--- a/engines/chewy/rooms/room56.cpp
+++ b/engines/chewy/rooms/room56.cpp
@@ -116,9 +116,9 @@ void Room56::entry() {
_G(gameState).flags34_8 = true;
mode = 2;
} else if (_G(gameState).flags34_40) {
- _G(atds)->delControlBit(362, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->setControlBit(367, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->setControlBit(366, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(362, ATS_ACTIVE_BIT);
+ _G(atds)->setControlBit(367, ATS_ACTIVE_BIT);
+ _G(atds)->setControlBit(366, ATS_ACTIVE_BIT);
_G(gameState).room_e_obj[137].Attribut = 3;
if (_G(gameState).flags33_80) {
_G(out)->setPointer(nullptr);
@@ -286,7 +286,7 @@ int16 Room56::use_man() {
int16 Room56::use_kneipe() {
int16 action_ret = false;
if (!_G(gameState).flags32_10) {
- if (_G(menu_item) == CUR_WALK && !_G(gameState).inv_cur && _G(atds)->getControlBit(362, ATS_ACTIVE_BIT, ATS_DATA) == 0) {
+ if (_G(menu_item) == CUR_WALK && !_G(gameState).inv_cur && _G(atds)->getControlBit(362, ATS_ACTIVE_BIT) == 0) {
action_ret = true;
hideCur();
if (_G(gameState).R56Kneipe) {
@@ -432,7 +432,7 @@ void Room56::setup_func() {
if (_G(gameState).flags32_10)
return;
- if (!_G(atds)->getControlBit(362, ATS_ACTIVE_BIT, ATS_DATA) && _G(menu_item) == CUR_WALK) {
+ if (!_G(atds)->getControlBit(362, ATS_ACTIVE_BIT) && _G(menu_item) == CUR_WALK) {
if (g_events->_mousePos.x + _G(gameState).scrollx >= 157 && g_events->_mousePos.x + _G(gameState).scrollx <= 204 && g_events->_mousePos.y >= 28 && g_events->_mousePos.y <= 89)
cursorChoice(CUR_EXIT_TOP);
else
diff --git a/engines/chewy/rooms/room57.cpp b/engines/chewy/rooms/room57.cpp
index e941f5e9280..fe43c78f4f4 100644
--- a/engines/chewy/rooms/room57.cpp
+++ b/engines/chewy/rooms/room57.cpp
@@ -140,7 +140,7 @@ int16 Room57::use_pfoertner() {
_G(det)->hideStaticSpr(4);
startSetAILWait(6, 1, ANI_WAIT);
g_engine->_sound->stopSound(0);
- _G(atds)->setControlBit(358, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(358, ATS_ACTIVE_BIT);
} else {
startAadWait(349);
goAutoXy(176, 130, P_HOWARD, ANI_WAIT);
diff --git a/engines/chewy/rooms/room63.cpp b/engines/chewy/rooms/room63.cpp
index 9a3ddd5765b..0c15e0a50af 100644
--- a/engines/chewy/rooms/room63.cpp
+++ b/engines/chewy/rooms/room63.cpp
@@ -53,7 +53,7 @@ void Room63::entry() {
_G(det)->showStaticSpr(10);
_G(det)->showStaticSpr(12);
} else if (_G(gameState).R62LauraVerwandlung) {
- _G(atds)->setControlBit(383, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(383, ATS_ACTIVE_BIT);
_G(SetUpScreenFunc) = setup_func;
cur_2_inventory();
_G(gameState).scrollx = 176;
@@ -209,7 +209,7 @@ int16 Room63::use_fx_man() {
_G(det)->stop_detail(7);
startSetAILWait(8, 1, ANI_FRONT);
_G(gameState).R63FxMannWeg = true;
- _G(atds)->setControlBit(384, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(384, ATS_ACTIVE_BIT);
showCur();
}
return action_ret;
@@ -283,7 +283,7 @@ int16 Room63::use_girl() {
_G(det)->showStaticSpr(12);
_G(atds)->set_ats_str(381, 1, ATS_DATA);
_G(atds)->set_ats_str(382, 1, ATS_DATA);
- _G(atds)->setControlBit(380, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(380, ATS_ACTIVE_BIT);
startAadWait(367);
showCur();
}
@@ -311,8 +311,8 @@ int16 Room63::use_aschenbecher() {
_G(det)->hideStaticSpr(12);
startAadWait(368);
flic_cut(FCUT_080);
- _G(atds)->setControlBit(381, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->setControlBit(382, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(381, ATS_ACTIVE_BIT);
+ _G(atds)->setControlBit(382, ATS_ACTIVE_BIT);
_G(atds)->set_ats_str(383, 1, ATS_DATA);
_G(gameState).R63Feuer = true;
_G(gameState)._personHide[P_CHEWY] = false;
diff --git a/engines/chewy/rooms/room64.cpp b/engines/chewy/rooms/room64.cpp
index 5bbc15c9c22..63bdf0c440e 100644
--- a/engines/chewy/rooms/room64.cpp
+++ b/engines/chewy/rooms/room64.cpp
@@ -45,7 +45,7 @@ void Room64::entry() {
_G(gameState).R64ManWeg = true;
_G(det)->del_static_ani(1);
_G(room)->set_timer_status(1, TIMER_STOP);
- _G(atds)->setControlBit(376, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(376, ATS_ACTIVE_BIT);
_G(gameState).R64Moni1Ani = 5;
calc_monitor();
hideCur();
@@ -147,11 +147,11 @@ int16 Room64::use_tasche() {
hideCur();
if (!_G(gameState).inv_cur) {
if (_G(gameState).R64ManWeg) {
- if (!_G(atds)->getControlBit(375, ATS_ACTIVE_BIT, ATS_DATA)) {
+ if (!_G(atds)->getControlBit(375, ATS_ACTIVE_BIT)) {
autoMove(3, P_CHEWY);
start_spz_wait(CH_ROCK_GET1, 1, false, P_CHEWY);
new_invent_2_cur(GERAET_INV);
- _G(atds)->setControlBit(375, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(375, ATS_ACTIVE_BIT);
startAadWait(353);
} else {
showCur();
diff --git a/engines/chewy/rooms/room66.cpp b/engines/chewy/rooms/room66.cpp
index 0ca9036abbc..77b89636c06 100644
--- a/engines/chewy/rooms/room66.cpp
+++ b/engines/chewy/rooms/room66.cpp
@@ -88,8 +88,8 @@ void Room66::entry(int16 eib_nr) {
void Room66::xit(int16 eib_nr) {
_G(gameState).ScrollxStep = 1;
- _G(atds)->setControlBit(415, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->setControlBit(417, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(415, ATS_ACTIVE_BIT);
+ _G(atds)->setControlBit(417, ATS_ACTIVE_BIT);
if (_G(gameState)._personRoomNr[P_HOWARD] != 66)
return;
diff --git a/engines/chewy/rooms/room67.cpp b/engines/chewy/rooms/room67.cpp
index e9b85d8555a..da6d8e01cf1 100644
--- a/engines/chewy/rooms/room67.cpp
+++ b/engines/chewy/rooms/room67.cpp
@@ -168,7 +168,7 @@ int16 Room67::talk_papagei() {
_G(det)->showStaticSpr(0);
invent_2_slot(PAPAGEI_INV);
showCur();
- _G(atds)->setControlBit(394, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(394, ATS_ACTIVE_BIT);
}
showCur();
}
diff --git a/engines/chewy/rooms/room68.cpp b/engines/chewy/rooms/room68.cpp
index f7f54d761ea..0088a52f78d 100644
--- a/engines/chewy/rooms/room68.cpp
+++ b/engines/chewy/rooms/room68.cpp
@@ -251,7 +251,7 @@ int16 Room68::use_papagei() {
start_spz_wait(CH_LGET_O, 1, false, P_CHEWY);
_G(det)->showStaticSpr(12);
_G(det)->startDetail(21, 255, ANI_FRONT);
- _G(atds)->delControlBit(408, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(408, ATS_ACTIVE_BIT);
_G(atds)->set_ats_str(407, 1, ATS_DATA);
showCur();
}
@@ -324,8 +324,8 @@ int16 Room68::use_diva() {
register_cutscene(22);
_G(det)->del_static_ani(18);
startSetAILWait(7, 1, ANI_FRONT);
- _G(atds)->setControlBit(407, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->setControlBit(412, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(407, ATS_ACTIVE_BIT);
+ _G(atds)->setControlBit(412, ATS_ACTIVE_BIT);
setPersonSpr(P_RIGHT, P_CHEWY);
startAadWait(402);
} else
diff --git a/engines/chewy/rooms/room71.cpp b/engines/chewy/rooms/room71.cpp
index 1d8026764a1..37f8a0ec39e 100644
--- a/engines/chewy/rooms/room71.cpp
+++ b/engines/chewy/rooms/room71.cpp
@@ -213,8 +213,8 @@ void Room71::proc2() {
_G(det)->startDetail(2, 255, false);
_G(det)->stop_detail(5);
_G(det)->showStaticSpr(8);
- _G(atds)->setControlBit(442, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->setControlBit(446, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(442, ATS_ACTIVE_BIT);
+ _G(atds)->setControlBit(446, ATS_ACTIVE_BIT);
_G(gameState)._personHide[P_HOWARD] = false;
_G(gameState)._personHide[P_NICHELLE] = false;
_G(gameState)._personHide[P_CHEWY] = false;
@@ -274,7 +274,7 @@ int Room71::proc6() {
_G(gameState).flags28_4 = true;
_G(room)->set_timer_status(0, TIMER_STOP);
_G(det)->del_static_ani(0);
- _G(atds)->setControlBit(443, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(443, ATS_ACTIVE_BIT);
autoMove(3, P_CHEWY);
_G(spieler_mi)[P_CHEWY].Mode = false;
diff --git a/engines/chewy/rooms/room72.cpp b/engines/chewy/rooms/room72.cpp
index 4da3eaab49f..e933e8f17be 100644
--- a/engines/chewy/rooms/room72.cpp
+++ b/engines/chewy/rooms/room72.cpp
@@ -85,7 +85,7 @@ void Room72::xit(int16 eib_nr) {
}
void Room72::proc1(int16 flicNr) {
- _G(atds)->setControlBit(389, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(389, ATS_ACTIVE_BIT);
_G(gameState).flags28_10 = true;
waitShowScreen(7);
startAadWait(437);
diff --git a/engines/chewy/rooms/room73.cpp b/engines/chewy/rooms/room73.cpp
index ad9e721723f..ee072c64f52 100644
--- a/engines/chewy/rooms/room73.cpp
+++ b/engines/chewy/rooms/room73.cpp
@@ -87,8 +87,8 @@ int Room73::proc1() {
_G(gameState).flags28_20 = true;
autoMove(3, P_CHEWY);
start_spz_wait(13, 1, false, P_CHEWY);
- _G(atds)->delControlBit(433, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->delControlBit(432, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(433, ATS_ACTIVE_BIT);
+ _G(atds)->delControlBit(432, ATS_ACTIVE_BIT);
_G(atds)->set_ats_str(430, 1, ATS_DATA);
_G(det)->showStaticSpr(3);
showCur();
@@ -106,7 +106,7 @@ int Room73::proc2() {
start_spz_wait(13, 1, false, P_CHEWY);
_G(det)->hideStaticSpr(3);
_G(det)->hideStaticSpr(4);
- _G(atds)->setControlBit(433, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(433, ATS_ACTIVE_BIT);
new_invent_2_cur(99);
showCur();
diff --git a/engines/chewy/rooms/room74.cpp b/engines/chewy/rooms/room74.cpp
index 0330e2c6ca9..291e880e333 100644
--- a/engines/chewy/rooms/room74.cpp
+++ b/engines/chewy/rooms/room74.cpp
@@ -104,7 +104,7 @@ int Room74::proc1() {
_G(atds)->set_ats_str(435, 1, ATS_DATA);
} else if (!_G(gameState).inv_cur && _G(gameState).R74CutRubberPlant) {
- _G(atds)->setControlBit(435, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(435, ATS_ACTIVE_BIT);
autoMove(5, P_CHEWY);
start_spz_wait(13, 1, false, P_CHEWY);
new_invent_2_cur(RUBBER_INV);
diff --git a/engines/chewy/rooms/room76.cpp b/engines/chewy/rooms/room76.cpp
index 253a7b2e024..d902699eb13 100644
--- a/engines/chewy/rooms/room76.cpp
+++ b/engines/chewy/rooms/room76.cpp
@@ -47,18 +47,18 @@ void Room76::entry() {
_G(gameState)._personHide[P_NICHELLE] = true;
if (!_G(gameState).flags29_4) {
- _G(atds)->delControlBit(453, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->delControlBit(457, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->delControlBit(458, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(453, ATS_ACTIVE_BIT);
+ _G(atds)->delControlBit(457, ATS_ACTIVE_BIT);
+ _G(atds)->delControlBit(458, ATS_ACTIVE_BIT);
} else {
_G(det)->del_static_ani(2);
for (int i = 0; i < 3; ++i)
_G(det)->hideStaticSpr(8 + i);
- _G(atds)->setControlBit(453, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->setControlBit(457, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->setControlBit(458, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(453, ATS_ACTIVE_BIT);
+ _G(atds)->setControlBit(457, ATS_ACTIVE_BIT);
+ _G(atds)->setControlBit(458, ATS_ACTIVE_BIT);
}
if (_G(flags).LoadGame)
diff --git a/engines/chewy/rooms/room77.cpp b/engines/chewy/rooms/room77.cpp
index 8ca86f27704..f4a675eb250 100644
--- a/engines/chewy/rooms/room77.cpp
+++ b/engines/chewy/rooms/room77.cpp
@@ -44,7 +44,7 @@ void Room77::entry() {
for (int i = 0; i < 3; ++i) {
_G(det)->showStaticSpr(2 + i);
- _G(atds)->delControlBit(460 + i, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(460 + i, ATS_ACTIVE_BIT);
}
}
diff --git a/engines/chewy/rooms/room80.cpp b/engines/chewy/rooms/room80.cpp
index b56cffae466..050051db060 100644
--- a/engines/chewy/rooms/room80.cpp
+++ b/engines/chewy/rooms/room80.cpp
@@ -40,9 +40,9 @@ void Room80::entry() {
g_engine->_sound->playSound(0, 2, false);
if (_G(gameState).gottenDiary) {
- _G(atds)->delControlBit(476, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(476, ATS_ACTIVE_BIT);
} else {
- _G(atds)->setControlBit(476, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(476, ATS_ACTIVE_BIT);
}
if (_G(gameState).flags32_1) {
diff --git a/engines/chewy/rooms/room81.cpp b/engines/chewy/rooms/room81.cpp
index 92c7b4f0da4..88adbde46fd 100644
--- a/engines/chewy/rooms/room81.cpp
+++ b/engines/chewy/rooms/room81.cpp
@@ -39,7 +39,7 @@ void Room81::entry() {
_G(gameState).DiaAMov = 0;
if (_G(gameState).r88DestRoom == 84) {
_G(det)->showStaticSpr(0);
- _G(atds)->delControlBit(488, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(488, ATS_ACTIVE_BIT);
}
proc3();
@@ -147,8 +147,8 @@ void Room81::proc3() {
_G(det)->startDetail(3 + i, 255, false);
_G(det)->stop_detail(2);
- _G(atds)->delControlBit(486, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->setControlBit(490, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(486, ATS_ACTIVE_BIT);
+ _G(atds)->setControlBit(490, ATS_ACTIVE_BIT);
}
} // namespace Rooms
diff --git a/engines/chewy/rooms/room82.cpp b/engines/chewy/rooms/room82.cpp
index b697fb5bc83..c5dd902a55a 100644
--- a/engines/chewy/rooms/room82.cpp
+++ b/engines/chewy/rooms/room82.cpp
@@ -40,8 +40,8 @@ void Room82::entry() {
if (_G(gameState).R88UsedMonkey) {
_G(det)->showStaticSpr(6);
- _G(atds)->setControlBit(473, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->setControlBit(467, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(473, ATS_ACTIVE_BIT);
+ _G(atds)->setControlBit(467, ATS_ACTIVE_BIT);
}
if (_G(gameState).flags37_20)
diff --git a/engines/chewy/rooms/room84.cpp b/engines/chewy/rooms/room84.cpp
index 176d85450d8..94e232019e4 100644
--- a/engines/chewy/rooms/room84.cpp
+++ b/engines/chewy/rooms/room84.cpp
@@ -46,27 +46,27 @@ void Room84::entry() {
_G(det)->del_static_ani(3);
_G(det)->stop_detail(0);
_G(gameState).room_e_obj[124].Attribut = EXIT_TOP;
- _G(atds)->setControlBit(478, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->setControlBit(479, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(478, ATS_ACTIVE_BIT);
+ _G(atds)->setControlBit(479, ATS_ACTIVE_BIT);
_G(atds)->set_ats_str(485, 1, ATS_DATA);
}
if (_G(gameState).flags32_10) {
_G(det)->startDetail(7, 255, false);
- _G(atds)->delControlBit(504, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(504, ATS_ACTIVE_BIT);
_G(gameState).room_e_obj[124].Attribut = 255;
_G(atds)->set_ats_str(485, 2, ATS_DATA);
}
if (_G(gameState).r88DestRoom == 84) {
_G(det)->showStaticSpr(7);
- _G(atds)->delControlBit(481, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->delControlBit(482, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(481, ATS_ACTIVE_BIT);
+ _G(atds)->delControlBit(482, ATS_ACTIVE_BIT);
}
if (_G(gameState).flags32_40) {
- _G(atds)->setControlBit(481, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->setControlBit(482, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(481, ATS_ACTIVE_BIT);
+ _G(atds)->setControlBit(482, ATS_ACTIVE_BIT);
_G(atds)->set_ats_str(485, 1, ATS_DATA);
_G(gameState).room_e_obj[124].Attribut = EXIT_TOP;
}
diff --git a/engines/chewy/rooms/room85.cpp b/engines/chewy/rooms/room85.cpp
index 034b2a52b5d..6875c77f78b 100644
--- a/engines/chewy/rooms/room85.cpp
+++ b/engines/chewy/rooms/room85.cpp
@@ -50,7 +50,7 @@ void Room85::entry(int16 eib_nr) {
if (_G(gameState).flags32_10) {
_G(det)->showStaticSpr(4);
- _G(atds)->delControlBit(495, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(495, ATS_ACTIVE_BIT);
}
if (_G(flags).LoadGame)
@@ -65,7 +65,7 @@ void Room85::entry(int16 eib_nr) {
_G(mouseLeftClick) = false;
_G(gameState).scrollx = 78;
if (_G(gameState).flags32_40) {
- _G(atds)->delControlBit(506, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(506, ATS_ACTIVE_BIT);
_G(det)->startDetail(1, 255, false);
setPersonPos(195, 146, P_CHEWY, P_RIGHT);
setPersonPos(186, 142, P_HOWARD, P_RIGHT);
diff --git a/engines/chewy/rooms/room86.cpp b/engines/chewy/rooms/room86.cpp
index cfc559d973c..96b99359a4c 100644
--- a/engines/chewy/rooms/room86.cpp
+++ b/engines/chewy/rooms/room86.cpp
@@ -155,7 +155,7 @@ int Room86::proc2() {
delInventory(_G(gameState).AkInvent);
autoMove(3, P_CHEWY);
proc3(true);
- _G(atds)->delControlBit(499, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(499, ATS_ACTIVE_BIT);
_G(atds)->set_ats_str(497, 1, ATS_DATA);
_G(atds)->set_ats_str(498, 1, ATS_DATA);
_G(gameState).flags32_2 = true;
diff --git a/engines/chewy/rooms/room87.cpp b/engines/chewy/rooms/room87.cpp
index ad152303351..f212d5ce580 100644
--- a/engines/chewy/rooms/room87.cpp
+++ b/engines/chewy/rooms/room87.cpp
@@ -137,7 +137,7 @@ int Room87::proc2(int16 txt_nr) {
_G(atds)->set_ats_str(txt_nr, 1, ATS_DATA);
_G(det)->showStaticSpr(movNr);
if (_G(gameState).flags32_4 && _G(gameState).flags32_8)
- _G(atds)->delControlBit(502, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(502, ATS_ACTIVE_BIT);
}
showCur();
return 1;
diff --git a/engines/chewy/rooms/room88.cpp b/engines/chewy/rooms/room88.cpp
index f7300615987..110ecd8759f 100644
--- a/engines/chewy/rooms/room88.cpp
+++ b/engines/chewy/rooms/room88.cpp
@@ -43,7 +43,7 @@ void Room88::entry() {
if (_G(gameState).flags32_10) {
_G(det)->startDetail(4, 255, false);
- _G(atds)->delControlBit(505, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(505, ATS_ACTIVE_BIT);
}
}
diff --git a/engines/chewy/rooms/room90.cpp b/engines/chewy/rooms/room90.cpp
index 7dd81fd458b..27632a17106 100644
--- a/engines/chewy/rooms/room90.cpp
+++ b/engines/chewy/rooms/room90.cpp
@@ -272,8 +272,8 @@ int Room90::getHubcaps() {
startAadWait(517);
_G(gameState).flags35_1 = false;
- _G(atds)->setControlBit(517, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->delControlBit(519, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(517, ATS_ACTIVE_BIT);
+ _G(atds)->delControlBit(519, ATS_ACTIVE_BIT);
showCur();
return 1;
@@ -307,8 +307,8 @@ int Room90::shootControlUnit() {
_G(HowardMov) = 0;
_G(gameState).flags33_40 = true;
_G(det)->stop_detail(12);
- _G(atds)->setControlBit(519, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->delControlBit(520, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(519, ATS_ACTIVE_BIT);
+ _G(atds)->delControlBit(520, ATS_ACTIVE_BIT);
_G(flags).ZoomMov = true;
showCur();
@@ -334,7 +334,7 @@ int Room90::useSurimyOnWreck() {
_G(gameState).scrollx = 176;
start_spz(45, 255, false, P_CHEWY);
startAadWait(519);
- _G(atds)->setControlBit(520, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(520, ATS_ACTIVE_BIT);
showCur();
return 1;
diff --git a/engines/chewy/rooms/room94.cpp b/engines/chewy/rooms/room94.cpp
index 7b78e20af99..4a2ca09554a 100644
--- a/engines/chewy/rooms/room94.cpp
+++ b/engines/chewy/rooms/room94.cpp
@@ -158,7 +158,7 @@ int Room94::giveGhostBottle() {
startSetAILWait(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, ATS_DATA);
+ _G(atds)->setControlBit(522, ATS_ACTIVE_BIT);
new_invent_2_cur(114);
showCur();
diff --git a/engines/chewy/rooms/room97.cpp b/engines/chewy/rooms/room97.cpp
index 1e7a4083c59..be99baea948 100644
--- a/engines/chewy/rooms/room97.cpp
+++ b/engines/chewy/rooms/room97.cpp
@@ -74,9 +74,9 @@ void Room97::entry() {
if (_G(gameState).flags36_40) {
_G(det)->startDetail(14, 255, ANI_FRONT);
_G(det)->showStaticSpr(13);
- _G(atds)->delControlBit(543, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(543, ATS_ACTIVE_BIT);
} else {
- _G(atds)->setControlBit(543, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(543, ATS_ACTIVE_BIT);
}
if (_G(gameState).flags36_20) {
@@ -434,10 +434,10 @@ int Room97::proc6() {
_G(det)->stop_detail(5);
_G(det)->showStaticSpr(15);
_G(gameState).flags36_2 = true;
- _G(atds)->delControlBit(538, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->setControlBit(531, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(538, ATS_ACTIVE_BIT);
+ _G(atds)->setControlBit(531, ATS_ACTIVE_BIT);
_G(atds)->set_ats_str(530, 1, ATS_DATA);
- _G(atds)->setControlBit(532, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(532, ATS_ACTIVE_BIT);
_G(spieler_mi)[P_CHEWY].Mode = false;
_G(gameState).flags36_8 = true;
@@ -455,7 +455,7 @@ int Room97::proc7() {
_G(gameState)._personHide[P_CHEWY] = true;
_G(det)->hideStaticSpr(17);
startSetAILWait(22, 1, ANI_FRONT);
- _G(atds)->setControlBit(538, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(538, ATS_ACTIVE_BIT);
_G(atds)->set_ats_str(530, 2, ATS_DATA);
new_invent_2_cur(SLIME_INV);
_G(gameState).flags36_4 = true;
@@ -487,7 +487,7 @@ int Room97::proc8() {
_G(gameState).flags36_8 = false;
_G(det)->startDetail(12, 255, false);
_G(atds)->set_ats_str(530, 3, ATS_DATA);
- _G(atds)->delControlBit(532, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(532, ATS_ACTIVE_BIT);
_G(atds)->set_ats_str(532, 1, ATS_DATA);
_G(det)->startDetail(6, 255, false);
_G(det)->hideStaticSpr(14);
@@ -513,8 +513,8 @@ int Room97::proc8() {
_G(det)->startDetail(28, 255, false);
_G(det)->setSetailPos(27, 272, 110);
_G(det)->startDetail(27, 255, false);
- _G(atds)->setControlBit(533, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->setControlBit(534, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(533, ATS_ACTIVE_BIT);
+ _G(atds)->setControlBit(534, ATS_ACTIVE_BIT);
}
if (diaNr != -1) {
@@ -544,10 +544,10 @@ int Room97::proc9() {
_G(det)->startDetail(14, 255, false);
startAadWait(555);
_G(gameState).flags36_40 = true;
- _G(atds)->setControlBit(539, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->delControlBit(537, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->delControlBit(535, ATS_ACTIVE_BIT, ATS_DATA);
- _G(atds)->delControlBit(543, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(539, ATS_ACTIVE_BIT);
+ _G(atds)->delControlBit(537, ATS_ACTIVE_BIT);
+ _G(atds)->delControlBit(535, ATS_ACTIVE_BIT);
+ _G(atds)->delControlBit(543, ATS_ACTIVE_BIT);
}
showCur();
@@ -566,7 +566,7 @@ int Room97::proc10() {
startSetAILWait(7, 1, ANI_FRONT);
_G(det)->showStaticSpr(19);
_G(gameState).flags37_1 = true;
- _G(atds)->setControlBit(543, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(543, ATS_ACTIVE_BIT);
_G(menu_item) = CUR_WALK;
cursorChoice(CUR_WALK);
@@ -678,7 +678,7 @@ void Room97::sensorAnim() {
_G(menu_item) = CUR_USE;
cursorChoice(CUR_USE);
setPersonPos(294, 42, P_CHEWY, P_LEFT);
- _G(atds)->delControlBit(541, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(541, ATS_ACTIVE_BIT);
_slimeThrown = false;
_G(det)->startDetail(16, 1, 0);
@@ -738,7 +738,7 @@ void Room97::sensorAnim() {
_G(gameState).flags37_2 = true;
}
- _G(atds)->setControlBit(541, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(541, ATS_ACTIVE_BIT);
showCur();
_G(flags).AutoAniPlay = false;
}
diff --git a/engines/chewy/t_event.cpp b/engines/chewy/t_event.cpp
index 3ff3d61bd9a..491c995ec61 100644
--- a/engines/chewy/t_event.cpp
+++ b/engines/chewy/t_event.cpp
@@ -65,7 +65,7 @@ void setSsiPos() {
int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
int16 retValue;
- if (!_G(atds)->getControlBit(txtNr, ATS_ACTIVE_BIT, ATS_DATA)) {
+ if (!_G(atds)->getControlBit(txtNr, ATS_ACTIVE_BIT)) {
retValue = true;
if (_G(flags).AtsAction == false) {
_G(flags).AtsAction = true;
@@ -285,7 +285,7 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
if (_G(gameState).R16F5Exit) {
invent_2_slot(29);
_G(det)->hideStaticSpr(19);
- _G(atds)->setControlBit(158, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->setControlBit(158, ATS_ACTIVE_BIT);
}
switchRoom(18);
break;
@@ -1178,7 +1178,7 @@ void selectDialogOption(int16 diaNr, int16 blkNr, int16 strEndNr) {
case 16:
if (blkNr == 0 && strEndNr == 2 && !_G(gameState).R56Kneipe)
- _G(atds)->delControlBit(362, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->delControlBit(362, ATS_ACTIVE_BIT);
break;
More information about the Scummvm-git-logs
mailing list