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: Added changes to go_auto_xy

Browse Source
This commit is contained in:
Paul Gilbert
2022-03-03 18:35:14 -08:00
parent f38cd362aa
commit d592ee654a
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/chewy/main.cpp
+8 -5
View File
@@ -1353,18 +1353,21 @@ void go_auto_xy(int16 x, int16 y, int16 p_nr, int16 mode) {
int16 move_status;
int16 tmp;
int16 ende;
if (!flags.ChAutoMovXy) {
if (!_G(stopAutoMove)[p_nr] &&
_G(spieler).PersonRoomNr[p_nr] == _G(spieler).PersonRoomNr[P_CHEWY]) {
move_status = true;
flags.ChAutoMovXy = true;
tmp = _G(maus_links_click);
_G(maus_links_click) = false;
ende = 0;
spieler_mi[p_nr].XyzStart[0] = spieler_vector[p_nr].Xypos[0];
spieler_mi[p_nr].XyzStart[1] = spieler_vector[p_nr].Xypos[1];
spieler_mi[p_nr].XyzEnd[0] = x;
spieler_mi[p_nr].XyzEnd[1] = y;
mov->get_mov_vector((int16
*)spieler_mi[p_nr].XyzStart, spieler_mi[p_nr].Vorschub, &spieler_vector[p_nr]);
mov->get_mov_vector((int16 *)spieler_mi[p_nr].XyzStart,
spieler_mi[p_nr].Vorschub, &spieler_vector[p_nr]);
if (spieler_vector[p_nr].Count)
get_phase(&spieler_vector[p_nr], &spieler_mi[p_nr]);
if (mode == ANI_WAIT) {
@@ -1385,8 +1388,8 @@ void go_auto_xy(int16 x, int16 y, int16 p_nr, int16 mode) {
set_up_screen(DO_SETUP);
}
}
_G(maus_links_click) = tmp;
flags.ChAutoMovXy = false;
}
}
engines/chewy/types.h
+1 -1
View File
@@ -540,7 +540,7 @@ struct Flags {
uint16 StaticUseTxt : 1;
uint16 GedAction : 1;
uint16 ChAutoMov : 1;
uint16 ChAutoMovXy : 1;
uint16 ChAutoMovXy : 1; // TODO: Check removal in favor of stopAutoMove
uint16 BreakAMov : 1;
uint16 AtsAction : 1;