From cf36b8c5d8d32c3336426fd16f9dc9c12027da71 Mon Sep 17 00:00:00 2001 From: Shadooow Date: Sun, 20 Jun 2021 23:10:28 +0000 Subject: [PATCH] fixed breaking prisoners free via doors (check was executed before door status actually changed which is why it failed) also rewritten hardcoded coords to those from Mod_Settings.ini git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9090 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Handle Doors.cpp | 10 +++++----- TileEngine/Explosion Control.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Tactical/Handle Doors.cpp b/Tactical/Handle Doors.cpp index 8f17409a..b88052bd 100644 --- a/Tactical/Handle Doors.cpp +++ b/Tactical/Handle Doors.cpp @@ -1180,11 +1180,6 @@ BOOLEAN HandleDoorsOpenClose( SOLDIERTYPE *pSoldier, INT32 sGridNo, STRUCTURE * ModifyDoorStatus( sGridNo, TRUE, DONTSETDOORSTATUS ); } - if ( gWorldSectorX == 13 && gWorldSectorY == MAP_ROW_I ) - { - DoPOWPathChecks(); - } - if (pSoldier ) { // OK, Are we a player merc or AI? @@ -1290,6 +1285,11 @@ BOOLEAN HandleDoorsOpenClose( SOLDIERTYPE *pSoldier, INT32 sGridNo, STRUCTURE * PlayJA2Sample( uiSoundID, RATE_11025, SoundVolume( MIDVOLUME, sGridNo ), 1, SoundDir( sGridNo ) ); } + if (gWorldSectorX == gModSettings.ubInitialPOWSectorX && gWorldSectorY == gModSettings.ubInitialPOWSectorY && gbWorldSectorZ == 0) + { + DoPOWPathChecks(); + } + } else { diff --git a/TileEngine/Explosion Control.cpp b/TileEngine/Explosion Control.cpp index f84785ac..e8a22d5b 100644 --- a/TileEngine/Explosion Control.cpp +++ b/TileEngine/Explosion Control.cpp @@ -3125,7 +3125,7 @@ void SpreadEffect( INT32 sGridNo, UINT8 ubRadius, UINT16 usItem, UINT8 ubOwner, // if anything has been done to change movement costs and this is a potential POW situation, check // paths for POWs - if ( gWorldSectorX == 13 && gWorldSectorY == MAP_ROW_I ) + if (gWorldSectorX == gModSettings.ubInitialPOWSectorX && gWorldSectorY == gModSettings.ubInitialPOWSectorY && gbWorldSectorZ == 0) { DoPOWPathChecks(); }