ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

CHEWY: Fix array indexing in room 51

Browse Source
This commit is contained in:
Paul Gilbert
2022-03-03 18:36:04 -08:00
parent 2cd8e50d58
commit 77defa5bbf
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/chewy/global.h
-1
View File
@@ -109,7 +109,6 @@ public:
int16 _r65tmp_ho_x = 0;
int16 _r65tmp_ho_y = 0;
int16 _r68HohesC = 0;
bool _r51onOff[5] = {false};
};
extern Globals *g_globals;
engines/chewy/rooms/room51.cpp
+11 -11
View File
@@ -39,7 +39,7 @@ static const AniBlock ABLOCK37[5] = {
};
bool Room51::_flag;
bool Room51::_arr[2];
bool Room51::_enemyFlag[2];
int16 Room51::_tmpx;
int16 Room51::_tmpy;
int Room51::_index;
@@ -64,7 +64,7 @@ void Room51::entry() {
hide_cur();
for (int i = 0; i < 2; ++i) {
_arr[i] = false;
_enemyFlag[i] = false;
_G(timer_nr)[i] = room->set_timer(i + 9, i * 2 + 6);
}
@@ -353,15 +353,15 @@ int16 Room51::cut_serv(int16 frame) {
void Room51::timer_action(int16 t_nr, int16 obj_nr) {
if (obj_nr == 9 || obj_nr == 10) {
assert(t_nr >= 0 && t_nr < 5);
if (!_G(r51onOff)[t_nr]) {
det->start_detail(t_nr, 1, ANI_VOR);
_G(r51onOff)[t_nr] = true;
} else if (!det->get_ani_status(t_nr)) {
det->start_detail(t_nr, 1, ANI_GO);
det->start_detail(t_nr + 2, 1, ANI_VOR);
uhr->reset_timer(obj_nr, 0);
_G(r51onOff)[t_nr] = false;
if (!_enemyFlag[obj_nr - 9]) {
det->start_detail(obj_nr, 1, ANI_VOR);
_enemyFlag[obj_nr - 9] = true;
} else if (!det->get_ani_status(obj_nr)) {
det->start_detail(obj_nr, 1, ANI_GO);
det->start_detail(obj_nr + 2, 1, ANI_VOR);
uhr->reset_timer(t_nr, 0);
_enemyFlag[obj_nr - 9] = false;
}
}
}
engines/chewy/rooms/room51.h
+1 -1
View File
@@ -28,7 +28,7 @@ namespace Rooms {
class Room51 {
private:
static bool _flag;
static bool _arr[2];
static bool _enemyFlag[2];
static int16 _tmpx, _tmpy;
static int _index;