From 4c46054977b3935a757b61c8b3bd8aad90feffef Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sun, 18 Jan 2015 02:50:53 +0000
Subject: [PATCH] If a person kills someone on the same side, they curse
 instead of laugh.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7720 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Soldier Ani.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Tactical/Soldier Ani.cpp b/Tactical/Soldier Ani.cpp
index af22c58f..b7c25a2d 100644
--- a/Tactical/Soldier Ani.cpp	
+++ b/Tactical/Soldier Ani.cpp	
@@ -3724,6 +3724,11 @@ void HandleKilledQuote( SOLDIERTYPE *pKilledSoldier, SOLDIERTYPE *pKillerSoldier
 						TacticalCharacterDialogue( pKillerSoldier, QUOTE_SATISFACTION_WITH_GUN_AFTER_KILL );
 						pKillerSoldier->usQuoteSaidFlags |= SOLDIER_QUOTE_SAID_LIKESGUN;
 					}
+					else if ( pKillerSoldier->bSide == pKilledSoldier->bSide )
+					{
+						// if the attacker was from the same side, play a curse
+						pKillerSoldier->DoMercBattleSound( (INT8)(BATTLE_SOUND_CURSE1) );
+					}
 					else
 						// Randomize between laugh, quote...
 					{
@@ -3896,7 +3901,11 @@ BOOLEAN HandleSoldierDeath( SOLDIERTYPE *pSoldier , BOOLEAN *pfMadeCorpse )
 						// We were a visible enemy, say laugh!
 						if ( Random(3) == 0 && !CREATURE_OR_BLOODCAT( MercPtrs[ ubAttacker ] ) )
 						{
-							MercPtrs[ ubAttacker ]->DoMercBattleSound( BATTLE_SOUND_LAUGH1 );
+							// if the attacker was from the same team, play a curse, otherwise play a laugh
+							if ( MercPtrs[ubAttacker]->bSide == pSoldier->bSide )
+								MercPtrs[ubAttacker]->DoMercBattleSound( BATTLE_SOUND_CURSE1 );
+							else
+								MercPtrs[ ubAttacker ]->DoMercBattleSound( BATTLE_SOUND_LAUGH1 );
 						}
 					}					
 				}