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

Enhanced the change from 7871 as the game doesn't distinguish between doors and containers. They are all "doors" in code terms. Now any "door" that doesn't have a key item assigned is considered a container.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7872 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2015-05-21 18:59:13 +00:00
parent dfc60c4394
commit f24d417ac1
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Handle Doors.cpp
+9 -6
View File
@@ -773,8 +773,9 @@ 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_DESTROYED_STR ] ); //ScreenMsg( MSG_FONT_YELLOW, MSG_INTERFACE, TacticalStr[ DOOR_LOCK_DESTROYED_STR ] );
// silversurfer: removed this so the merc can blow a lock without directly opening the door and remain helpless with no AP to do something // 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.
//fHandleDoor = TRUE; if ( LockTable[ pDoor->ubLockID ].usKeyItem == 0 )
fHandleDoor = TRUE;
} }
else else
{ {
@@ -802,8 +803,9 @@ 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 ] );
// silversurfer: removed this so the merc can pick a lock without directly opening the door and remain helpless with no AP to do something // 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.
//fHandleDoor = TRUE; if ( LockTable[ pDoor->ubLockID ].usKeyItem == 0 )
fHandleDoor = TRUE;
} }
else else
{ {
@@ -892,8 +894,9 @@ BOOLEAN HandleOpenableStruct( SOLDIERTYPE *pSoldier, INT32 sGridNo, STRUCTURE *p
pSoldier->ChangeSoldierState( GetAnimStateForInteraction( pSoldier, fDoor, END_OPEN_DOOR ), 0, FALSE ); pSoldier->ChangeSoldierState( GetAnimStateForInteraction( pSoldier, fDoor, END_OPEN_DOOR ), 0, FALSE );
UpdateDoorPerceivedValue( pDoor ); UpdateDoorPerceivedValue( pDoor );
// silversurfer: removed this so the merc can unlock a door without directly opening it and remain helpless with no AP to do something // 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.
//fHandleDoor = TRUE; if ( LockTable[ pDoor->ubLockID ].usKeyItem == 0 )
fHandleDoor = TRUE;
} }
else else
{ {