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

Using shaped charges, keys or lockpicks on a locked door now only unlocks the door. It doesn't automatically open the door anymore. This solves the problem that a merc manages to pick a lock and after automatically opening the door he is a sitting duck because he has no AP left.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2015-05-21 18:26:12 +00:00
parent b2217eaab9
commit dfc60c4394
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Handle Doors.cpp
+8 -5
View File
@@ -771,9 +771,10 @@ BOOLEAN HandleOpenableStruct( SOLDIERTYPE *pSoldier, INT32 sGridNo, STRUCTURE *p
// Attempt to force door // Attempt to force door
if ( AttemptToBlowUpLock( pSoldier, pDoor ) ) if ( AttemptToBlowUpLock( pSoldier, pDoor ) )
{ {
//pSoldier->DoMercBattleSound( BATTLE_SOUND_COOL1 ); pSoldier->DoMercBattleSound( BATTLE_SOUND_COOL1 );
//ScreenMsg( MSG_FONT_YELLOW, MSG_INTERFACE, TacticalStr[ DOOR_LOCK_DESTROYED_STR ] ); //ScreenMsg( MSG_FONT_YELLOW, MSG_INTERFACE, TacticalStr[ DOOR_LOCK_DESTROYED_STR ] );
fHandleDoor = TRUE; // silversurfer: removed this so the merc can blow a lock without directly opening the door and remain helpless with no AP to do something
//fHandleDoor = TRUE;
} }
else else
{ {
@@ -801,7 +802,8 @@ BOOLEAN HandleOpenableStruct( SOLDIERTYPE *pSoldier, INT32 sGridNo, STRUCTURE *p
{ {
pSoldier->DoMercBattleSound( BATTLE_SOUND_COOL1 ); pSoldier->DoMercBattleSound( BATTLE_SOUND_COOL1 );
//ScreenMsg( MSG_FONT_YELLOW, MSG_INTERFACE, TacticalStr[ DOOR_LOCK_HAS_BEEN_PICKED_STR ] ); //ScreenMsg( MSG_FONT_YELLOW, MSG_INTERFACE, TacticalStr[ DOOR_LOCK_HAS_BEEN_PICKED_STR ] );
fHandleDoor = TRUE; // silversurfer: removed this so the merc can pick a lock without directly opening the door and remain helpless with no AP to do something
//fHandleDoor = TRUE;
} }
else else
{ {
@@ -885,12 +887,13 @@ BOOLEAN HandleOpenableStruct( SOLDIERTYPE *pSoldier, INT32 sGridNo, STRUCTURE *p
if ( AttemptToUnlockDoor( pSoldier, pDoor ) ) if ( AttemptToUnlockDoor( pSoldier, pDoor ) )
{ {
//ScreenMsg( MSG_FONT_YELLOW, MSG_INTERFACE, TacticalStr[ DOOR_LOCK_HAS_BEEN_UNLOCKED_STR ] ); //ScreenMsg( MSG_FONT_YELLOW, MSG_INTERFACE, TacticalStr[ DOOR_LOCK_HAS_BEEN_UNLOCKED_STR ] );
//pSoldier->DoMercBattleSound( BATTLE_SOUND_COOL1 ); pSoldier->DoMercBattleSound( BATTLE_SOUND_COOL1 );
pSoldier->ChangeSoldierState( GetAnimStateForInteraction( pSoldier, fDoor, END_OPEN_DOOR ), 0, FALSE ); pSoldier->ChangeSoldierState( GetAnimStateForInteraction( pSoldier, fDoor, END_OPEN_DOOR ), 0, FALSE );
UpdateDoorPerceivedValue( pDoor ); UpdateDoorPerceivedValue( pDoor );
fHandleDoor = TRUE; // silversurfer: removed this so the merc can unlock a door without directly opening it and remain helpless with no AP to do something
//fHandleDoor = TRUE;
} }
else else
{ {