libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-05-13 17:46:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LURE: Partial fix for #3008511 Goewin getting stuck

Browse Source 
This workaround prevents the Weregate from closing whilst Goewin is still within it

svn-id: r52971
This commit is contained in:
Paul Gilbert 2010-10-02 00:08:13 +00:00
parent 1177692701
commit f94752f752
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/lure/hotspots.h
View File

@ -236,7 +236,6 @@ private:
BarPlaceResult getBarPlace();
bool findClearBarPlace();
bool characterWalkingCheck(uint16 id);
bool doorCloseCheck(uint16 doorId);
void resetDirection();
// Action set
@ -450,6 +449,7 @@ public:
void updateMovement();
void updateMovement2(CharacterMode value);
void resetPosition();
bool doorCloseCheck(uint16 doorId);
void doAction();
void doAction(Action action, HotspotData *hotspot);

10
engines/lure/scripts.cpp
View File

@ -901,6 +901,16 @@ uint16 Script::execute(uint16 startOffset) {
uint16 offset = startOffset;
bool breakFlag = false;
// WORKAROUND: Prevents the Weregate door closing prematurely
if (startOffset == 3941) {
Hotspot *goewinHotspot = r.getActiveHotspot(GOEWIN_ID);
if (!goewinHotspot->doorCloseCheck(10025)) {
// Goewin is still blocking the door, so reschedule the closing
r.delayList().add(1, startOffset, false);
return 0;
}
}
param = 0;
fields.setField(SEQUENCE_RESULT, 0);