[Scummvm-git-logs] scummvm master -> ebe51eeb1ff08007aef960902ba2ec75824fe284
bluegr
noreply at scummvm.org
Mon Jul 4 05:15:01 UTC 2022
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
9c0f465d98 CHEWY: Rename some variables
ebe51eeb1f CHEWY: Fix gorilla state - bug #13655
Commit: 9c0f465d982f35bae803a1e1c35a1295c8c9ef05
https://github.com/scummvm/scummvm/commit/9c0f465d982f35bae803a1e1c35a1295c8c9ef05
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-07-04T07:14:11+03:00
Commit Message:
CHEWY: Rename some variables
Changed paths:
engines/chewy/ani_dat.h
engines/chewy/r_event.cpp
engines/chewy/rooms/room40.cpp
engines/chewy/rooms/room62.cpp
engines/chewy/rooms/room63.cpp
engines/chewy/rooms/room64.cpp
engines/chewy/rooms/room64.h
engines/chewy/t_event.cpp
engines/chewy/types.h
diff --git a/engines/chewy/ani_dat.h b/engines/chewy/ani_dat.h
index 31d71af550d..a4b297df9b7 100644
--- a/engines/chewy/ani_dat.h
+++ b/engines/chewy/ani_dat.h
@@ -105,7 +105,7 @@ namespace Chewy {
#define SIB_LAMPE_R52 86
#define SIB_AUSRUEST_R51 87
#define SIB_KAUTABAK_R56 88
-#define SIB_ASCHE_R64 89
+#define SIB_ASHTRAY_R64 89
#define SIB_PIRANHA 90
#define SIB_SCHALL 91
#define SIB_ARTEFAKT 92
diff --git a/engines/chewy/r_event.cpp b/engines/chewy/r_event.cpp
index 4c7d551c8b8..ecacd2e0f46 100644
--- a/engines/chewy/r_event.cpp
+++ b/engines/chewy/r_event.cpp
@@ -1120,7 +1120,8 @@ int16 sib_event_no_inv(int16 sib_nr) {
_G(gameState).R56GetTabak = true;
break;
- case SIB_ASCHE_R64:
+ case SIB_ASHTRAY_R64:
+ // Pick up ashtray
_G(det)->stop_detail(0);
_G(obj)->hide_sib(sib_nr);
_G(gameState).R64AshtrayTaken = true;
diff --git a/engines/chewy/rooms/room40.cpp b/engines/chewy/rooms/room40.cpp
index 23cc642726b..8e0218b35a0 100644
--- a/engines/chewy/rooms/room40.cpp
+++ b/engines/chewy/rooms/room40.cpp
@@ -54,7 +54,7 @@ void Room40::entry(int16 eib_nr) {
_G(room)->set_timer_status(4, TIMER_STOP);
}
- if (_G(gameState).R40PoliceWeg == false) {
+ if (_G(gameState).R40PoliceAway == false) {
_G(timer_nr)[0] = _G(room)->set_timer(255, 10);
_G(atds)->delControlBit(275, ATS_ACTIVE_BIT);
} else {
@@ -244,7 +244,7 @@ void Room40::setup_func() {
goAutoXy(x, y, P_HOWARD, ANI_GO);
}
- if (_G(gameState).R40PoliceWeg == false) {
+ if (_G(gameState).R40PoliceAway == false) {
if (_G(gameState).R40PoliceStart) {
_G(gameState).R40PoliceStart = false;
_G(gameState).R40PoliceAniStatus = POLICE_LEFT;
@@ -286,7 +286,7 @@ void Room40::setup_func() {
_G(det)->hideStaticSpr(0);
if (_G(gameState).R40DuengerTele) {
hideCur();
- _G(gameState).R40PoliceWeg = true;
+ _G(gameState).R40PoliceAway = true;
_G(det)->startDetail(17, 255, ANI_FRONT);
startAadWait(226);
_G(det)->stop_detail(17);
@@ -295,7 +295,7 @@ void Room40::setup_func() {
startSetAILWait(10, 1, ANI_FRONT);
_G(person_end_phase)[P_HOWARD] = P_RIGHT;
startAadWait(224);
- _G(gameState).R40PoliceWeg = true;
+ _G(gameState).R40PoliceAway = true;
showCur();
_G(flags).MouseLeft = false;
@@ -339,7 +339,7 @@ int16 Room40::use_mr_pumpkin() {
action_ret = true;
if (_G(gameState).R39TvRecord == 6) {
- if (_G(gameState).R40PoliceWeg == false)
+ if (_G(gameState).R40PoliceAway == false)
use_schalter(227);
else {
hideCur();
@@ -373,7 +373,7 @@ int16 Room40::use_mr_pumpkin() {
int16 Room40::use_schalter(int16 aad_nr) {
int16 action_flag = false;
- if (_G(menu_item) != CUR_HOWARD &&_G(gameState).R40PoliceWeg == false) {
+ if (_G(menu_item) != CUR_HOWARD &&_G(gameState).R40PoliceAway == false) {
action_flag = true;
hideCur();
@@ -417,7 +417,7 @@ int16 Room40::use_schalter(int16 aad_nr) {
}
void Room40::talk_police() {
- if (!_G(gameState).R40PoliceWeg && _G(gameState).R40PoliceAniStatus == 255) {
+ if (!_G(gameState).R40PoliceAway && _G(gameState).R40PoliceAniStatus == 255) {
hideCur();
_G(gameState).R40PoliceStart = false;
_G(room)->set_timer_status(255, TIMER_STOP);
@@ -577,7 +577,7 @@ bool Room40::use_police() {
bool result = false;
if (_G(menu_item) == CUR_HOWARD) {
- if (!_G(gameState).R40PoliceWeg && _G(gameState).R40PoliceAniStatus == 255) {
+ if (!_G(gameState).R40PoliceAway && _G(gameState).R40PoliceAniStatus == 255) {
result = true;
_G(gameState).R40PoliceAb = true;
hideCur();
@@ -607,7 +607,7 @@ bool Room40::use_police() {
int16 Room40::use_tele() {
int16 action_flag = false;
- if (!_G(cur)->usingInventoryCursor() && _G(gameState).R40PoliceWeg == false) {
+ if (!_G(cur)->usingInventoryCursor() && _G(gameState).R40PoliceAway == false) {
action_flag = true;
hideCur();
diff --git a/engines/chewy/rooms/room62.cpp b/engines/chewy/rooms/room62.cpp
index 8859da9d6f7..4fc8c655d07 100644
--- a/engines/chewy/rooms/room62.cpp
+++ b/engines/chewy/rooms/room62.cpp
@@ -31,7 +31,7 @@ namespace Rooms {
void Room62::entry() {
_G(SetUpScreenFunc) = setup_func;
_G(spieler_mi)[P_HOWARD].Mode = true;
- _G(gameState).R62LauraVerwandlung = 0;
+ _G(gameState).R62LauraTransformation = 0;
_G(gameState).room_e_obj[91].Attribut = 255;
if (!_G(gameState).R62FirstEntry) {
_G(gameState).R62TShow = false;
@@ -114,7 +114,7 @@ int16 Room62::use_laura() {
_G(gameState).R64Moni1Ani = 0;
_G(gameState).R64Moni2Ani = 0;
_G(gameState).R62TShow = false;
- _G(gameState).R62LauraVerwandlung = true;
+ _G(gameState).R62LauraTransformation = true;
switchRoom(63);
}
return action_ret;
diff --git a/engines/chewy/rooms/room63.cpp b/engines/chewy/rooms/room63.cpp
index 392a8072bd6..c186bf9da08 100644
--- a/engines/chewy/rooms/room63.cpp
+++ b/engines/chewy/rooms/room63.cpp
@@ -34,7 +34,7 @@ void Room63::entry() {
_G(gameState).ScrollxStep = 2;
_G(r63Schalter) = false;
_G(r63RunDia) = 0;
- if (_G(gameState).R63FxMannWeg)
+ if (_G(gameState).R63FxManAway)
_G(det)->del_static_ani(5);
if (!_G(gameState).R63Uhr) {
hideCur();
@@ -49,10 +49,10 @@ void Room63::entry() {
_G(det)->stop_detail(11);
_G(det)->startDetail(10, 255, ANI_FRONT);
showCur();
- } else if (!_G(gameState).R63Feuer) {
+ } else if (!_G(gameState).R63Fire) {
_G(det)->showStaticSpr(10);
_G(det)->showStaticSpr(12);
- } else if (_G(gameState).R62LauraVerwandlung) {
+ } else if (_G(gameState).R62LauraTransformation) {
_G(atds)->setControlBit(383, ATS_ACTIVE_BIT);
_G(SetUpScreenFunc) = setup_func;
cur_2_inventory();
@@ -66,7 +66,7 @@ void Room63::entry() {
}
void Room63::setup_func() {
- if (!_G(gameState).R62LauraVerwandlung)
+ if (!_G(gameState).R62LauraTransformation)
return;
cur_2_inventory();
@@ -130,7 +130,7 @@ void Room63::setup_func() {
}
void Room63::bork_platt() {
- _G(gameState).R62LauraVerwandlung = false;
+ _G(gameState).R62LauraTransformation = false;
_G(r63Schalter) = false;
_G(gameState).room_e_obj[95].Attribut = EXIT_TOP;
flic_cut(FCUT_081);
@@ -208,7 +208,7 @@ int16 Room63::use_fx_man() {
startAadWait(362);
_G(det)->stop_detail(7);
startSetAILWait(8, 1, ANI_FRONT);
- _G(gameState).R63FxMannWeg = true;
+ _G(gameState).R63FxManAway = true;
_G(atds)->setControlBit(384, ATS_ACTIVE_BIT);
showCur();
}
@@ -219,8 +219,8 @@ int16 Room63::use_schalter() {
int16 action_ret = false;
if (!_G(cur)->usingInventoryCursor()) {
action_ret = true;
- if (_G(gameState).R63FxMannWeg) {
- if (_G(gameState).R62LauraVerwandlung) {
+ if (_G(gameState).R63FxManAway) {
+ if (_G(gameState).R62LauraTransformation) {
_G(r63Schalter) = true;
hideCur();
_G(flags).MainInput = false;
@@ -296,7 +296,7 @@ int16 Room63::use_aschenbecher() {
action_ret = true;
hideCur();
if (_G(gameState).R63Uhr) {
- if (_G(gameState).R63FxMannWeg) {
+ if (_G(gameState).R63FxManAway) {
autoMove(5, P_CHEWY);
delInventory(_G(cur)->getInventoryCursor());
_G(flags).NoScroll = true;
@@ -313,7 +313,7 @@ int16 Room63::use_aschenbecher() {
_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).R63Fire = true;
_G(gameState)._personHide[P_CHEWY] = false;
_G(gameState).scrollx = 0;
setPersonPos(187, 42, P_CHEWY, P_RIGHT);
diff --git a/engines/chewy/rooms/room64.cpp b/engines/chewy/rooms/room64.cpp
index de1c2d7b130..dd137daa30e 100644
--- a/engines/chewy/rooms/room64.cpp
+++ b/engines/chewy/rooms/room64.cpp
@@ -37,13 +37,13 @@ void Room64::entry() {
if (!_G(gameState).R64AshtrayTaken)
_G(det)->startDetail(0, 255, false);
- if (!_G(gameState).R64ManWeg) {
+ if (!_G(gameState).R64ManAway) {
_G(timer_nr)[0] = _G(room)->set_timer(1, 10);
_G(det)->set_static_ani(1, -1);
chewy_entry();
- if (_G(gameState).R63Feuer) {
+ if (_G(gameState).R63Fire) {
flic_cut(FCUT_078);
- _G(gameState).R64ManWeg = true;
+ _G(gameState).R64ManAway = true;
_G(det)->del_static_ani(1);
_G(room)->set_timer_status(1, TIMER_STOP);
_G(atds)->setControlBit(376, ATS_ACTIVE_BIT);
@@ -123,12 +123,8 @@ void Room64::setup_func() {
--_G(r62Delay);
}
-void Room64::talk_man() {
- talk_man(350);
-}
-
void Room64::talk_man(int16 aad_nr) {
- if (!_G(gameState).R64ManWeg) {
+ if (!_G(gameState).R64ManAway) {
hideCur();
autoMove(4, P_CHEWY);
_G(room)->set_timer_status(1, TIMER_STOP);
@@ -143,11 +139,11 @@ void Room64::talk_man(int16 aad_nr) {
}
}
-int16 Room64::use_tasche() {
+int16 Room64::useBag() {
int16 action_ret = false;
hideCur();
if (!_G(cur)->usingInventoryCursor()) {
- if (_G(gameState).R64ManWeg) {
+ if (_G(gameState).R64ManAway) {
if (!_G(atds)->getControlBit(375, ATS_ACTIVE_BIT)) {
autoMove(3, P_CHEWY);
start_spz_wait(CH_ROCK_GET1, 1, false, P_CHEWY);
diff --git a/engines/chewy/rooms/room64.h b/engines/chewy/rooms/room64.h
index 172d3765b61..2e69828d229 100644
--- a/engines/chewy/rooms/room64.h
+++ b/engines/chewy/rooms/room64.h
@@ -33,8 +33,7 @@ private:
public:
static void entry();
- static int16 use_tasche();
- static void talk_man();
+ static int16 useBag();
static void talk_man(int16 aad_nr);
};
diff --git a/engines/chewy/t_event.cpp b/engines/chewy/t_event.cpp
index 4603f15349c..144c34221e1 100644
--- a/engines/chewy/t_event.cpp
+++ b/engines/chewy/t_event.cpp
@@ -551,7 +551,7 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
break;
case 375:
- retValue = Room64::use_tasche();
+ retValue = Room64::useBag();
break;
case 380:
@@ -916,7 +916,7 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
break;
case 376:
- Room64::talk_man();
+ Room64::talk_man(350);
break;
case 380:
diff --git a/engines/chewy/types.h b/engines/chewy/types.h
index 69d6d7c7be9..8bb814c0ff4 100644
--- a/engines/chewy/types.h
+++ b/engines/chewy/types.h
@@ -182,7 +182,7 @@ struct GameFlags {
bool R40TrainOk : 1;
bool R40Geld : 1;
bool R40PoliceStart : 1;
- bool R40PoliceWeg : 1;
+ bool R40PoliceAway : 1;
bool R40PoliceAb : 1;
bool R40Wettbewerb : 1;
@@ -253,12 +253,12 @@ struct GameFlags {
bool R62Flucht : 1;
bool R62FirstEntry : 1;
bool R62TShow : 1;
- bool R62LauraVerwandlung : 1;
- bool R63Feuer : 1;
- bool R63FxMannWeg : 1;
+ bool R62LauraTransformation : 1;
+ bool R63Fire : 1;
+ bool R63FxManAway : 1;
bool R63Uhr : 1;
- bool R64ManWeg : 1;
+ bool R64ManAway : 1;
bool flags26_4 : 1;
bool flags26_8 : 1;
bool flags26_10 : 1;
@@ -366,7 +366,7 @@ struct GameFlags {
bool flags37_40 : 1;
bool flags37_80 : 1;
- bool R64AshtrayTaken : 1;
+ bool R64AshtrayTaken : 1; // picked up ashtray in TV room
bool flags38_2 : 1;
uint8 flags38_unused : 6;
Commit: ebe51eeb1ff08007aef960902ba2ec75824fe284
https://github.com/scummvm/scummvm/commit/ebe51eeb1ff08007aef960902ba2ec75824fe284
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-07-04T08:14:27+03:00
Commit Message:
CHEWY: Fix gorilla state - bug #13655
Changed paths:
engines/chewy/rooms/room56.cpp
engines/chewy/rooms/room80.cpp
engines/chewy/rooms/room81.cpp
engines/chewy/rooms/room84.cpp
engines/chewy/rooms/room88.cpp
engines/chewy/types.h
diff --git a/engines/chewy/rooms/room56.cpp b/engines/chewy/rooms/room56.cpp
index 835f008b200..5240db78118 100644
--- a/engines/chewy/rooms/room56.cpp
+++ b/engines/chewy/rooms/room56.cpp
@@ -162,7 +162,6 @@ void Room56::entry() {
case 1:
_G(gameState)._personRoomNr[P_HOWARD] = 66;
_G(gameState)._personRoomNr[P_NICHELLE] = 66;
- _G(gameState).r88DestRoom = 82;
_G(out)->setPointer(nullptr);
_G(out)->cls();
_G(flags).NoPalAfterFlc = true;
diff --git a/engines/chewy/rooms/room80.cpp b/engines/chewy/rooms/room80.cpp
index 9293253f511..dedaa32eda2 100644
--- a/engines/chewy/rooms/room80.cpp
+++ b/engines/chewy/rooms/room80.cpp
@@ -61,7 +61,7 @@ void Room80::entry() {
_G(gameState).ZoomXy[P_NICHELLE][1] = 40;
_G(zoom_horizont) = 0;
- if (_G(gameState).r88DestRoom == 84)
+ if (_G(gameState).R88UsedMonkey)
_G(det)->showStaticSpr(3);
else
_G(det)->showStaticSpr(4);
diff --git a/engines/chewy/rooms/room81.cpp b/engines/chewy/rooms/room81.cpp
index ff16bac9dde..c0471cdf66c 100644
--- a/engines/chewy/rooms/room81.cpp
+++ b/engines/chewy/rooms/room81.cpp
@@ -38,7 +38,8 @@ void Room81::entry() {
_G(flags).ZoomMov = true;
_G(zoom_mov_fak) = 3;
_G(gameState).DiaAMov = 0;
- if (_G(gameState).r88DestRoom == 84) {
+
+ if (_G(gameState).R88UsedMonkey) {
_G(det)->showStaticSpr(0);
_G(atds)->delControlBit(488, ATS_ACTIVE_BIT);
}
diff --git a/engines/chewy/rooms/room84.cpp b/engines/chewy/rooms/room84.cpp
index a0036e50be3..0246e354cf3 100644
--- a/engines/chewy/rooms/room84.cpp
+++ b/engines/chewy/rooms/room84.cpp
@@ -39,7 +39,7 @@ void Room84::entry() {
_G(zoom_mov_fak) = 3;
_G(spieler_mi)[P_HOWARD].Mode = true;
_G(spieler_mi)[P_NICHELLE].Mode = true;
- _G(gameState).R84GoonsPresent = false;
+ _G(gameState).R84GoonsPresent = !_G(gameState).R88UsedMonkey;
_flag = false;
g_engine->_sound->playSound(0, 0);
@@ -49,7 +49,11 @@ 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_ats_str(485, 1, ATS_DATA);
+
+ _G(det)->showStaticSpr(7);
+ _G(atds)->delControlBit(481, ATS_ACTIVE_BIT);
+ _G(atds)->delControlBit(482, ATS_ACTIVE_BIT);
}
if (_G(gameState).flags32_10) {
@@ -59,12 +63,6 @@ void Room84::entry() {
_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);
- _G(atds)->delControlBit(482, ATS_ACTIVE_BIT);
- }
-
if (_G(gameState).flags32_40) {
_G(atds)->setControlBit(481, ATS_ACTIVE_BIT);
_G(atds)->setControlBit(482, ATS_ACTIVE_BIT);
diff --git a/engines/chewy/rooms/room88.cpp b/engines/chewy/rooms/room88.cpp
index ce6c610bb27..fe88d6d200e 100644
--- a/engines/chewy/rooms/room88.cpp
+++ b/engines/chewy/rooms/room88.cpp
@@ -37,8 +37,6 @@ void Room88::entry() {
setPersonPos(91, 110, P_NICHELLE, P_RIGHT);
_G(det)->showStaticSpr(1 + (_G(gameState).flags30_10 ? 1 : 0));
- if (_G(gameState).r88DestRoom == 0)
- _G(gameState).r88DestRoom = 82;
_G(SetUpScreenFunc) = calc_person_look;
@@ -50,10 +48,8 @@ void Room88::entry() {
void Room88::xit() {
_G(gameState).flags31_8 = true;
- _G(gameState)._personRoomNr[P_HOWARD] = _G(gameState).r88DestRoom;
-
- if (_G(gameState)._personRoomNr[P_NICHELLE] == 88)
- _G(gameState)._personRoomNr[P_NICHELLE] = _G(gameState)._personRoomNr[P_HOWARD];
+ _G(gameState)._personRoomNr[P_HOWARD] = _G(gameState).R88UsedMonkey ? 84 : 82;
+ _G(gameState)._personRoomNr[P_NICHELLE] = _G(gameState)._personRoomNr[P_HOWARD];
}
int Room88::proc1() {
@@ -62,7 +58,7 @@ int Room88::proc1() {
hideCur();
autoMove(0, P_CHEWY);
- switchRoom(_G(gameState).r88DestRoom);
+ switchRoom(_G(gameState).R88UsedMonkey ? 84 : 82);
_G(menu_item) = CUR_WALK;
cursorChoice(CUR_WALK);
showCur();
@@ -142,7 +138,6 @@ int Room88::proc3() {
_G(gameState)._personRoomNr[P_HOWARD] = 88;
_G(gameState)._personRoomNr[P_NICHELLE] = 88;
switchRoom(88);
- _G(gameState).r88DestRoom = 84;
_G(gameState).R88UsedMonkey = true;
_G(gameState).flags32_1 = false;
}
diff --git a/engines/chewy/types.h b/engines/chewy/types.h
index 8bb814c0ff4..42000ef1a28 100644
--- a/engines/chewy/types.h
+++ b/engines/chewy/types.h
@@ -485,8 +485,6 @@ struct GameState : public GameFlags {
// ---- //
int16 R79Val[3] = {0, 0, 0};
// ---- //
- int16 r88DestRoom = 0;
- // ---- //
int r90_Array187030[8][4] = {
{0, 1, 180, 190},
{0, 1, 60, 60},
More information about the Scummvm-git-logs
mailing list