From 2c342000c4dbc4b21b484dcf49547ff4c553008a Mon Sep 17 00:00:00 2001 From: MaddMugsy Date: Fri, 8 Jun 2012 20:14:43 +0000 Subject: [PATCH] 1. Fixed victory music playing prematurely when zombies were present 2. Zombies should now moan randomly (same as enemy taunts) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5337 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Overhead.cpp | 4 +++- TacticalAI/AIMain.cpp | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp index a363755c..f1df4ae1 100644 --- a/Tactical/Overhead.cpp +++ b/Tactical/Overhead.cpp @@ -6677,7 +6677,9 @@ BOOLEAN CheckForEndOfBattle( BOOLEAN fAnEnemyRetreated ) return( FALSE ); } - + if ( HostileZombiesPresent() ) //Madd: got tired of the victory music playing right after the zombies arose + return FALSE; + // OK, this is to releave infinate looping...becasue we can kill guys in this function if ( gfKillingGuysForLosingBattle ) { diff --git a/TacticalAI/AIMain.cpp b/TacticalAI/AIMain.cpp index 42202199..dd608752 100644 --- a/TacticalAI/AIMain.cpp +++ b/TacticalAI/AIMain.cpp @@ -2281,6 +2281,8 @@ INT8 ExecuteAction(SOLDIERTYPE *pSoldier) StartEnemyTaunt( pSoldier, TAUNT_SEEK_NOISE ); else if (pSoldier->aiData.bAction == AI_ACTION_RUN_AWAY ) StartEnemyTaunt( pSoldier, TAUNT_RUN_AWAY ); + else if ( pSoldier->IsZombie() ) // Madd: Zombies randomly moan... + pSoldier->DoMercBattleSound( (INT8)( BATTLE_SOUND_LAUGH1 ) ); } } case AI_ACTION_APPROACH_MERC: // walk up to someone to talk