Merged revision(s) 7088 from branches/ja2_source_official_2014:

Radio operator improvements:
- if RADIO_OPERATOR_JAMMING_BLOCKSRADIOBOMBS is TRUE, radio operator jamming will prevent remote activation or defusing of bombs. Quest-related remotes are still active.
- if RADIO_OPERATOR_ENEMY_JAMMINGSETSOFFRADIOBOMBS is TRUE, there is a small chance that jamming enemy radio operators will set of remote bombs/defuses
- removing a radio set from inventory ends scanning/jamming

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7089 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-03-18 22:20:56 +00:00
parent 85b582ed89
commit c9b0c6fc12
4 changed files with 31 additions and 3 deletions
+3 -1
View File
@@ -5023,7 +5023,9 @@ void BombMessageBoxCallBack( UINT8 ubExitValue )
if (Item[ gpTempSoldier->inv[HANDPOS].usItem ].remotetrigger )
{
SetOffBombsByFrequency( gpTempSoldier->ubID, ubExitValue );
// Flugente: jamming can prevent bomb activation
if ( !gSkillTraitValues.fVOJammingBlocksRemoteBombs || !SectorJammed() )
SetOffBombsByFrequency( gpTempSoldier->ubID, ubExitValue );
}
else
{