1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

New door handling from r7872 will now only happen in turn based combat.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7874 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2015-05-22 07:28:19 +00:00
parent 2470880bae
commit e370e21f5f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Handle Doors.cpp
+3 -3
View File
@@ -774,7 +774,7 @@ BOOLEAN HandleOpenableStruct( SOLDIERTYPE *pSoldier, INT32 sGridNo, STRUCTURE *p
pSoldier->DoMercBattleSound( BATTLE_SOUND_COOL1 );
//ScreenMsg( MSG_FONT_YELLOW, MSG_INTERFACE, TacticalStr[ DOOR_LOCK_DESTROYED_STR ] );
// silversurfer: changed this so the merc can blow a lock without directly opening the door and remain helpless with no AP to do something. Doors have usKeyItem > 0.
if ( LockTable[ pDoor->ubLockID ].usKeyItem == 0 )
if ( LockTable[ pDoor->ubLockID ].usKeyItem == 0 || !((gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT)) )
fHandleDoor = TRUE;
}
else
@@ -804,7 +804,7 @@ BOOLEAN HandleOpenableStruct( SOLDIERTYPE *pSoldier, INT32 sGridNo, STRUCTURE *p
pSoldier->DoMercBattleSound( BATTLE_SOUND_COOL1 );
//ScreenMsg( MSG_FONT_YELLOW, MSG_INTERFACE, TacticalStr[ DOOR_LOCK_HAS_BEEN_PICKED_STR ] );
// silversurfer: changed this so the merc can pick a lock without directly opening the door and remain helpless with no AP to do something. Doors have usKeyItem > 0.
if ( LockTable[ pDoor->ubLockID ].usKeyItem == 0 )
if ( LockTable[ pDoor->ubLockID ].usKeyItem == 0 || !((gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT)) )
fHandleDoor = TRUE;
}
else
@@ -895,7 +895,7 @@ BOOLEAN HandleOpenableStruct( SOLDIERTYPE *pSoldier, INT32 sGridNo, STRUCTURE *p
UpdateDoorPerceivedValue( pDoor );
// silversurfer: changed this so the merc can unlock a door without directly opening it and remain helpless with no AP to do something. Doors have usKeyItem > 0.
if ( LockTable[ pDoor->ubLockID ].usKeyItem == 0 )
if ( LockTable[ pDoor->ubLockID ].usKeyItem == 0 || !((gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT)) )
fHandleDoor = TRUE;
}
else