1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed breaking prisoners free via doors (check was executed before door status actually changed which is why it failed)

Browse Source 
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
This commit is contained in:
Shadooow
2021-06-20 23:10:28 +00:00
parent 76429a09b6
commit cf36b8c5d8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Handle Doors.cpp
+5 -5
View File
@@ -1180,11 +1180,6 @@ BOOLEAN HandleDoorsOpenClose( SOLDIERTYPE *pSoldier, INT32 sGridNo, STRUCTURE *
ModifyDoorStatus( sGridNo, TRUE, DONTSETDOORSTATUS ); ModifyDoorStatus( sGridNo, TRUE, DONTSETDOORSTATUS );
} }
if ( gWorldSectorX == 13 && gWorldSectorY == MAP_ROW_I )
{
DoPOWPathChecks();
}
if (pSoldier ) if (pSoldier )
{ {
// OK, Are we a player merc or AI? // 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 ) ); PlayJA2Sample( uiSoundID, RATE_11025, SoundVolume( MIDVOLUME, sGridNo ), 1, SoundDir( sGridNo ) );
} }
if (gWorldSectorX == gModSettings.ubInitialPOWSectorX && gWorldSectorY == gModSettings.ubInitialPOWSectorY && gbWorldSectorZ == 0)
{
DoPOWPathChecks();
}
} }
else else
{ {
TileEngine/Explosion Control.cpp
+1 -1
View File
@@ -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 // if anything has been done to change movement costs and this is a potential POW situation, check
// paths for POWs // paths for POWs
if ( gWorldSectorX == 13 && gWorldSectorY == MAP_ROW_I ) if (gWorldSectorX == gModSettings.ubInitialPOWSectorX && gWorldSectorY == gModSettings.ubInitialPOWSectorY && gbWorldSectorZ == 0)
{ {
DoPOWPathChecks(); DoPOWPathChecks();
} }