mirror of
https://github.com/1dot13/source.git
synced 2026-08-19 14:20:30 +02:00
-added ENABLE_CREPITUS flag to options ini file to enable/disable crepitus even in sci-fi mode
-fixed BR's not stocking things later in game if they were illegal when game started git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@425 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -2594,7 +2594,7 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
|
||||
break;
|
||||
case NPC_ACTION_NO_SCI_FI_END_MEANWHILE:
|
||||
|
||||
if ( !( gGameOptions.ubGameStyle == STYLE_SCIFI ) )
|
||||
if ( !( gGameOptions.ubGameStyle == STYLE_SCIFI && gGameExternalOptions.fEnableCrepitus) )
|
||||
{
|
||||
// End meanwhile....
|
||||
// End meanwhile....
|
||||
@@ -3892,7 +3892,7 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
|
||||
break;
|
||||
|
||||
case NPC_ACTION_TRIGGER_MICKY_BY_SCI_FI:
|
||||
if ( gGameOptions.ubGameStyle == STYLE_SCIFI )
|
||||
if ( gGameOptions.ubGameStyle == STYLE_SCIFI && gGameExternalOptions.fEnableCrepitus)
|
||||
{
|
||||
TriggerNPCRecord( MICKY, 7 );
|
||||
}
|
||||
|
||||
+1
-1
@@ -1188,7 +1188,7 @@ BOOLEAN ItemIsLegal( UINT16 usItemIndex )
|
||||
}
|
||||
}
|
||||
|
||||
if ( gGameOptions.ubGameStyle == STYLE_REALISTIC && Item[usItemIndex].scifi )
|
||||
if ( gGameOptions.ubGameStyle != STYLE_SCIFI && Item[usItemIndex].scifi )
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@@ -946,6 +946,10 @@ BOOLEAN TurnSoldierIntoCorpse( SOLDIERTYPE *pSoldier, BOOLEAN fRemoveMerc, BOOLE
|
||||
// Make team look for items
|
||||
AllSoldiersLookforItems( TRUE );
|
||||
|
||||
//Madd: set warning value to signal other enemies
|
||||
if( pSoldier->bTeam == ENEMY_TEAM )
|
||||
Corpse.ubAIWarningValue = 20;
|
||||
|
||||
//if we are to call TacticalRemoveSoldier after adding the corpse
|
||||
if( fRemoveMerc )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user