[Scummvm-git-logs] scummvm master -> 928961f6a7cfe9b8370274c6fb3bfdd6411e87a3
bluegr
noreply at scummvm.org
Sat Nov 9 20:01:00 UTC 2024
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
f1935c129c CHEWY: Fix cyber crown state before Surimy attack - bug #13695
56ce6dcaaa CHEWY: Variable renaming
8f4bf38cf6 CHEWY: Renaming
e1be7d2056 CHEWY: Renaming
928961f6a7 CHEWY: Fix changing hotspot subtexts - bug #13700
Commit: f1935c129c3f9ad0639e886b008ab35fcbb6300c
https://github.com/scummvm/scummvm/commit/f1935c129c3f9ad0639e886b008ab35fcbb6300c
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-09T22:00:18+02:00
Commit Message:
CHEWY: Fix cyber crown state before Surimy attack - bug #13695
Changed paths:
engines/chewy/rooms/room18.cpp
diff --git a/engines/chewy/rooms/room18.cpp b/engines/chewy/rooms/room18.cpp
index c85cc5d94a3..78b72f6ee9c 100644
--- a/engines/chewy/rooms/room18.cpp
+++ b/engines/chewy/rooms/room18.cpp
@@ -108,6 +108,11 @@ void Room18::entry() {
if (_G(gameState).R16F5Exit) {
// Hide cyber crown
_G(det)->hideStaticSpr(19);
+ }
+
+ if (!_G(gameState).R18SurimyThrown) {
+ // Hide cyber crown
+ _G(det)->hideStaticSpr(19);
_G(atds)->setControlBit(158, ATS_ACTIVE_BIT);
} else {
// Show cyber crown
Commit: 56ce6dcaaa8b3cb3d4a86aedcd409c3ecedd08be
https://github.com/scummvm/scummvm/commit/56ce6dcaaa8b3cb3d4a86aedcd409c3ecedd08be
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-09T22:00:18+02:00
Commit Message:
CHEWY: Variable renaming
No functional changes have been made
Changed paths:
engines/chewy/barriers.cpp
engines/chewy/r_event.cpp
engines/chewy/rooms/room07.cpp
engines/chewy/rooms/room09.cpp
engines/chewy/rooms/room13.cpp
engines/chewy/rooms/room17.cpp
engines/chewy/rooms/room17.h
engines/chewy/rooms/room21.cpp
engines/chewy/rooms/room21.h
engines/chewy/rooms/room24.cpp
engines/chewy/rooms/room24.h
engines/chewy/t_event.cpp
engines/chewy/types.cpp
engines/chewy/types.h
diff --git a/engines/chewy/barriers.cpp b/engines/chewy/barriers.cpp
index 064eaba8b26..b708ab08f9d 100644
--- a/engines/chewy/barriers.cpp
+++ b/engines/chewy/barriers.cpp
@@ -46,7 +46,7 @@ int16 Barriers::getBarrierId(int16 g_idx, const byte *buffer) {
break;
case 9:
- if (!_G(gameState).R9Gitter)
+ if (!_G(gameState).R9Grid)
return 0;
break;
diff --git a/engines/chewy/r_event.cpp b/engines/chewy/r_event.cpp
index cddc57a3f10..2fa6c661d2e 100644
--- a/engines/chewy/r_event.cpp
+++ b/engines/chewy/r_event.cpp
@@ -884,9 +884,9 @@ int16 sib_event_no_inv(int16 sib_nr) {
break;
case SIB_HEBEL_R7:
- _G(gameState).R7Hebel ^= 1;
+ _G(gameState).R7Lever ^= 1;
- if (!_G(gameState).R7Hebel)
+ if (!_G(gameState).R7Lever)
_G(atds)->set_ats_str(50, 0, ATS_DATA);
else if (!_G(gameState).R7BorkFlug)
_G(atds)->set_ats_str(50, 1, ATS_DATA);
@@ -915,9 +915,9 @@ int16 sib_event_no_inv(int16 sib_nr) {
break;
case SIB_LHAKEN_R7:
- if (_G(gameState).R7SeilLeft) {
+ if (_G(gameState).R7RopeLeft) {
if (_G(gameState).R7RHaken) {
- _G(gameState).R7SeilOk = true;
+ _G(gameState).R7RopeOk = true;
autoMove(4, P_CHEWY);
_G(obj)->calc_rsi_flip_flop(SIB_LHAKEN_R7);
_G(obj)->calc_rsi_flip_flop(SIB_RHAKEN_R7);
@@ -993,24 +993,24 @@ int16 sib_event_no_inv(int16 sib_nr) {
break;
case SIB_SCHALTER1_R21:
- _G(det)->startDetail(0, 1, _G(gameState).R21Hebel1);
- _G(gameState).R21Hebel1 ^= 1;
+ _G(det)->startDetail(0, 1, _G(gameState).R21Lever1);
+ _G(gameState).R21Lever1 ^= 1;
Room21::calc_laser();
- _G(atds)->set_ats_str(126, TXT_MARK_LOOK, _G(gameState).R21Hebel1, ATS_DATA);
+ _G(atds)->set_ats_str(126, TXT_MARK_LOOK, _G(gameState).R21Lever1, ATS_DATA);
break;
case SIB_SCHALTER2_R21:
- _G(det)->startDetail(1, 1, _G(gameState).R21Hebel2);
- _G(gameState).R21Hebel2 ^= 1;
+ _G(det)->startDetail(1, 1, _G(gameState).R21Lever2);
+ _G(gameState).R21Lever2 ^= 1;
Room21::calc_laser();
- _G(atds)->set_ats_str(127, TXT_MARK_LOOK, _G(gameState).R21Hebel2, ATS_DATA);
+ _G(atds)->set_ats_str(127, TXT_MARK_LOOK, _G(gameState).R21Lever2, ATS_DATA);
break;
case SIB_SCHALTER3_R21:
- _G(det)->startDetail(2, 1, _G(gameState).R21Hebel3);
- _G(gameState).R21Hebel3 ^= 1;
+ _G(det)->startDetail(2, 1, _G(gameState).R21Lever3);
+ _G(gameState).R21Lever3 ^= 1;
Room21::calc_laser();
- _G(atds)->set_ats_str(128, TXT_MARK_LOOK, _G(gameState).R21Hebel3, ATS_DATA);
+ _G(atds)->set_ats_str(128, TXT_MARK_LOOK, _G(gameState).R21Lever3, ATS_DATA);
break;
case SIB_SEIL_R21:
@@ -1018,7 +1018,7 @@ int16 sib_event_no_inv(int16 sib_nr) {
break;
case SIB_GITTER1_R21:
- Room21::use_gitter_energie();
+ Room21::use_gitter_energy();
break;
case SIB_CART1_R18:
@@ -1026,7 +1026,7 @@ int16 sib_event_no_inv(int16 sib_nr) {
break;
case SIB_DOORKNOB_R18:
- if (_G(gameState).R18DoorBruecke) {
+ if (_G(gameState).R18DoorBridge) {
_G(det)->stopSound(0);
_G(det)->playSound(19, 1);
} else {
@@ -1039,9 +1039,9 @@ int16 sib_event_no_inv(int16 sib_nr) {
EXIT_LEFT, -1,
(int16)_G(gameState).R6DoorLeftF);
}
- _G(gameState).R18DoorBruecke = exit_flip_flop(19, 40, 35, 148, -1, -1,
+ _G(gameState).R18DoorBridge = exit_flip_flop(19, 40, 35, 148, -1, -1,
EXIT_TOP, EXIT_LEFT,
- (int16)_G(gameState).R18DoorBruecke);
+ (int16)_G(gameState).R18DoorBridge);
break;
case SIB_CART_FACH_R18:
@@ -1259,8 +1259,8 @@ void sib_event_inv(int16 sib_nr) {
break;
case SIB_GITTER2_R21:
- _G(gameState).R21GitterMuell = exit_flip_flop(-1, 46, 27, 132, 90, -1,
- EXIT_RIGHT, EXIT_RIGHT, _G(gameState).R21GitterMuell);
+ _G(gameState).R21GarbageGrid = exit_flip_flop(-1, 46, 27, 132, 90, -1,
+ EXIT_RIGHT, EXIT_RIGHT, _G(gameState).R21GarbageGrid);
_G(atds)->set_ats_str(90, TXT_MARK_USE, 2, ATS_DATA);
break;
diff --git a/engines/chewy/rooms/room07.cpp b/engines/chewy/rooms/room07.cpp
index f5aff1ba52e..afb101c6680 100644
--- a/engines/chewy/rooms/room07.cpp
+++ b/engines/chewy/rooms/room07.cpp
@@ -56,7 +56,7 @@ void Room7::hook(int16 sibNr) {
cursorChoice(_G(menu_item));
if (_G(gameState).R7RHaken) {
- _G(gameState).R7SeilOk = true;
+ _G(gameState).R7RopeOk = true;
if (sibNr == SIB_LHAKEN_R7) {
_G(obj)->calc_rsi_flip_flop(SIB_LHAKEN_R7);
_G(obj)->calc_rsi_flip_flop(SIB_RHAKEN_R7);
@@ -65,7 +65,7 @@ void Room7::hook(int16 sibNr) {
_G(atds)->set_ats_str(55, TXT_MARK_LOOK, 1, ATS_DATA);
diaNr = 9;
} else {
- _G(gameState).R7SeilLeft = true;
+ _G(gameState).R7RopeLeft = true;
diaNr = 48;
}
@@ -78,7 +78,7 @@ void Room7::bell() {
hideCur();
if ((!_G(gameState).R7BellCount) ||
- (_G(gameState).R7BellCount >= 2 && _G(gameState).R7SeilLeft && !_G(gameState).R7SeilOk)) {
+ (_G(gameState).R7BellCount >= 2 && _G(gameState).R7RopeLeft && !_G(gameState).R7RopeOk)) {
_G(gameState)._personHide[P_CHEWY] = true;
start_aad(5, 0);
startAniBlock(3, ABLOCK25);
@@ -125,7 +125,7 @@ void Room7::bell() {
_G(flags).NoScroll = false;
_G(det)->hideStaticSpr(7);
- } else if (!_G(gameState).R7SeilOk) {
+ } else if (!_G(gameState).R7RopeOk) {
_G(gameState)._personHide[P_CHEWY] = true;
start_aad(7, 0);
startAniBlock(3, ABLOCK25);
@@ -149,7 +149,7 @@ void Room7::bell() {
_G(flags).NoScroll = false;
_G(det)->del_taf_tbl(192, 74, nullptr);
- } else if (_G(gameState).R7SeilOk && !_G(gameState).R7BorkFlug) {
+ } else if (_G(gameState).R7RopeOk && !_G(gameState).R7BorkFlug) {
_G(gameState).R7BorkFlug = true;
_G(gameState)._personHide[P_CHEWY] = true;
start_aad(8, 0);
diff --git a/engines/chewy/rooms/room09.cpp b/engines/chewy/rooms/room09.cpp
index 00c609b83d5..a77ede4534c 100644
--- a/engines/chewy/rooms/room09.cpp
+++ b/engines/chewy/rooms/room09.cpp
@@ -48,7 +48,7 @@ static const MovLine SURIMY_MPKT1[2] = {
void Room9::entry() {
_G(gameState).R7ChewyFlug = false;
- if (!_G(gameState).R9Gitter)
+ if (!_G(gameState).R9Grid)
setPersonPos(138, 91, P_CHEWY, P_LEFT);
else
_G(det)->showStaticSpr(5);
@@ -60,7 +60,7 @@ void Room9::entry() {
}
void Room9::gtuer() {
- _G(gameState).R9Gitter = true;
+ _G(gameState).R9Grid = true;
_G(det)->showStaticSpr(5);
startSetAILWait(6, 1, ANI_FRONT);
setPersonPos(74, 93, P_CHEWY, P_LEFT);
diff --git a/engines/chewy/rooms/room13.cpp b/engines/chewy/rooms/room13.cpp
index 6c344b79f6f..376f249854d 100644
--- a/engines/chewy/rooms/room13.cpp
+++ b/engines/chewy/rooms/room13.cpp
@@ -82,7 +82,7 @@ void Room13::entry() {
_G(gameState).R13Band = false;
}
- if (_G(gameState).R21GitterMuell)
+ if (_G(gameState).R21GarbageGrid)
_G(det)->hideStaticSpr(6);
}
}
diff --git a/engines/chewy/rooms/room17.cpp b/engines/chewy/rooms/room17.cpp
index 31d914f05f6..2f111d156dd 100644
--- a/engines/chewy/rooms/room17.cpp
+++ b/engines/chewy/rooms/room17.cpp
@@ -60,10 +60,10 @@ void Room17::entry() {
plot_seil();
- if (_G(gameState).R17GitterWeg)
+ if (_G(gameState).R17GridWeg)
_G(det)->hideStaticSpr(5);
- if (_G(gameState).R17DoorKommand)
+ if (_G(gameState).R17DoorCommand)
_G(det)->showStaticSpr(7);
if (_G(gameState).R17Location == 1) {
@@ -90,7 +90,7 @@ void Room17::entry() {
else
_G(gameState).room_e_obj[39].Attribut = 255;
- if (_G(gameState).R18DoorBruecke)
+ if (_G(gameState).R18DoorBridge)
_G(gameState).room_e_obj[35].Attribut = EXIT_LEFT;
else
_G(gameState).room_e_obj[35].Attribut = 255;
@@ -98,7 +98,7 @@ void Room17::entry() {
}
void Room17::xit() {
- if (_G(gameState).R17DoorKommand)
+ if (_G(gameState).R17DoorCommand)
_G(gameState).room_e_obj[36].Attribut = EXIT_TOP;
else
_G(gameState).room_e_obj[36].Attribut = 255;
@@ -147,7 +147,7 @@ int16 Room17::use_seil() {
autoMove(5, P_CHEWY);
_G(gameState)._personHide[P_CHEWY] = true;
startSetAILWait(10, 1, ANI_FRONT);
- _G(gameState).R17Seil = true;
+ _G(gameState).R17Rope = true;
_G(atds)->delControlBit(139, ATS_ACTIVE_BIT);
plot_seil();
_G(gameState)._personHide[P_CHEWY] = false;
@@ -162,7 +162,7 @@ int16 Room17::use_seil() {
}
void Room17::plot_seil() {
- if (_G(gameState).R17Seil) {
+ if (_G(gameState).R17Rope) {
for (int16 i = 0; i < 3; i++)
_G(det)->showStaticSpr(8 + i);
}
@@ -200,7 +200,7 @@ void Room17::kletter_up() {
}
void Room17::calc_seil() {
- if (_G(gameState).R17Seil) {
+ if (_G(gameState).R17Rope) {
if (_G(gameState).R17Location == 2) {
startAadWait(619);
} else if (!_G(flags).AutoAniPlay && !_G(cur)->usingInventoryCursor()) {
@@ -242,9 +242,9 @@ void Room17::door_kommando(int16 mode) {
_G(flags).AutoAniPlay = true;
if (!mode) {
- if (!_G(gameState).R17DoorKommand) {
+ if (!_G(gameState).R17DoorCommand) {
_G(gameState).room_e_obj[36].Attribut = EXIT_TOP;
- _G(gameState).R17DoorKommand = true;
+ _G(gameState).R17DoorCommand = true;
startSetAILWait(4, 1, ANI_FRONT);
stopPerson(P_CHEWY);
_G(det)->showStaticSpr(7);
@@ -254,30 +254,30 @@ void Room17::door_kommando(int16 mode) {
}
_G(flags).AutoAniPlay = false;
- _G(atds)->set_ats_str(144, _G(gameState).R17DoorKommand, ATS_DATA);
+ _G(atds)->set_ats_str(144, _G(gameState).R17DoorCommand, ATS_DATA);
}
}
void Room17::close_door() {
- if (_G(gameState).R17DoorKommand) {
+ if (_G(gameState).R17DoorCommand) {
_G(gameState).room_e_obj[36].Attribut = 255;
- _G(gameState).R17DoorKommand = false;
- _G(atds)->set_ats_str(144, _G(gameState).R17DoorKommand ? 1 : 0, ATS_DATA);
+ _G(gameState).R17DoorCommand = false;
+ _G(atds)->set_ats_str(144, _G(gameState).R17DoorCommand ? 1 : 0, ATS_DATA);
_G(det)->hideStaticSpr(7);
_G(det)->startDetail(4, 1, ANI_BACK);
}
}
-int16 Room17::energie_hebel() {
+int16 Room17::energy_lever() {
int16 action_flag = false;
hideCur();
autoMove(7, P_CHEWY);
- if (!_G(gameState).R17HebelOk) {
+ if (!_G(gameState).R17LeverOk) {
if (isCurInventory(BECHER_VOLL_INV)) {
delInventory(_G(cur)->getInventoryCursor());
- _G(gameState).R17HebelOk = true;
+ _G(gameState).R17LeverOk = true;
startAadWait(38);
action_flag = true;
} else if (!_G(cur)->usingInventoryCursor()) {
diff --git a/engines/chewy/rooms/room17.h b/engines/chewy/rooms/room17.h
index 7e060727612..09ea3a4562c 100644
--- a/engines/chewy/rooms/room17.h
+++ b/engines/chewy/rooms/room17.h
@@ -41,7 +41,7 @@ public:
static void kletter_up();
static void calc_seil();
static void close_door();
- static int16 energie_hebel();
+ static int16 energy_lever();
static int16 get_oel();
};
diff --git a/engines/chewy/rooms/room21.cpp b/engines/chewy/rooms/room21.cpp
index 97a1c0d8236..7d89a7a4e2a 100644
--- a/engines/chewy/rooms/room21.cpp
+++ b/engines/chewy/rooms/room21.cpp
@@ -84,7 +84,7 @@ bool Room21::timer(int16 t_nr, int16 ani_nr) {
}
void Room21::calc_laser() {
- if (_G(gameState).R21Hebel1 && !_G(gameState).R21Hebel2 && _G(gameState).R21Hebel3) {
+ if (_G(gameState).R21Lever1 && !_G(gameState).R21Lever2 && _G(gameState).R21Lever3) {
_G(gameState).R21Laser1Weg = true;
_G(det)->stopDetail(3);
_G(atds)->setControlBit(134, ATS_ACTIVE_BIT);
@@ -96,8 +96,8 @@ void Room21::calc_laser() {
_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) {
+ if (!_G(gameState).R21Lever1 && _G(gameState).R21Lever2 && !_G(gameState).R21Lever3) {
+ if (!_G(obj)->checkInventory(SEIL_INV) && !_G(gameState).R17Rope) {
_G(obj)->show_sib(SIB_SEIL_R21);
_G(atds)->delControlBit(129, ATS_ACTIVE_BIT);
}
@@ -223,9 +223,9 @@ void Room21::salto() {
}
}
-void Room21::use_gitter_energie() {
- _G(gameState).R21GitterEnergie = exit_flip_flop(-1, 47, -1, 131, 138, -1,
- EXIT_BOTTOM, EXIT_TOP, (int16)_G(gameState).R21GitterEnergie);
+void Room21::use_gitter_energy() {
+ _G(gameState).R21EnergyGrid = exit_flip_flop(-1, 47, -1, 131, 138, -1,
+ EXIT_BOTTOM, EXIT_TOP, (int16)_G(gameState).R21EnergyGrid);
_G(auto_obj) = 0;
_G(gameState).R17Location = 1;
_G(gameState)._personHide[P_CHEWY] = true;
@@ -233,7 +233,7 @@ void Room21::use_gitter_energie() {
switchRoom(17);
_G(det)->hideStaticSpr(5);
startSetAILWait(9, 1, ANI_FRONT);
- _G(gameState).R17GitterWeg = true;
+ _G(gameState).R17GridWeg = true;
_G(gameState)._personHide[P_CHEWY] = false;
}
diff --git a/engines/chewy/rooms/room21.h b/engines/chewy/rooms/room21.h
index 56f065102a9..531e95b240a 100644
--- a/engines/chewy/rooms/room21.h
+++ b/engines/chewy/rooms/room21.h
@@ -37,7 +37,7 @@ public:
static bool timer(int16 t_nr, int16 ani_nr);
static void calc_laser();
- static void use_gitter_energie();
+ static void use_gitter_energy();
static int16 use_fenster();
static void salto();
};
diff --git a/engines/chewy/rooms/room24.cpp b/engines/chewy/rooms/room24.cpp
index ae7e3d212d5..e06806a274e 100644
--- a/engines/chewy/rooms/room24.cpp
+++ b/engines/chewy/rooms/room24.cpp
@@ -31,7 +31,7 @@
namespace Chewy {
namespace Rooms {
-static const uint8 KRISTALL_SPR[3][3] = {
+static const uint8 CRYSTAL_SPR[3][3] = {
{ 14, 20, 13 },
{ 20, 13, 14 },
{ 13, 14, 20 },
@@ -57,11 +57,11 @@ void Room24::entry() {
else
_G(det)->hideStaticSpr(10);
- calc_hebel_spr();
+ calc_lever_spr();
calc_animation(255);
for (int16 i = 0; i < 3; i++) {
- if (KRISTALL_SPR[i][_G(gameState).R24Lever[i]] == 20)
+ if (CRYSTAL_SPR[i][_G(gameState).R24Lever[i]] == 20)
_G(det)->startDetail(5 + i * 4, 255, ANI_BACK);
}
}
@@ -76,18 +76,18 @@ void Room24::xit() {
_G(flags).MainInput = true;
}
-void Room24::use_hebel(int16 txt_nr) {
+void Room24::use_lever(int16 txt_nr) {
if (!_G(gameState).R24Lever[txt_nr - 161] ||
_G(gameState).R24Lever[txt_nr - 161] == 2) {
_G(gameState).R24Lever[txt_nr - 161] = 1;
- _G(gameState).R24HebelDir[txt_nr - 161] ^= 1;
+ _G(gameState).R24LeverDir[txt_nr - 161] ^= 1;
} else {
- if (_G(gameState).R24HebelDir[txt_nr - 161])
+ if (_G(gameState).R24LeverDir[txt_nr - 161])
_G(gameState).R24Lever[txt_nr - 161] = 0;
else
_G(gameState).R24Lever[txt_nr - 161] = 2;
}
- calc_hebel_spr();
+ calc_lever_spr();
calc_animation(txt_nr - 161);
if (_G(gameState).R24Lever[0] == 1 && _G(gameState).R24Lever[1] == 0 && _G(gameState).R24Lever[2] == 2) {
@@ -107,15 +107,15 @@ void Room24::use_hebel(int16 txt_nr) {
}
}
-void Room24::calc_hebel_spr() {
+void Room24::calc_lever_spr() {
if (!_G(gameState).R24FirstEntry) {
_G(gameState).R24FirstEntry = true;
_G(gameState).R24Lever[0] = 2;
- _G(gameState).R24HebelDir[0] = 0;
+ _G(gameState).R24LeverDir[0] = 0;
_G(gameState).R24Lever[1] = 1;
- _G(gameState).R24HebelDir[1] = 0;
+ _G(gameState).R24LeverDir[1] = 0;
_G(gameState).R24Lever[2] = 0;
- _G(gameState).R24HebelDir[2] = 1;
+ _G(gameState).R24LeverDir[2] = 1;
}
for (int16 i = 0; i < 3; i++) {
@@ -127,26 +127,26 @@ void Room24::calc_hebel_spr() {
}
}
-void Room24::calc_animation(int16 kristall_nr) {
- if (kristall_nr != 255) {
+void Room24::calc_animation(int16 crystal_nr) {
+ if (crystal_nr != 255) {
hideCur();
- if (KRISTALL_SPR[kristall_nr][_G(gameState).R24Lever[kristall_nr]] == 20) {
- int16 ani_nr = _G(gameState).R24KristallLast[kristall_nr] == 13 ? 7 : 8;
- _G(det)->playSound(ani_nr + kristall_nr * 4, 0);
+ if (CRYSTAL_SPR[crystal_nr][_G(gameState).R24Lever[crystal_nr]] == 20) {
+ int16 ani_nr = _G(gameState).R24CrystalLast[crystal_nr] == 13 ? 7 : 8;
+ _G(det)->playSound(ani_nr + crystal_nr * 4, 0);
_G(det)->stopSound(0);
- _G(det)->hideStaticSpr(_G(gameState).R24KristallLast[kristall_nr] + kristall_nr * 2);
- startSetAILWait(ani_nr + kristall_nr * 4, 1, ANI_BACK);
- startSetAILWait(6 + kristall_nr * 4, 1, ANI_BACK);
- _G(det)->startDetail(5 + kristall_nr * 4, 255, ANI_BACK);
+ _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);
+ _G(det)->startDetail(5 + crystal_nr * 4, 255, ANI_BACK);
- } else if (_G(gameState).R24KristallLast[kristall_nr] == 20) {
- int16 ani_nr = KRISTALL_SPR[kristall_nr][_G(gameState).R24Lever[kristall_nr]] == 13 ? 7 : 8;
+ } else if (_G(gameState).R24CrystalLast[crystal_nr] == 20) {
+ int16 ani_nr = CRYSTAL_SPR[crystal_nr][_G(gameState).R24Lever[crystal_nr]] == 13 ? 7 : 8;
_G(det)->stopSound(0);
- _G(det)->playSound(5 + ani_nr + kristall_nr * 4, 0);
- _G(det)->stopDetail(5 + kristall_nr * 4);
- startSetAILWait(6 + kristall_nr * 4, 1, ANI_FRONT);
- startSetAILWait(ani_nr + kristall_nr * 4, 1, ANI_FRONT);
+ _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);
}
showCur();
@@ -156,8 +156,8 @@ void Room24::calc_animation(int16 kristall_nr) {
_G(det)->hideStaticSpr(13 + i);
for (int16 i = 0; i < 3; i++) {
- _G(det)->showStaticSpr(KRISTALL_SPR[i][_G(gameState).R24Lever[i]] + i * 2);
- _G(gameState).R24KristallLast[i] = KRISTALL_SPR[i][_G(gameState).R24Lever[i]];
+ _G(det)->showStaticSpr(CRYSTAL_SPR[i][_G(gameState).R24Lever[i]] + i * 2);
+ _G(gameState).R24CrystalLast[i] = CRYSTAL_SPR[i][_G(gameState).R24Lever[i]];
}
}
diff --git a/engines/chewy/rooms/room24.h b/engines/chewy/rooms/room24.h
index 9b41e207bf2..43e3fbdffe5 100644
--- a/engines/chewy/rooms/room24.h
+++ b/engines/chewy/rooms/room24.h
@@ -27,13 +27,13 @@ namespace Rooms {
class Room24 {
private:
- static void calc_hebel_spr();
- static void calc_animation(int16 kristall_nr);
+ static void calc_lever_spr();
+ static void calc_animation(int16 crystal_nr);
public:
static void entry();
static void xit();
- static void use_hebel(int16 txt_nr);
+ static void use_lever(int16 txt_nr);
};
} // namespace Rooms
diff --git a/engines/chewy/t_event.cpp b/engines/chewy/t_event.cpp
index 70a3e64bbae..8cbcd59c56d 100644
--- a/engines/chewy/t_event.cpp
+++ b/engines/chewy/t_event.cpp
@@ -141,7 +141,7 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
break;
case 73:
- if (!_G(gameState).R9Gitter) {
+ if (!_G(gameState).R9Grid) {
_G(gameState)._personHide[P_CHEWY] = true;
startSetAILWait(5, 1, ANI_FRONT);
_G(gameState)._personHide[P_CHEWY] = false;
@@ -251,7 +251,7 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
break;
case 142:
- retValue = Room17::energie_hebel();
+ retValue = Room17::energy_lever();
break;
case 146:
@@ -278,7 +278,7 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
case 161:
case 162:
case 163:
- Room24::use_hebel(txtNr);
+ Room24::use_lever(txtNr);
break;
case 165:
diff --git a/engines/chewy/types.cpp b/engines/chewy/types.cpp
index 4c69f81f76e..a22d5bffe6a 100644
--- a/engines/chewy/types.cpp
+++ b/engines/chewy/types.cpp
@@ -119,8 +119,8 @@ bool GameState::synchronize(Common::Serializer &s) {
s.syncAsByte(R17Location);
s.syncAsSint16LE(R23GliderExit);
syncArray(s, R24Lever, 3);
- syncArray(s, R24HebelDir, 3);
- syncArray(s, R24KristallLast, 3);
+ syncArray(s, R24LeverDir, 3);
+ syncArray(s, R24CrystalLast, 3);
s.syncAsByte(R25SurimyGo);
s.syncAsByte(R27HowardGed);
s.syncAsByte(R28PumpTxt1);
diff --git a/engines/chewy/types.h b/engines/chewy/types.h
index 51d0691c321..eb4547aeb4c 100644
--- a/engines/chewy/types.h
+++ b/engines/chewy/types.h
@@ -47,10 +47,10 @@ struct GameFlags {
bool R6DoorLeftB : 1;
bool R6DoorRightB : 1;
bool R7DoorRight : 1;
- bool R7Hebel : 1;
+ bool R7Lever : 1;
- bool R7SeilLeft : 1;
- bool R7SeilOk : 1;
+ bool R7RopeLeft : 1;
+ bool R7RopeOk : 1;
bool R7RHaken : 1;
bool R7BorkFlug : 1;
bool R7ChewyFlug : 1;
@@ -61,7 +61,7 @@ struct GameFlags {
bool R8Kohle : 1;
bool R8Abkuehlen : 1;
bool R8GipsWurf : 1;
- bool R9Gitter : 1;
+ bool R9Grid : 1;
bool R9Surimy : 1;
bool R10Surimy : 1;
bool R10SurimyOk : 1;
@@ -92,13 +92,13 @@ struct GameFlags {
bool R14Sicherung : 1;
bool R14Waffe : 1;
bool R16F5Exit : 1;
- bool R17GitterWeg : 1;
+ bool R17GridWeg : 1;
- bool R17Seil : 1;
- bool R17HebelOk : 1;
+ bool R17Rope : 1;
+ bool R17LeverOk : 1;
bool R17EnergyOut : 1;
- bool R17DoorKommand : 1;
- bool R18DoorBruecke : 1;
+ bool R17DoorCommand : 1;
+ bool R18DoorBridge : 1;
bool R18CartridgeInSlot : 1;
bool R18CartTerminal : 1;
bool R18CartSave : 1;
@@ -110,12 +110,12 @@ struct GameFlags {
bool R18FirstEntry : 1;
bool R18Grid : 1;
bool R21Salto : 1;
- bool R21GitterEnergie : 1;
+ bool R21EnergyGrid : 1;
- bool R21GitterMuell : 1;
- bool R21Hebel1 : 1;
- bool R21Hebel2 : 1;
- bool R21Hebel3 : 1;
+ bool R21GarbageGrid : 1;
+ bool R21Lever1 : 1;
+ bool R21Lever2 : 1;
+ bool R21Lever3 : 1;
bool R21Laser1Weg : 1;
bool R21Laser2Weg : 1;
bool R21Gang : 1;
@@ -438,8 +438,8 @@ struct GameState : public GameFlags {
int16 R23GliderExit = 0;
uint8 R24Lever[3] = { 0 };
- uint8 R24HebelDir[3] = { 0 };
- uint8 R24KristallLast[3] = { 0 };
+ uint8 R24LeverDir[3] = { 0 };
+ uint8 R24CrystalLast[3] = { 0 };
uint8 R25SurimyGo = 0;
uint8 R27HowardGed = 0;
uint8 R28PumpTxt1 = 0;
Commit: 8f4bf38cf6aea06163467fe676ce9b77eba1d6ef
https://github.com/scummvm/scummvm/commit/8f4bf38cf6aea06163467fe676ce9b77eba1d6ef
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-09T22:00:19+02:00
Commit Message:
CHEWY: Renaming
No functional changes
Changed paths:
engines/chewy/atds.cpp
engines/chewy/atds.h
engines/chewy/r_event.cpp
engines/chewy/rooms/room02.cpp
engines/chewy/rooms/room03.cpp
engines/chewy/rooms/room05.cpp
engines/chewy/rooms/room08.cpp
engines/chewy/rooms/room09.cpp
engines/chewy/rooms/room12.cpp
engines/chewy/rooms/room17.cpp
engines/chewy/rooms/room18.cpp
engines/chewy/rooms/room22.cpp
engines/chewy/rooms/room23.cpp
engines/chewy/rooms/room25.cpp
engines/chewy/rooms/room28.cpp
engines/chewy/rooms/room29.cpp
engines/chewy/rooms/room31.cpp
engines/chewy/rooms/room32.cpp
engines/chewy/rooms/room35.cpp
engines/chewy/rooms/room37.cpp
engines/chewy/rooms/room39.cpp
engines/chewy/rooms/room41.cpp
engines/chewy/rooms/room42.cpp
engines/chewy/rooms/room45.cpp
engines/chewy/rooms/room50.cpp
engines/chewy/rooms/room51.cpp
engines/chewy/rooms/room52.cpp
engines/chewy/rooms/room54.cpp
engines/chewy/rooms/room55.cpp
engines/chewy/rooms/room59.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/room73.cpp
engines/chewy/rooms/room74.cpp
engines/chewy/rooms/room77.cpp
engines/chewy/rooms/room82.cpp
engines/chewy/rooms/room84.cpp
engines/chewy/rooms/room86.cpp
engines/chewy/rooms/room87.cpp
engines/chewy/rooms/room89.cpp
engines/chewy/rooms/room97.cpp
engines/chewy/t_event.cpp
engines/chewy/text.cpp
engines/chewy/text.h
diff --git a/engines/chewy/atds.cpp b/engines/chewy/atds.cpp
index 2c734ac73f5..5b7d1ea1c44 100644
--- a/engines/chewy/atds.cpp
+++ b/engines/chewy/atds.cpp
@@ -472,10 +472,10 @@ void Atdsys::print_ats(int16 x, int16 y, int16 scrX, int16 scrY) {
}
void Atdsys::set_ats_str(int16 txtNr, int16 txtMode, int16 strNr, int16 mode) {
- _text->setTextId(txtNr, txtMode, strNr, mode);
+ _text->setSubtextNum(txtNr, txtMode, strNr, mode);
}
-void Atdsys::set_ats_str(int16 txtNr, int16 strNr, int16 mode) {
+void Atdsys::set_all_ats_str(int16 txtNr, int16 strNr, int16 mode) {
for (int16 i = 0; i < 5; i++)
set_ats_str(txtNr, i, strNr, mode);
}
diff --git a/engines/chewy/atds.h b/engines/chewy/atds.h
index 293dcfed7b6..40efdf62153 100644
--- a/engines/chewy/atds.h
+++ b/engines/chewy/atds.h
@@ -227,7 +227,7 @@ public:
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);
+ void set_all_ats_str(int16 txtNr, int16 strNr, int16 mode);
int16 start_aad(int16 diaNr, bool continueWhenSpeechEnds = false);
void stopAad();
void print_aad(int16 scrX, int16 scrY);
diff --git a/engines/chewy/r_event.cpp b/engines/chewy/r_event.cpp
index 2fa6c661d2e..a70aac551b0 100644
--- a/engines/chewy/r_event.cpp
+++ b/engines/chewy/r_event.cpp
@@ -810,9 +810,9 @@ uint16 exit_flip_flop(int16 ani_nr, int16 eib_nr1, int16 eib_nr2,
_G(det)->startDetail(ani_nr, 1, flag);
flag ^= 1;
if (ats_nr1 != -1)
- _G(atds)->set_ats_str(ats_nr1, flag, ATS_DATA);
+ _G(atds)->set_all_ats_str(ats_nr1, flag, ATS_DATA);
if (ats_nr2 != -1)
- _G(atds)->set_ats_str(ats_nr2, flag, ATS_DATA);
+ _G(atds)->set_all_ats_str(ats_nr2, flag, ATS_DATA);
if (flag) {
if (eib_nr1 != -1)
_G(gameState).room_e_obj[eib_nr1].Attribut = spr_nr1;
@@ -887,11 +887,11 @@ int16 sib_event_no_inv(int16 sib_nr) {
_G(gameState).R7Lever ^= 1;
if (!_G(gameState).R7Lever)
- _G(atds)->set_ats_str(50, 0, ATS_DATA);
+ _G(atds)->set_all_ats_str(50, 0, ATS_DATA);
else if (!_G(gameState).R7BorkFlug)
- _G(atds)->set_ats_str(50, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(50, 1, ATS_DATA);
else
- _G(atds)->set_ats_str(50, 2, ATS_DATA);
+ _G(atds)->set_all_ats_str(50, 2, ATS_DATA);
break;
case SIB_KLINGEL_R7:
@@ -972,12 +972,12 @@ int16 sib_event_no_inv(int16 sib_nr) {
case SIB_FLUXO_R23:
_G(gameState).R23FluxoFlex = false;
- _G(atds)->set_ats_str(112, 0, ATS_DATA);
+ _G(atds)->set_all_ats_str(112, 0, ATS_DATA);
_G(menu_item_vorwahl) = CUR_USE;
break;
case SIB_TRANSLATOR_23:
- _G(atds)->set_ats_str(113, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(113, 1, ATS_DATA);
_G(menu_item_vorwahl) = CUR_USE;
break;
@@ -988,7 +988,7 @@ int16 sib_event_no_inv(int16 sib_nr) {
break;
case SIB_GITTER_R16:
- _G(atds)->set_ats_str(125, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(125, 1, ATS_DATA);
_G(gameState).room_e_obj[33].Attribut = EXIT_TOP;
break;
@@ -1071,12 +1071,12 @@ int16 sib_event_no_inv(int16 sib_nr) {
break;
case SIB_PUTE_R34:
- _G(atds)->set_ats_str(226, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(226, 1, ATS_DATA);
break;
case SIB_TOPF_R31:
_G(obj)->hide_sib(SIB_TOPF_R31);
- _G(atds)->set_ats_str(242, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(242, 1, ATS_DATA);
_G(gameState).R31PflanzeWeg = true;
break;
@@ -1158,8 +1158,8 @@ void sib_event_inv(int16 sib_nr) {
delInventory(RED_CARD_INV);
start_aad(103, -1);
_G(det)->startDetail(6, 255, ANI_FRONT);
- _G(atds)->set_ats_str(27, 1, ATS_DATA);
- _G(atds)->set_ats_str(30, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(27, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(30, 1, ATS_DATA);
}
break;
@@ -1233,13 +1233,13 @@ void sib_event_inv(int16 sib_nr) {
case SIB_FLUXO_R23:
_G(gameState).R23FluxoFlex = true;
delInventory(_G(cur)->getInventoryCursor());
- _G(atds)->set_ats_str(112, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(112, 1, ATS_DATA);
_G(menu_item_vorwahl) = CUR_USE;
break;
case SIB_TRANSLATOR_23:
delInventory(_G(cur)->getInventoryCursor());
- _G(atds)->set_ats_str(113, 0, ATS_DATA);
+ _G(atds)->set_all_ats_str(113, 0, ATS_DATA);
_G(menu_item_vorwahl) = CUR_USE;
break;
@@ -1273,7 +1273,7 @@ void sib_event_inv(int16 sib_nr) {
if (_G(gameState).R18CartTerminal) {
_G(gameState).R18CartSave = true;
- _G(atds)->set_ats_str(CARTRIDGE_INV, 1, INV_ATS_DATA);
+ _G(atds)->set_all_ats_str(CARTRIDGE_INV, 1, INV_ATS_DATA);
startAadWait(120);
} else {
startAadWait(121);
diff --git a/engines/chewy/rooms/room02.cpp b/engines/chewy/rooms/room02.cpp
index 6f2248c9c37..c8bf479b86f 100644
--- a/engines/chewy/rooms/room02.cpp
+++ b/engines/chewy/rooms/room02.cpp
@@ -70,7 +70,7 @@ void Room2::electrifyWalkway1() {
_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);
+ _G(atds)->set_all_ats_str(11, 1, ATS_DATA);
}
void Room2::electrifyWalkway2() {
diff --git a/engines/chewy/rooms/room03.cpp b/engines/chewy/rooms/room03.cpp
index 44eb836f114..16ff98bf4fa 100644
--- a/engines/chewy/rooms/room03.cpp
+++ b/engines/chewy/rooms/room03.cpp
@@ -308,7 +308,7 @@ void Room3::probeTransfer() {
_G(auto_mov_vector)[SONDE_OBJ].Delay = _G(gameState).DelaySpeed;
_G(auto_mov_obj)[SONDE_OBJ].Mode = true;
init_auto_obj(SONDE_OBJ, &SONDE_PHASEN[0][0], 2, (const MovLine *)SONDE_MPKT1);
- _G(atds)->set_ats_str(24, ATS_ACTIVE_BIT, ATS_DATA);
+ _G(atds)->set_all_ats_str(24, ATS_ACTIVE_BIT, ATS_DATA);
while (_G(mov_phasen)[SONDE_OBJ].Repeat != -1) {
set_ani_screen();
@@ -395,7 +395,7 @@ void Room3::probeTransfer() {
case 1:
g_engine->_sound->waitForSpeechToFinish();
- _G(atds)->set_ats_str(24, 0, ATS_DATA);
+ _G(atds)->set_all_ats_str(24, 0, ATS_DATA);
_G(mov_phasen)[0].AtsText = 544;
switchRoom(1);
break;
diff --git a/engines/chewy/rooms/room05.cpp b/engines/chewy/rooms/room05.cpp
index 4c7b44a31c8..00deecf6665 100644
--- a/engines/chewy/rooms/room05.cpp
+++ b/engines/chewy/rooms/room05.cpp
@@ -46,7 +46,7 @@ void Room5::pushButton() {
_G(gameState).room_e_obj[6].Attribut = 255;
strNr = 0;
}
- _G(atds)->set_ats_str(29, strNr, ATS_DATA);
+ _G(atds)->set_all_ats_str(29, strNr, ATS_DATA);
_G(gameState).R5Door ^= 1;
_G(obj)->calc_rsi_flip_flop(SIB_DOOR_R5);
} else {
diff --git a/engines/chewy/rooms/room08.cpp b/engines/chewy/rooms/room08.cpp
index 5f280128755..6040d72e577 100644
--- a/engines/chewy/rooms/room08.cpp
+++ b/engines/chewy/rooms/room08.cpp
@@ -47,17 +47,17 @@ void Room8::entry() {
start_folter();
else
stop_folter();
- _G(atds)->set_ats_str(60, 0, ATS_DATA);
+ _G(atds)->set_all_ats_str(60, 0, ATS_DATA);
}
void Room8::start_folter() {
- _G(atds)->set_ats_str(67, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(67, 1, ATS_DATA);
_G(det)->stopDetail(19);
_G(det)->startDetail(13, 255, ANI_FRONT);
}
void Room8::stop_folter() {
- _G(atds)->set_ats_str(67, 0, ATS_DATA);
+ _G(atds)->set_all_ats_str(67, 0, ATS_DATA);
_G(det)->startDetail(19, 255, ANI_FRONT);
_G(det)->stopDetail(13);
diff --git a/engines/chewy/rooms/room09.cpp b/engines/chewy/rooms/room09.cpp
index a77ede4534c..be27f61ef54 100644
--- a/engines/chewy/rooms/room09.cpp
+++ b/engines/chewy/rooms/room09.cpp
@@ -68,7 +68,7 @@ void Room9::gtuer() {
_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);
+ _G(atds)->set_all_ats_str(73, 1, ATS_DATA);
}
void Room9::surimy() {
diff --git a/engines/chewy/rooms/room12.cpp b/engines/chewy/rooms/room12.cpp
index 02a28369cfe..423ddcd122c 100644
--- a/engines/chewy/rooms/room12.cpp
+++ b/engines/chewy/rooms/room12.cpp
@@ -209,7 +209,7 @@ int16 Room12::use_terminal() {
load_chewy_taf(CHEWY_BORK);
_G(flags).NoScroll = false;
- _G(atds)->set_ats_str(118, 0, ATS_DATA);
+ _G(atds)->set_all_ats_str(118, 0, ATS_DATA);
_G(det)->hideStaticSpr(12);
_G(menu_item) = CUR_WALK;
cursorChoice(_G(menu_item));
diff --git a/engines/chewy/rooms/room17.cpp b/engines/chewy/rooms/room17.cpp
index 2f111d156dd..2556080a486 100644
--- a/engines/chewy/rooms/room17.cpp
+++ b/engines/chewy/rooms/room17.cpp
@@ -254,7 +254,7 @@ void Room17::door_kommando(int16 mode) {
}
_G(flags).AutoAniPlay = false;
- _G(atds)->set_ats_str(144, _G(gameState).R17DoorCommand, ATS_DATA);
+ _G(atds)->set_all_ats_str(144, _G(gameState).R17DoorCommand, ATS_DATA);
}
}
@@ -262,7 +262,7 @@ void Room17::close_door() {
if (_G(gameState).R17DoorCommand) {
_G(gameState).room_e_obj[36].Attribut = 255;
_G(gameState).R17DoorCommand = false;
- _G(atds)->set_ats_str(144, _G(gameState).R17DoorCommand ? 1 : 0, ATS_DATA);
+ _G(atds)->set_all_ats_str(144, _G(gameState).R17DoorCommand ? 1 : 0, ATS_DATA);
_G(det)->hideStaticSpr(7);
_G(det)->startDetail(4, 1, ANI_BACK);
}
@@ -298,8 +298,8 @@ int16 Room17::energy_lever() {
_G(det)->startDetail(i + 6, 255, ANI_FRONT);
}
- _G(atds)->set_ats_str(142, _G(gameState).R17EnergyOut ? 1 : 0, ATS_DATA);
- _G(atds)->set_ats_str(140, _G(gameState).R17EnergyOut ? 1 : 0, ATS_DATA);
+ _G(atds)->set_all_ats_str(142, _G(gameState).R17EnergyOut ? 1 : 0, ATS_DATA);
+ _G(atds)->set_all_ats_str(140, _G(gameState).R17EnergyOut ? 1 : 0, ATS_DATA);
_G(det)->playSound(12, 0);
if (_G(gameState).R17EnergyOut) {
diff --git a/engines/chewy/rooms/room18.cpp b/engines/chewy/rooms/room18.cpp
index 78b72f6ee9c..14832be9f64 100644
--- a/engines/chewy/rooms/room18.cpp
+++ b/engines/chewy/rooms/room18.cpp
@@ -117,7 +117,7 @@ void Room18::entry() {
} else {
// Show cyber crown
_G(det)->showStaticSpr(19);
- _G(atds)->set_ats_str(153, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(153, 1, ATS_DATA);
_G(atds)->set_ats_str(149, TXT_MARK_LOOK, 1, ATS_DATA);
for (int16 i = 0; i < 3; i++)
@@ -323,7 +323,7 @@ int16 Room18::calcSurimy() {
_G(gameState).ScrollxStep = 2;
_G(auto_obj) = 0;
- _G(atds)->set_ats_str(153, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(153, 1, ATS_DATA);
_G(atds)->set_ats_str(149, TXT_MARK_LOOK, 1, ATS_DATA);
for (int16 i = 0; i < 3; i++)
diff --git a/engines/chewy/rooms/room22.cpp b/engines/chewy/rooms/room22.cpp
index 997569a7f46..9738feab51c 100644
--- a/engines/chewy/rooms/room22.cpp
+++ b/engines/chewy/rooms/room22.cpp
@@ -92,7 +92,7 @@ int16 Room22::chewy_amboss() {
_G(flags).NoPalAfterFlc = false;
flic_cut(FCUT_006);
_G(gameState).R22ChewyPlatt = true;
- _G(atds)->set_ats_str(79, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(79, 1, ATS_DATA);
_G(flags).AutoAniPlay = false;
showCur();
diff --git a/engines/chewy/rooms/room23.cpp b/engines/chewy/rooms/room23.cpp
index 38c06f85fb6..c64aac289bd 100644
--- a/engines/chewy/rooms/room23.cpp
+++ b/engines/chewy/rooms/room23.cpp
@@ -134,18 +134,18 @@ void Room23::use_cartridge() {
if (_G(gameState).R18CartSave) {
_G(atds)->delControlBit(171, ATS_ACTIVE_BIT);
- _G(atds)->set_ats_str(111, 2, ATS_DATA);
+ _G(atds)->set_all_ats_str(111, 2, ATS_DATA);
startSetAILWait(4, 1, ANI_FRONT);
_G(det)->showStaticSpr(3);
} else {
- _G(atds)->set_ats_str(111, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(111, 1, ATS_DATA);
}
_G(menu_item_vorwahl) = CUR_USE;
}
void Room23::get_cartridge() {
- _G(atds)->set_ats_str(111, 0, ATS_DATA);
+ _G(atds)->set_all_ats_str(111, 0, ATS_DATA);
_G(atds)->setControlBit(171, ATS_ACTIVE_BIT);
_G(gameState).R23Cartridge = false;
diff --git a/engines/chewy/rooms/room25.cpp b/engines/chewy/rooms/room25.cpp
index d0f1e680708..2451b168dfc 100644
--- a/engines/chewy/rooms/room25.cpp
+++ b/engines/chewy/rooms/room25.cpp
@@ -68,7 +68,7 @@ void Room25::entry() {
if (_G(obj)->checkInventory(TRANSLATOR_INV)) {
_G(obj)->calc_rsi_flip_flop(SIB_TRANSLATOR_23);
- _G(atds)->set_ats_str(113, 0, ATS_DATA);
+ _G(atds)->set_all_ats_str(113, 0, ATS_DATA);
remove_inventory(TRANSLATOR_INV);
_G(cur)->setInventoryCursor(-1);
@@ -110,8 +110,8 @@ int16 Room25::extinguishGliderFlames() {
autoMove(2, P_CHEWY);
flic_cut(FCUT_030);
_G(obj)->calc_rsi_flip_flop(SIB_SCHLAUCH_R25);
- _G(atds)->set_ats_str(219, 1, ATS_DATA);
- _G(atds)->set_ats_str(187, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(219, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(187, 1, ATS_DATA);
_G(det)->stopSound(0);
for (int i = 0; i < 9; ++i)
diff --git a/engines/chewy/rooms/room28.cpp b/engines/chewy/rooms/room28.cpp
index 86c0d56dd9f..6b639c07dd8 100644
--- a/engines/chewy/rooms/room28.cpp
+++ b/engines/chewy/rooms/room28.cpp
@@ -74,7 +74,7 @@ void Room28::entry(int16 eib_nr) {
waitShowScreen(10);
startAadWait(194);
_G(gameState).room_e_obj[62].Attribut = 255;
- _G(atds)->set_ats_str(208, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(208, 1, ATS_DATA);
_G(flags).NoScroll = true;
auto_scroll(0, 0);
@@ -110,7 +110,7 @@ void Room28::entry(int16 eib_nr) {
flic_cut(FCUT_063);
_G(gameState).R28ChewyPump = false;
invent_2_slot(K_MASKE_INV);
- _G(atds)->set_ats_str(209, 0, ATS_DATA);
+ _G(atds)->set_all_ats_str(209, 0, ATS_DATA);
_G(gameState).room_e_obj[69].Attribut = 255;
load_chewy_taf(CHEWY_NORMAL);
@@ -170,7 +170,7 @@ void Room28::haendler() {
_G(SetUpScreenFunc) = nullptr;
_G(gameState).R28ChewyPump = true;
delInventory(K_MASKE_INV);
- _G(atds)->set_ats_str(209, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(209, 1, ATS_DATA);
_G(gameState).room_e_obj[69].Attribut = EXIT_TOP;
load_chewy_taf(CHEWY_PUMPKIN);
@@ -222,8 +222,8 @@ void Room28::use_surimy() {
flic_cut(FCUT_056);
ani_nr = CH_TALK3;
dia_nr = 140;
- _G(atds)->set_ats_str(205, 1, ATS_DATA);
- _G(atds)->set_ats_str(222, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(205, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(222, 1, ATS_DATA);
} else {
ani_nr = CH_TALK5;
@@ -266,7 +266,7 @@ void Room28::set_pump() {
if (_G(gameState).R39TranslatorUsed) {
_G(gameState).room_e_obj[69].Attribut = EXIT_TOP;
} else {
- _G(atds)->set_ats_str(209, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(209, 1, ATS_DATA);
}
if (_G(gameState)._personRoomNr[P_HOWARD] == 28 && _G(gameState).R28PumpTxt < 3) {
@@ -301,7 +301,7 @@ void Room28::get_pump() {
startSetAILWait(tmp, 1, ANI_BACK);
invent_2_slot(K_MASKE_INV);
- _G(atds)->set_ats_str(209, 0, ATS_DATA);
+ _G(atds)->set_all_ats_str(209, 0, ATS_DATA);
_G(gameState).room_e_obj[69].Attribut = 255;
_G(gameState)._personHide[P_CHEWY] = false;
load_chewy_taf(CHEWY_NORMAL);
@@ -330,7 +330,7 @@ int16 Room28::use_breifkasten() {
autoMove(8, P_CHEWY);
start_spz(CH_LGET_O, 1, ANI_FRONT, P_CHEWY);
startAadWait(179);
- _G(atds)->set_ats_str(206, 0, ATS_DATA);
+ _G(atds)->set_all_ats_str(206, 0, ATS_DATA);
showCur();
invent_2_slot(MANUSKRIPT_INV);
_G(gameState).R28Manuskript = true;
diff --git a/engines/chewy/rooms/room29.cpp b/engines/chewy/rooms/room29.cpp
index 643eb40f688..4ae54a7c720 100644
--- a/engines/chewy/rooms/room29.cpp
+++ b/engines/chewy/rooms/room29.cpp
@@ -122,7 +122,7 @@ bool Room29::useWaterHose() {
_G(det)->showStaticSpr(8);
_G(det)->showStaticSpr(10);
_G(atds)->delControlBit(219, ATS_ACTIVE_BIT);
- _G(atds)->set_ats_str(218, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(218, 1, ATS_DATA);
_G(gameState).R29Schlauch1 = false;
_G(gameState).R29WaterHose = true;
diff --git a/engines/chewy/rooms/room31.cpp b/engines/chewy/rooms/room31.cpp
index e77cf089378..9fcb6af3b80 100644
--- a/engines/chewy/rooms/room31.cpp
+++ b/engines/chewy/rooms/room31.cpp
@@ -78,7 +78,7 @@ void Room31::calc_luke() {
for (int16 i = 0; i < 3; i++)
_G(det)->showStaticSpr(5 + i);
- _G(atds)->set_ats_str(244, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(244, 1, ATS_DATA);
_G(atds)->delControlBit(245, ATS_ACTIVE_BIT);
_G(gameState).room_e_obj[75].Attribut = EXIT_BOTTOM;
@@ -86,7 +86,7 @@ void Room31::calc_luke() {
for (int16 i = 0; i < 3; i++)
_G(det)->hideStaticSpr(5 + i);
- _G(atds)->set_ats_str(244, 0, ATS_DATA);
+ _G(atds)->set_all_ats_str(244, 0, ATS_DATA);
_G(atds)->setControlBit(245, ATS_ACTIVE_BIT);
_G(gameState).room_e_obj[75].Attribut = 255;
}
@@ -154,7 +154,7 @@ int16 Room31::use_topf() {
delInventory(_G(cur)->getInventoryCursor());
ani_nr = CH_TALK3;
dia_nr = 150;
- _G(atds)->set_ats_str(242, 2, ATS_DATA);
+ _G(atds)->set_all_ats_str(242, 2, ATS_DATA);
} else if (isCurInventory(WATER_FILLED_BOTTLE_INV)) {
if (_G(gameState).R31KoernerDa) {
@@ -168,7 +168,7 @@ int16 Room31::use_topf() {
inventory_2_cur(EMPTY_MILK_BOTTLE_INV);
ani_nr = CH_TALK6;
dia_nr = 151;
- _G(atds)->set_ats_str(242, 3, ATS_DATA);
+ _G(atds)->set_all_ats_str(242, 3, ATS_DATA);
} else {
ani_nr = CH_TALK5;
dia_nr = 152;
@@ -187,7 +187,7 @@ int16 Room31::use_topf() {
_G(gameState).R31SurFurz = true;
ani_nr = CH_TALK6;
dia_nr = 156;
- _G(atds)->set_ats_str(242, 4, ATS_DATA);
+ _G(atds)->set_all_ats_str(242, 4, ATS_DATA);
cur_2_inventory();
}
} else {
diff --git a/engines/chewy/rooms/room32.cpp b/engines/chewy/rooms/room32.cpp
index 4bc518560f9..a404687d8f0 100644
--- a/engines/chewy/rooms/room32.cpp
+++ b/engines/chewy/rooms/room32.cpp
@@ -111,7 +111,7 @@ void Room32::use_schreibmaschine() {
flic_cut(FCUT_044);
register_cutscene(12);
_G(det)->showStaticSpr(5);
- _G(atds)->set_ats_str(203, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(203, 1, ATS_DATA);
ani_nr = CH_TALK3;
dia_nr = 88;
_G(atds)->set_ats_str(231, TXT_MARK_LOOK, 0, ATS_DATA);
@@ -159,7 +159,7 @@ int16 Room32::get_script() {
invent_2_slot(MANUSKRIPT_INV);
start_spz_wait(CH_LGET_U, 1, false, P_CHEWY);
_G(det)->hideStaticSpr(5);
- _G(atds)->set_ats_str(203, 0, ATS_DATA);
+ _G(atds)->set_all_ats_str(203, 0, ATS_DATA);
start_spz(CH_TALK3, 1, ANI_FRONT, P_CHEWY);
startAadWait(91);
}
diff --git a/engines/chewy/rooms/room35.cpp b/engines/chewy/rooms/room35.cpp
index b58290734b4..35741c564b7 100644
--- a/engines/chewy/rooms/room35.cpp
+++ b/engines/chewy/rooms/room35.cpp
@@ -52,7 +52,7 @@ int16 Room35::schublade() {
start_spz_wait(CH_LGET_O, 1, false, P_CHEWY);
_G(det)->showStaticSpr(1);
_G(gameState).R35Schublade = true;
- _G(atds)->set_ats_str(234, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(234, 1, ATS_DATA);
} else if (!_G(gameState).R35Falle) {
action_flag = true;
autoMove(3, P_CHEWY);
@@ -64,7 +64,7 @@ int16 Room35::schublade() {
start_spz(CH_TALK5, 255, ANI_FRONT, P_CHEWY);
startAadWait(93);
_G(gameState)._personHide[P_CHEWY] = false;
- _G(atds)->set_ats_str(234, 2, ATS_DATA);
+ _G(atds)->set_all_ats_str(234, 2, ATS_DATA);
}
}
diff --git a/engines/chewy/rooms/room37.cpp b/engines/chewy/rooms/room37.cpp
index 2dabe598710..6b6e55277f6 100644
--- a/engines/chewy/rooms/room37.cpp
+++ b/engines/chewy/rooms/room37.cpp
@@ -69,8 +69,8 @@ void Room37::entry() {
_G(det)->hideStaticSpr(8);
} else if (_G(gameState).R37DogAshamed) {
_G(det)->showStaticSpr(0);
- _G(atds)->set_ats_str(250, 1, ATS_DATA);
- _G(atds)->set_ats_str(256, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(250, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(256, 1, ATS_DATA);
_G(atds)->delControlBit(251, ATS_ACTIVE_BIT);
}
}
@@ -147,8 +147,8 @@ int16 Room37::useGlass() {
flic_cut(FCUT_049);
invent_2_slot(DENTURES_INV);
_G(det)->hideStaticSpr(9);
- _G(atds)->set_ats_str(250, 1, ATS_DATA);
- _G(atds)->set_ats_str(256, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(250, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(256, 1, ATS_DATA);
_G(atds)->delControlBit(251, ATS_ACTIVE_BIT);
_G(obj)->show_sib(SIB_HFUTTER2_R37);
_G(gameState).R37TakenDenturesFromGlass = true;
diff --git a/engines/chewy/rooms/room39.cpp b/engines/chewy/rooms/room39.cpp
index 5bbc266894f..a2f76231e90 100644
--- a/engines/chewy/rooms/room39.cpp
+++ b/engines/chewy/rooms/room39.cpp
@@ -96,7 +96,7 @@ short Room39::use_howard() {
_G(det)->stopDetail(3);
startSetAILWait(4, 1, ANI_FRONT);
_G(det)->set_static_ani(5, -1);
- _G(atds)->set_ats_str(62, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(62, 1, ATS_DATA);
startAadWait(169);
showCur();
@@ -255,7 +255,7 @@ int16 Room39::use_tv() {
_G(gameState)._personHide[P_CHEWY] = false;
ani_nr = CH_TALK5;
dia_nr = 99;
- _G(atds)->set_ats_str(RECORDER_INV, _G(gameState).R39TvKanal + 1, INV_ATS_DATA);
+ _G(atds)->set_all_ats_str(RECORDER_INV, _G(gameState).R39TvKanal + 1, INV_ATS_DATA);
_G(gameState).R39TvRecord = _G(gameState).R39TvKanal + 1;
} else {
ani_nr = CH_TALK12;
diff --git a/engines/chewy/rooms/room41.cpp b/engines/chewy/rooms/room41.cpp
index a08c5700f42..fe8224da76c 100644
--- a/engines/chewy/rooms/room41.cpp
+++ b/engines/chewy/rooms/room41.cpp
@@ -202,7 +202,7 @@ int16 Room41::use_lola() {
_G(det)->stopDetail(6);
_G(atds)->delControlBit(267, ATS_ACTIVE_BIT);
- _G(atds)->set_ats_str(267, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(267, 1, ATS_DATA);
_G(atds)->hideDialogCloseupItem(11, 0, 3);
showCur();
}
@@ -228,7 +228,7 @@ int16 Room41::use_brief() {
stop_hoggy();
startAadWait(186);
start_hoggy();
- _G(atds)->set_ats_str(206, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(206, 1, ATS_DATA);
_G(gameState).R28LetterBox = true;
_G(gameState).R40TrainMove = true;
_G(gameState).R28PostCar = true;
diff --git a/engines/chewy/rooms/room42.cpp b/engines/chewy/rooms/room42.cpp
index 7570eecadc7..a3b20d320b0 100644
--- a/engines/chewy/rooms/room42.cpp
+++ b/engines/chewy/rooms/room42.cpp
@@ -50,8 +50,8 @@ void Room42::entry() {
_G(SetUpScreenFunc) = setup_func;
setPersonPos(80, 43, P_HOWARD, P_LEFT);
- _G(atds)->set_ats_str(263, 1, ATS_DATA);
- _G(atds)->set_ats_str(264, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(263, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(264, 1, ATS_DATA);
}
if (_G(obj)->checkInventory(HOTEL_INV) && _G(obj)->checkInventory(TICKET_INV) && !_G(gameState).R42LetterOk)
@@ -64,7 +64,7 @@ void Room42::entry() {
void Room42::xit() {
if (_G(gameState)._personRoomNr[P_HOWARD] == 42) {
- _G(atds)->set_ats_str(264, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(264, 1, ATS_DATA);
stop_spz();
_G(gameState).R42HoToBeamter = false;
_G(gameState)._personRoomNr[P_HOWARD] = 40;
@@ -126,7 +126,7 @@ int16 Room42::useMailBag() {
delInventory(_G(cur)->getInventoryCursor());
startAadWait(183);
_G(obj)->calc_rsi_flip_flop(SIB_BKASTEN_R28);
- _G(atds)->set_ats_str(206, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(206, 1, ATS_DATA);
_G(gameState).R28LetterBox = true;
_G(gameState).R40TrainMove = true;
_G(gameState).R28PostCar = true;
@@ -145,7 +145,7 @@ int16 Room42::useStationEmployee() {
if (_G(menu_item) == CUR_HOWARD) {
action_flag = true;
- _G(atds)->set_ats_str(264, 2, ATS_DATA);
+ _G(atds)->set_all_ats_str(264, 2, ATS_DATA);
hideCur();
autoMove(4, P_CHEWY);
startAadWait(184);
diff --git a/engines/chewy/rooms/room45.cpp b/engines/chewy/rooms/room45.cpp
index 5cf1b0e607f..b3a536efd33 100644
--- a/engines/chewy/rooms/room45.cpp
+++ b/engines/chewy/rooms/room45.cpp
@@ -243,7 +243,7 @@ int16 Room45::use_boy() {
if (isCurInventory(DOLLAR175_INV)) {
action_ret = true;
new_invent_2_cur(CUTMAG_INV);
- _G(atds)->set_ats_str(DOLLAR175_INV, 1, INV_ATS_DATA);
+ _G(atds)->set_all_ats_str(DOLLAR175_INV, 1, INV_ATS_DATA);
startAadWait(258);
_G(room)->set_timer_status(0, TIMER_STOP);
_G(det)->del_static_ani(0);
diff --git a/engines/chewy/rooms/room50.cpp b/engines/chewy/rooms/room50.cpp
index 7455384c401..bbb8e4072a4 100644
--- a/engines/chewy/rooms/room50.cpp
+++ b/engines/chewy/rooms/room50.cpp
@@ -111,7 +111,7 @@ void Room50::gedAction(int index) {
void Room50::stop_cigar() {
_G(room)->set_timer_status(0, TIMER_STOP);
_G(det)->del_static_ani(0);
- _G(atds)->set_ats_str(328, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(328, 1, ATS_DATA);
_G(det)->stopDetail(0);
_G(gameState).R50Zigarre = true;
}
@@ -221,8 +221,8 @@ int16 Room50::use_gum() {
_G(obj)->addInventory(KEY_INV, &_G(room_blk));
inventory_2_cur(KEY_INV);
- _G(atds)->set_ats_str(323, 1, ATS_DATA);
- _G(atds)->set_ats_str(327, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(323, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(327, 1, ATS_DATA);
_G(gameState).room_e_obj[84].Attribut = EXIT_TOP;
showCur();
}
diff --git a/engines/chewy/rooms/room51.cpp b/engines/chewy/rooms/room51.cpp
index 4afd06f3ef4..c2a20804bff 100644
--- a/engines/chewy/rooms/room51.cpp
+++ b/engines/chewy/rooms/room51.cpp
@@ -224,7 +224,7 @@ int16 Room51::use_door(int16 txt_nr) {
_G(gameState).R51HotelRoom = true;
_G(gameState).room_e_obj[86].Attribut = EXIT_LEFT;
startAadWait(285);
- _G(atds)->set_ats_str(329, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(329, 1, ATS_DATA);
_G(SetUpScreenFunc) = setup_func;
} else {
diff --git a/engines/chewy/rooms/room52.cpp b/engines/chewy/rooms/room52.cpp
index f0b4cbca93c..35b07371136 100644
--- a/engines/chewy/rooms/room52.cpp
+++ b/engines/chewy/rooms/room52.cpp
@@ -82,7 +82,7 @@ int16 Room52::use_hot_dog() {
_G(gameState).R52HotDogOk = true;
plot_armee(20);
_G(det)->playSound(0, 0);
- _G(atds)->set_ats_str(341, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(341, 1, ATS_DATA);
autoMove(2, P_CHEWY);
setPersonSpr(P_LEFT, P_CHEWY);
startAadWait(288);
@@ -108,7 +108,7 @@ int16 Room52::use_hot_dog() {
_G(gameState)._personHide[P_CHEWY] = false;
_G(atds)->setControlBit(341, ATS_ACTIVE_BIT);
startAadWait(303);
- _G(atds)->set_ats_str(KILLER_INV, 1, INV_ATS_DATA);
+ _G(atds)->set_all_ats_str(KILLER_INV, 1, INV_ATS_DATA);
_G(gameState).R52KakerWeg = true;
}
diff --git a/engines/chewy/rooms/room54.cpp b/engines/chewy/rooms/room54.cpp
index b670bd2dde5..a110388d17f 100644
--- a/engines/chewy/rooms/room54.cpp
+++ b/engines/chewy/rooms/room54.cpp
@@ -166,8 +166,8 @@ int16 Room54::use_schalter() {
aad_nr = 296;
_G(gameState).R54FputzerWeg = true;
_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);
+ _G(atds)->set_all_ats_str(349, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(351, 1, ATS_DATA);
}
startAadWait(aad_nr);
diff --git a/engines/chewy/rooms/room55.cpp b/engines/chewy/rooms/room55.cpp
index c7caa0b7f64..732b88e149d 100644
--- a/engines/chewy/rooms/room55.cpp
+++ b/engines/chewy/rooms/room55.cpp
@@ -140,8 +140,8 @@ int16 Room55::use_stapel1() {
_G(det)->hideStaticSpr(0);
autoMove(5, P_CHEWY);
_G(det)->showStaticSpr(1);
- _G(atds)->set_ats_str(354, 1, ATS_DATA);
- _G(atds)->set_ats_str(355, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(354, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(355, 1, ATS_DATA);
} else if (_G(gameState).R55EscScriptOk && !_G(gameState).R55RaumOk) {
action_ret = true;
@@ -155,7 +155,7 @@ int16 Room55::use_stapel1() {
_G(gameState).R55EscScriptOk = true;
_G(det)->showStaticSpr(0);
delInventory(_G(cur)->getInventoryCursor());
- _G(atds)->set_ats_str(354, 2, ATS_DATA);
+ _G(atds)->set_all_ats_str(354, 2, ATS_DATA);
} else {
startAadWait(326);
}
@@ -212,7 +212,7 @@ int16 Room55::use_telefon() {
startSetAILWait(2, 1, ANI_FRONT);
_G(det)->hideStaticSpr(0);
_G(det)->hideStaticSpr(8);
- _G(atds)->set_ats_str(354, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(354, 1, ATS_DATA);
flic_cut(FCUT_071);
_G(gameState)._personRoomNr[P_HOWARD] = 55;
diff --git a/engines/chewy/rooms/room59.cpp b/engines/chewy/rooms/room59.cpp
index 7eb190d1d20..13937974f20 100644
--- a/engines/chewy/rooms/room59.cpp
+++ b/engines/chewy/rooms/room59.cpp
@@ -30,8 +30,8 @@ namespace Rooms {
void Room59::look_poster() {
if (!_G(gameState).R59PosterWeg) {
- _G(atds)->set_ats_str(302, 1, ATS_DATA);
- _G(atds)->set_ats_str(301, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(302, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(301, 1, ATS_DATA);
_G(gameState).R59PosterWeg = true;
invent_2_slot(SPARK_INV);
switchRoom(60);
diff --git a/engines/chewy/rooms/room63.cpp b/engines/chewy/rooms/room63.cpp
index 64265ca19eb..3e6be643862 100644
--- a/engines/chewy/rooms/room63.cpp
+++ b/engines/chewy/rooms/room63.cpp
@@ -238,7 +238,7 @@ int16 Room63::use_schalter() {
_G(det)->showStaticSpr(1);
_G(det)->hideStaticSpr(2);
startAadWait(364);
- _G(atds)->set_ats_str(385, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(385, 1, ATS_DATA);
showCur();
}
} else {
@@ -281,8 +281,8 @@ int16 Room63::use_girl() {
_G(det)->stopDetail(18);
_G(det)->showStaticSpr(10);
_G(det)->showStaticSpr(12);
- _G(atds)->set_ats_str(381, 1, ATS_DATA);
- _G(atds)->set_ats_str(382, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(381, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(382, 1, ATS_DATA);
_G(atds)->setControlBit(380, ATS_ACTIVE_BIT);
startAadWait(367);
showCur();
@@ -312,7 +312,7 @@ int16 Room63::use_aschenbecher() {
flic_cut(FCUT_080);
_G(atds)->setControlBit(381, ATS_ACTIVE_BIT);
_G(atds)->setControlBit(382, ATS_ACTIVE_BIT);
- _G(atds)->set_ats_str(383, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(383, 1, ATS_DATA);
_G(gameState).R63Fire = true;
_G(gameState)._personHide[P_CHEWY] = false;
_G(gameState).scrollx = 0;
diff --git a/engines/chewy/rooms/room64.cpp b/engines/chewy/rooms/room64.cpp
index 97a852226cd..c3e0a558339 100644
--- a/engines/chewy/rooms/room64.cpp
+++ b/engines/chewy/rooms/room64.cpp
@@ -89,7 +89,7 @@ void Room64::calc_monitor() {
break;
}
- _G(atds)->set_ats_str(373, str_nr, ATS_DATA);
+ _G(atds)->set_all_ats_str(373, str_nr, ATS_DATA);
switch (_G(gameState).R64Moni2Ani) {
case 0:
str_nr = 1;
@@ -103,7 +103,7 @@ void Room64::calc_monitor() {
default:
break;
}
- _G(atds)->set_ats_str(374, str_nr, ATS_DATA);
+ _G(atds)->set_all_ats_str(374, str_nr, ATS_DATA);
}
void Room64::setup_func() {
diff --git a/engines/chewy/rooms/room66.cpp b/engines/chewy/rooms/room66.cpp
index e13fb7bcf9c..6aedc8b5e40 100644
--- a/engines/chewy/rooms/room66.cpp
+++ b/engines/chewy/rooms/room66.cpp
@@ -171,7 +171,7 @@ int Room66::proc2() {
autoMove(0, P_CHEWY);
_G(gameState).flags26_40 = true;
_G(gameState).room_e_obj[100].Attribut = 3;
- _G(atds)->set_ats_str(423, 1, ANI_GO);
+ _G(atds)->set_all_ats_str(423, 1, ANI_GO);
showCur();
return 0;
diff --git a/engines/chewy/rooms/room67.cpp b/engines/chewy/rooms/room67.cpp
index 1860243607d..4b686187eec 100644
--- a/engines/chewy/rooms/room67.cpp
+++ b/engines/chewy/rooms/room67.cpp
@@ -114,13 +114,13 @@ int16 Room67::use_kommode() {
autoMove(6, P_CHEWY);
start_spz_wait(CH_LGET_O, 1, false, P_CHEWY);
_G(det)->showStaticSpr(9);
- _G(atds)->set_ats_str(400, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(400, 1, ATS_DATA);
} else if (!_G(gameState).R67KostuemWeg) {
action_flag = true;
_G(gameState).R67KostuemWeg = true;
autoMove(6, P_CHEWY);
start_spz_wait(CH_LGET_O, 1, false, P_CHEWY);
- _G(atds)->set_ats_str(400, 2, ATS_DATA);
+ _G(atds)->set_all_ats_str(400, 2, ATS_DATA);
new_invent_2_cur(GALA_INV);
}
showCur();
diff --git a/engines/chewy/rooms/room68.cpp b/engines/chewy/rooms/room68.cpp
index 64294df47b1..b0fd017ba65 100644
--- a/engines/chewy/rooms/room68.cpp
+++ b/engines/chewy/rooms/room68.cpp
@@ -250,7 +250,7 @@ int16 Room68::useParrot() {
_G(det)->showStaticSpr(12);
_G(det)->startDetail(21, 255, ANI_FRONT);
_G(atds)->delControlBit(408, ATS_ACTIVE_BIT);
- _G(atds)->set_ats_str(407, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(407, 1, ATS_DATA);
showCur();
}
return action_flag;
diff --git a/engines/chewy/rooms/room73.cpp b/engines/chewy/rooms/room73.cpp
index 64f5762cdcc..9e9d41b65bb 100644
--- a/engines/chewy/rooms/room73.cpp
+++ b/engines/chewy/rooms/room73.cpp
@@ -118,7 +118,7 @@ void Room73::moveBushes() {
_G(atds)->delControlBit(432, ATS_ACTIVE_BIT); // show skeleton hotspot
_G(det)->showStaticSpr(3); // show skeleton + machete
_G(det)->hideStaticSpr(4); // hide skeleton
- _G(atds)->set_ats_str(430, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(430, 1, ATS_DATA);
}
void Room73::pickupMachete() {
diff --git a/engines/chewy/rooms/room74.cpp b/engines/chewy/rooms/room74.cpp
index 2508441c664..2afd99e1337 100644
--- a/engines/chewy/rooms/room74.cpp
+++ b/engines/chewy/rooms/room74.cpp
@@ -101,7 +101,7 @@ int Room74::proc1() {
_G(gameState)._personHide[P_CHEWY] = false;
_G(det)->startDetail(0, 255, false);
_G(gameState).flags29_1 = true;
- _G(atds)->set_ats_str(435, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(435, 1, ATS_DATA);
} else if (!_G(cur)->usingInventoryCursor() && _G(gameState).R74CutRubberPlant) {
_G(atds)->setControlBit(435, ATS_ACTIVE_BIT);
diff --git a/engines/chewy/rooms/room77.cpp b/engines/chewy/rooms/room77.cpp
index b3a2b88b775..acd4047a137 100644
--- a/engines/chewy/rooms/room77.cpp
+++ b/engines/chewy/rooms/room77.cpp
@@ -35,7 +35,7 @@ void Room77::entry() {
_G(gameState).ScrollxStep = 2;
if (_G(gameState).r76State == 1) {
_G(gameState).flags29_4 = true;
- _G(atds)->set_ats_str(452, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(452, 1, ATS_DATA);
}
if (_G(gameState).flags29_4) {
@@ -75,7 +75,7 @@ int Room77::proc1() {
int diaNr, aniId;
if (_G(gameState).flags29_8) {
start_spz_wait(14, 1, false, P_CHEWY);
- _G(atds)->set_ats_str(463, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(463, 1, ATS_DATA);
_G(gameState).flags29_10 = true;
_G(gameState).flags29_40 = true;
diaNr = 441;
@@ -106,7 +106,7 @@ int Room77::proc2() {
if (_G(gameState).flags29_8) {
start_spz_wait(14, 1, false, P_CHEWY);
delInventory(_G(cur)->getInventoryCursor());
- _G(atds)->set_ats_str(464, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(464, 1, ATS_DATA);
_G(gameState).flags29_20 = true;
_G(gameState).flags29_40 = true;
diaNr = 442;
diff --git a/engines/chewy/rooms/room82.cpp b/engines/chewy/rooms/room82.cpp
index 98188a4ff45..b78533dad01 100644
--- a/engines/chewy/rooms/room82.cpp
+++ b/engines/chewy/rooms/room82.cpp
@@ -125,8 +125,8 @@ void Room82::talkWithDirector() {
transitionAniNr = 7;
_G(gameState).flags30_40 = true;
- _G(atds)->set_ats_str(473, 1, ATS_DATA);
- _G(atds)->set_ats_str(467, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(473, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(467, 1, ATS_DATA);
}
Room66::proc8(2, 7, transitionAniNr, transitionDiaNr);
diff --git a/engines/chewy/rooms/room84.cpp b/engines/chewy/rooms/room84.cpp
index aeaed795185..919fbfb1254 100644
--- a/engines/chewy/rooms/room84.cpp
+++ b/engines/chewy/rooms/room84.cpp
@@ -49,7 +49,7 @@ void Room84::entry() {
_G(gameState).room_e_obj[124].Attribut = EXIT_TOP;
_G(atds)->setControlBit(478, ATS_ACTIVE_BIT);
_G(atds)->setControlBit(479, ATS_ACTIVE_BIT);
- _G(atds)->set_ats_str(485, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(485, 1, ATS_DATA);
_G(det)->showStaticSpr(7);
_G(atds)->delControlBit(481, ATS_ACTIVE_BIT);
@@ -60,13 +60,13 @@ void Room84::entry() {
_G(det)->startDetail(7, 255, false);
_G(atds)->delControlBit(504, ATS_ACTIVE_BIT);
_G(gameState).room_e_obj[124].Attribut = 255;
- _G(atds)->set_ats_str(485, 2, ATS_DATA);
+ _G(atds)->set_all_ats_str(485, 2, ATS_DATA);
}
if (_G(gameState).flags32_40) {
_G(atds)->setControlBit(481, ATS_ACTIVE_BIT);
_G(atds)->setControlBit(482, ATS_ACTIVE_BIT);
- _G(atds)->set_ats_str(485, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(485, 1, ATS_DATA);
_G(gameState).room_e_obj[124].Attribut = EXIT_TOP;
}
@@ -98,7 +98,7 @@ void Room84::entry() {
_G(gameState).flags32_20 = false;
_G(gameState).room_e_obj[124].Attribut = 255;
_G(gameState).room_e_obj[125].Attribut = 255;
- _G(atds)->set_ats_str(485, 2, ATS_DATA);
+ _G(atds)->set_all_ats_str(485, 2, ATS_DATA);
startAadWait(477);
showCur();
} else {
diff --git a/engines/chewy/rooms/room86.cpp b/engines/chewy/rooms/room86.cpp
index c0dab17b3a2..013f483d640 100644
--- a/engines/chewy/rooms/room86.cpp
+++ b/engines/chewy/rooms/room86.cpp
@@ -156,8 +156,8 @@ int Room86::proc2() {
autoMove(3, P_CHEWY);
proc3(true);
_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(atds)->set_all_ats_str(497, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(498, 1, ATS_DATA);
_G(gameState).flags32_2 = true;
_G(gameState).room_e_obj[132].Attribut = EXIT_RIGHT;
start_spz(CH_TALK12, 255, false, P_CHEWY);
diff --git a/engines/chewy/rooms/room87.cpp b/engines/chewy/rooms/room87.cpp
index 93a76d73557..6e2ac27ce6c 100644
--- a/engines/chewy/rooms/room87.cpp
+++ b/engines/chewy/rooms/room87.cpp
@@ -135,7 +135,7 @@ int Room87::proc2(int16 txt_nr) {
autoMove(movNr, P_CHEWY);
delInventory(_G(cur)->getInventoryCursor());
start_spz_wait(14, 1, false, P_CHEWY);
- _G(atds)->set_ats_str(txt_nr, 1, ATS_DATA);
+ _G(atds)->set_all_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);
diff --git a/engines/chewy/rooms/room89.cpp b/engines/chewy/rooms/room89.cpp
index 829ef4f88de..d45ee6abc48 100644
--- a/engines/chewy/rooms/room89.cpp
+++ b/engines/chewy/rooms/room89.cpp
@@ -204,7 +204,7 @@ int Room89::proc4() {
start_spz_wait(13, 1, false, P_CHEWY);
if (_G(gameState).flags33_4) {
- _G(atds)->set_ats_str(514, 2, ATS_DATA);
+ _G(atds)->set_all_ats_str(514, 2, ATS_DATA);
_G(gameState).flags32_80 = true;
_G(det)->hideStaticSpr(6);
new_invent_2_cur(111);
@@ -214,7 +214,7 @@ int Room89::proc4() {
_G(det)->showStaticSpr(5);
_G(det)->showStaticSpr(6);
_G(gameState).flags33_4 = true;
- _G(atds)->set_ats_str(514, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(514, 1, ATS_DATA);
}
showCur();
diff --git a/engines/chewy/rooms/room97.cpp b/engines/chewy/rooms/room97.cpp
index 2faeda9f5e2..2d9b9d8557c 100644
--- a/engines/chewy/rooms/room97.cpp
+++ b/engines/chewy/rooms/room97.cpp
@@ -435,7 +435,7 @@ int Room97::proc6() {
_G(gameState).flags36_2 = true;
_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)->set_all_ats_str(530, 1, 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(det)->hideStaticSpr(17);
startSetAILWait(22, 1, ANI_FRONT);
_G(atds)->setControlBit(538, ATS_ACTIVE_BIT);
- _G(atds)->set_ats_str(530, 2, ATS_DATA);
+ _G(atds)->set_all_ats_str(530, 2, ATS_DATA);
new_invent_2_cur(SLIME_INV);
_G(gameState).flags36_4 = true;
setPersonPos(304, 102, P_CHEWY, P_RIGHT);
@@ -485,9 +485,9 @@ int Room97::proc8() {
_G(gameState).flags36_10 = true;
_G(gameState).flags36_8 = false;
_G(det)->startDetail(12, 255, false);
- _G(atds)->set_ats_str(530, 3, ATS_DATA);
+ _G(atds)->set_all_ats_str(530, 3, ATS_DATA);
_G(atds)->delControlBit(532, ATS_ACTIVE_BIT);
- _G(atds)->set_ats_str(532, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(532, 1, ATS_DATA);
_G(det)->startDetail(6, 255, false);
_G(det)->hideStaticSpr(14);
autoMove(3, P_CHEWY);
diff --git a/engines/chewy/t_event.cpp b/engines/chewy/t_event.cpp
index 8cbcd59c56d..224364e5694 100644
--- a/engines/chewy/t_event.cpp
+++ b/engines/chewy/t_event.cpp
@@ -1050,7 +1050,7 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
case TXT_MARK_USE:
switch (txtNr) {
case 90:
- _G(atds)->set_ats_str(90, TXT_MARK_USE, _G(gameState).R13Band);
+ _G(atds)->set_all_ats_str(90, TXT_MARK_USE, _G(gameState).R13Band);
break;
case 124:
@@ -1072,7 +1072,7 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
case 267:
if (!_G(gameState).R41LolaOk && _G(gameState).R41RepairInfo)
- _G(atds)->set_ats_str(267, 1, ATS_DATA);
+ _G(atds)->set_all_ats_str(267, 1, ATS_DATA);
break;
case 283:
@@ -2240,7 +2240,7 @@ void useItemWithInvItem(int16 itemId) {
case WOOL_INV:
remove_inventory(WOOL_INV);
- _G(atds)->set_ats_str(BOTTLE_INV, 1, INV_ATS_DATA);
+ _G(atds)->set_all_ats_str(BOTTLE_INV, 1, INV_ATS_DATA);
_G(gameState).R56WhiskyMix = true;
break;
@@ -2260,13 +2260,13 @@ void useItemWithInvItem(int16 itemId) {
start_spz(CH_TALK6, 255, false, P_CHEWY);
startAadWait(_G(gameState)._personRoomNr[P_CHEWY] + 350);
_G(flags).InventMenu = true;
- _G(atds)->set_ats_str(ARTIFACT_INV, 1, INV_ATS_DATA);
+ _G(atds)->set_all_ats_str(ARTIFACT_INV, 1, INV_ATS_DATA);
break;
case 88:
_G(gameState).changedArtifactOrigin = true;
startAadWait(350);
- _G(atds)->set_ats_str(ARTIFACT_INV, 1, INV_ATS_DATA);
+ _G(atds)->set_all_ats_str(ARTIFACT_INV, 1, INV_ATS_DATA);
break;
case 102:
diff --git a/engines/chewy/text.cpp b/engines/chewy/text.cpp
index 4eef0ecb952..4778cae46c9 100644
--- a/engines/chewy/text.cpp
+++ b/engines/chewy/text.cpp
@@ -140,9 +140,9 @@ TextEntry *Text::getText(uint chunk, uint entry, int type, int subEntry) {
error("getText(): Invalid chunk number requested, %d (min %d)", chunk, kADSTextMax);
TextEntry *d = new TextEntry();
- const uint8 altSubString = !isInvDesc ?
- getTextId(entry, subEntry, type) :
- getTextId(origChunk, 0, type);
+ uint8 altSubString = !isInvDesc ?
+ getSubtextNum(entry, subEntry, type) :
+ getSubtextNum(origChunk, 0, type);
byte *data = getChunkData(chunk);
byte *ptr = data;
@@ -354,7 +354,7 @@ uint8 setNibble(uint8 value, uint8 subEntry, uint8 nibble) {
return (nibble << 4) | (value & 0x0F);
}
-uint8 Text::getTextId(uint16 entry, uint8 subEntry, uint8 type) {
+uint8 Text::getSubtextNum(uint16 entry, uint8 subEntry, uint8 type) {
if (type != ATS_DATA && type != INV_USE_DATA && type != INV_ATS_DATA)
return 0;
@@ -363,7 +363,7 @@ uint8 Text::getTextId(uint16 entry, uint8 subEntry, uint8 type) {
return getNibble(value, subEntry);
}
-void Text::setTextId(uint16 entry, uint8 subEntry, uint8 strNr, uint8 type) {
+void Text::setSubtextNum(uint16 entry, uint8 subEntry, uint8 strNr, uint8 type) {
if (type != ATS_DATA && type != INV_USE_DATA && type != INV_ATS_DATA)
return;
diff --git a/engines/chewy/text.h b/engines/chewy/text.h
index 7208937a8d2..4448a9e331e 100644
--- a/engines/chewy/text.h
+++ b/engines/chewy/text.h
@@ -106,7 +106,7 @@ public:
void setControlBit(int16 txtNr, int16 bitIdx);
void delControlBit(int16 txtNr, int16 bitIdx);
- void setTextId(uint16 entry, uint8 subEntry, uint8 strNr, uint8 type);
+ void setSubtextNum(uint16 entry, uint8 subEntry, uint8 strNr, uint8 type);
private:
int16 _lastSpeechId = -1;
@@ -115,7 +115,7 @@ private:
uint8 _inventoryUseStrings[INV_USE_ATS_MAX * 3] = { 0 };
uint8 *getBuffer(uint8 type);
- uint8 getTextId(uint16 entry, uint8 subEntry, uint8 type);
+ uint8 getSubtextNum(uint16 entry, uint8 subEntry, uint8 type);
};
} // namespace Chewy
Commit: e1be7d2056f56028064959ddbfcdb9c1f6f22968
https://github.com/scummvm/scummvm/commit/e1be7d2056f56028064959ddbfcdb9c1f6f22968
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-09T22:00:20+02:00
Commit Message:
CHEWY: Renaming
Changed paths:
engines/chewy/text.cpp
engines/chewy/text.h
diff --git a/engines/chewy/text.cpp b/engines/chewy/text.cpp
index 4778cae46c9..c4adff5718a 100644
--- a/engines/chewy/text.cpp
+++ b/engines/chewy/text.cpp
@@ -340,36 +340,36 @@ uint8 *Text::getBuffer(uint8 type) {
}
}
-uint8 getNibble(uint8 value, uint8 subEntry) {
+uint8 getNibble(uint8 curValue, uint8 subEntry) {
if ((subEntry + 1) % 2 == 0)
- return value & 0x0F;
+ return curValue & 0x0F;
else
- return (value >> 4) & 0x0F;
+ return (curValue >> 4) & 0x0F;
}
-uint8 setNibble(uint8 value, uint8 subEntry, uint8 nibble) {
+uint8 setNibble(uint8 curValue, uint8 subEntry, uint8 newValue) {
if ((subEntry + 1) % 2 == 0)
- return (nibble & 0x0F) | (value & 0xF0);
+ return (curValue & 0xF0) | (newValue & 0x0F);
else
- return (nibble << 4) | (value & 0x0F);
+ return (newValue << 4) | (curValue & 0x0F);
}
-uint8 Text::getSubtextNum(uint16 entry, uint8 subEntry, uint8 type) {
- if (type != ATS_DATA && type != INV_USE_DATA && type != INV_ATS_DATA)
+uint8 Text::getSubtextNum(uint16 entry, uint8 txtMode, uint8 bufferType) {
+ if (bufferType != ATS_DATA && bufferType != INV_USE_DATA && bufferType != INV_ATS_DATA)
return 0;
- const uint8 *buffer = getBuffer(type);
- const uint8 value = buffer[(entry * MAX_ATS_STATUS) + (subEntry + 1) / 2];
- return getNibble(value, subEntry);
+ const uint8 *buffer = getBuffer(bufferType);
+ const uint8 curValue = buffer[(entry * MAX_ATS_STATUS) + (txtMode + 1) / 2];
+ return getNibble(curValue, txtMode);
}
-void Text::setSubtextNum(uint16 entry, uint8 subEntry, uint8 strNr, uint8 type) {
- if (type != ATS_DATA && type != INV_USE_DATA && type != INV_ATS_DATA)
+void Text::setSubtextNum(uint16 entry, uint8 txtMode, uint8 strNr, uint8 bufferType) {
+ if (bufferType != ATS_DATA && bufferType != INV_USE_DATA && bufferType != INV_ATS_DATA)
return;
- uint8 *buffer = getBuffer(type);
- const uint8 value = buffer[(entry * MAX_ATS_STATUS) + (subEntry + 1) / 2];
- buffer[(entry * MAX_ATS_STATUS) + (subEntry + 1) / 2] = setNibble(value, subEntry, (uint8)strNr);
+ uint8 *buffer = getBuffer(bufferType);
+ const uint8 curValue = buffer[(entry * MAX_ATS_STATUS) + (txtMode + 1) / 2];
+ buffer[(entry * MAX_ATS_STATUS) + (txtMode + 1) / 2] = setNibble(curValue, txtMode, (uint8)strNr);
}
} // namespace Chewy
diff --git a/engines/chewy/text.h b/engines/chewy/text.h
index 4448a9e331e..1d419afb63f 100644
--- a/engines/chewy/text.h
+++ b/engines/chewy/text.h
@@ -106,7 +106,7 @@ public:
void setControlBit(int16 txtNr, int16 bitIdx);
void delControlBit(int16 txtNr, int16 bitIdx);
- void setSubtextNum(uint16 entry, uint8 subEntry, uint8 strNr, uint8 type);
+ void setSubtextNum(uint16 entry, uint8 txtMode, uint8 strNr, uint8 bufferType);
private:
int16 _lastSpeechId = -1;
@@ -115,7 +115,7 @@ private:
uint8 _inventoryUseStrings[INV_USE_ATS_MAX * 3] = { 0 };
uint8 *getBuffer(uint8 type);
- uint8 getSubtextNum(uint16 entry, uint8 subEntry, uint8 type);
+ uint8 getSubtextNum(uint16 entry, uint8 txtMode, uint8 bufferType);
};
} // namespace Chewy
Commit: 928961f6a7cfe9b8370274c6fb3bfdd6411e87a3
https://github.com/scummvm/scummvm/commit/928961f6a7cfe9b8370274c6fb3bfdd6411e87a3
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-09T22:00:20+02:00
Commit Message:
CHEWY: Fix changing hotspot subtexts - bug #13700
Changed paths:
engines/chewy/text.cpp
engines/chewy/text.h
diff --git a/engines/chewy/text.cpp b/engines/chewy/text.cpp
index c4adff5718a..c1f19ad04de 100644
--- a/engines/chewy/text.cpp
+++ b/engines/chewy/text.cpp
@@ -340,36 +340,38 @@ uint8 *Text::getBuffer(uint8 type) {
}
}
-uint8 getNibble(uint8 curValue, uint8 subEntry) {
+uint8 getNibble(uint8 curValue, int8 subEntry) {
if ((subEntry + 1) % 2 == 0)
return curValue & 0x0F;
else
return (curValue >> 4) & 0x0F;
}
-uint8 setNibble(uint8 curValue, uint8 subEntry, uint8 newValue) {
+uint8 setNibble(uint8 curValue, int8 subEntry, uint8 newValue) {
if ((subEntry + 1) % 2 == 0)
return (curValue & 0xF0) | (newValue & 0x0F);
else
return (newValue << 4) | (curValue & 0x0F);
}
-uint8 Text::getSubtextNum(uint16 entry, uint8 txtMode, uint8 bufferType) {
+uint8 Text::getSubtextNum(uint16 entry, int8 txtMode, uint8 bufferType) {
if (bufferType != ATS_DATA && bufferType != INV_USE_DATA && bufferType != INV_ATS_DATA)
return 0;
+ const int8 mode = txtMode == -1 ? 0 : txtMode;
const uint8 *buffer = getBuffer(bufferType);
- const uint8 curValue = buffer[(entry * MAX_ATS_STATUS) + (txtMode + 1) / 2];
- return getNibble(curValue, txtMode);
+ const uint8 curValue = buffer[(entry * MAX_ATS_STATUS) + (mode + 1) / 2];
+ return getNibble(curValue, mode);
}
-void Text::setSubtextNum(uint16 entry, uint8 txtMode, uint8 strNr, uint8 bufferType) {
+void Text::setSubtextNum(uint16 entry, int8 txtMode, uint8 strNr, uint8 bufferType) {
if (bufferType != ATS_DATA && bufferType != INV_USE_DATA && bufferType != INV_ATS_DATA)
return;
+ const int8 mode = txtMode == -1 ? 0 : txtMode;
uint8 *buffer = getBuffer(bufferType);
- const uint8 curValue = buffer[(entry * MAX_ATS_STATUS) + (txtMode + 1) / 2];
- buffer[(entry * MAX_ATS_STATUS) + (txtMode + 1) / 2] = setNibble(curValue, txtMode, (uint8)strNr);
+ const uint8 curValue = buffer[(entry * MAX_ATS_STATUS) + (mode + 1) / 2];
+ buffer[(entry * MAX_ATS_STATUS) + (mode + 1) / 2] = setNibble(curValue, mode, (uint8)strNr);
}
} // namespace Chewy
diff --git a/engines/chewy/text.h b/engines/chewy/text.h
index 1d419afb63f..2db802ad8e6 100644
--- a/engines/chewy/text.h
+++ b/engines/chewy/text.h
@@ -106,7 +106,7 @@ public:
void setControlBit(int16 txtNr, int16 bitIdx);
void delControlBit(int16 txtNr, int16 bitIdx);
- void setSubtextNum(uint16 entry, uint8 txtMode, uint8 strNr, uint8 bufferType);
+ void setSubtextNum(uint16 entry, int8 txtMode, uint8 strNr, uint8 bufferType);
private:
int16 _lastSpeechId = -1;
@@ -115,7 +115,7 @@ private:
uint8 _inventoryUseStrings[INV_USE_ATS_MAX * 3] = { 0 };
uint8 *getBuffer(uint8 type);
- uint8 getSubtextNum(uint16 entry, uint8 txtMode, uint8 bufferType);
+ uint8 getSubtextNum(uint16 entry, int8 txtMode, uint8 bufferType);
};
} // namespace Chewy
More information about the Scummvm-git-logs
mailing list