libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-07 02:12:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CHEWY: Shift global into room 91 local

Browse Source
This commit is contained in:
Paul Gilbert 2022-01-31 17:58:07 -08:00
parent 2399a8aa87
commit 34b2dcdd39
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/chewy/rooms/room50.cpp
View File

@ -43,7 +43,7 @@ void Room50::entry(int16 eib_nr) {
hide_cur();
stop_page();
_G(maus_links_click) = false;
set_person_pos(0, 64, P_HOWARD, P_RIGHT);
set_person_pos(1, 64, P_HOWARD, P_RIGHT);
set_person_pos(92, 123, P_CHEWY, P_LEFT);
start_aad_wait(510, -1);
out->setze_zeiger(nullptr);

14
engines/chewy/rooms/room91.cpp
View File

@ -28,13 +28,15 @@
namespace Chewy {
namespace Rooms {
int16 Room91::_click;
void Room91::entry() {
_G(zoom_horizont) = 110;
flags.ZoomMov = true;
_G(zoom_mov_fak) = 3;
_G(spieler).ScrollxStep = 2;
SetUpScreenFunc = setup_func;
_G(spieler).r91_word18DB2A = 0;
_click = 0;
_G(spieler).ZoomXy[P_HOWARD][0] = _G(spieler).ZoomXy[P_HOWARD][1] = 30;
spieler_mi[P_HOWARD].Mode = true;
@ -105,17 +107,17 @@ void Room91::setup_func() {
cur_2_inventory();
cursor_wahl(CUR_22);
if (_G(maus_links_click) == 0 || _G(spieler).r91_word18DB2A)
if (_G(maus_links_click) == 0 || _click)
return;
const int old_r91_word18DB2A = _G(spieler).r91_word18DB2A;
_G(maus_links_click) = old_r91_word18DB2A;
_G(spieler).r91_word18DB2A = 1;
const int oldClick = _click;
_G(maus_links_click) = oldClick;
_click = 1;
const int aniNr = 1 + (minfo.y <= 100 ? 1 : 0);
hide_cur();
det->stop_detail(0);
start_detail_wait(aniNr, 1, ANI_VOR);
_G(spieler).r91_word18DB2A = old_r91_word18DB2A;
_click = oldClick;
det->start_detail(0, 255, false);
det->start_detail(aniNr + 2, 1, false);
det->start_detail(7, 1, false);

3
engines/chewy/rooms/room91.h
View File

@ -26,6 +26,9 @@ namespace Chewy {
namespace Rooms {
class Room91 {
private:
static int16 _click;
public:
static void entry();
static void xit(int16 eib_nr);

2
engines/chewy/types.h
View File

@ -510,8 +510,6 @@ struct Spieler : public SpielerFlags {
{0, 1, 170, 190}
};
// ---- //
int r91_word18DB2A = 0;
// ---- //
int r93_word18DB2C = 0;
// ---- //