From b387091a8c02b4c98dee886eb0f7bedee039efda Mon Sep 17 00:00:00 2001 From: Flugente Date: Tue, 7 Jan 2014 20:32:51 +0000 Subject: [PATCH] IDs use NOBODY, profiles use NO_PROFILE git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6735 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Morale.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Tactical/Morale.cpp b/Tactical/Morale.cpp index d28a7cb6..8cb312cb 100644 --- a/Tactical/Morale.cpp +++ b/Tactical/Morale.cpp @@ -1307,35 +1307,35 @@ void HandleSnitchCheck( void ) if( MercThinksDeathRateTooHigh( pSoldier->ubProfile ) ) { // too high, inform - ubSnitchEventsCounter = RememberSnitchableEvent(pSoldier->ubProfile,NOBODY,fSameGroupOnly,SNITCH_DEATH_RATE,SnitchEvents,ubSnitchEventsCounter); + ubSnitchEventsCounter = RememberSnitchableEvent(pSoldier->ubProfile,NO_PROFILE,fSameGroupOnly,SNITCH_DEATH_RATE,SnitchEvents,ubSnitchEventsCounter); } // check his morale vs. his morale tolerance once/day (ignores buddies!) if( MercThinksHisMoraleIsTooLow( pSoldier ) ) { // too low, inform - ubSnitchEventsCounter = RememberSnitchableEvent(pSoldier->ubProfile,NOBODY,fSameGroupOnly,SNITCH_LOW_MORALE,SnitchEvents,ubSnitchEventsCounter); + ubSnitchEventsCounter = RememberSnitchableEvent(pSoldier->ubProfile,NO_PROFILE,fSameGroupOnly,SNITCH_LOW_MORALE,SnitchEvents,ubSnitchEventsCounter); } // check his opinion about player's reputation if( MercThinksBadReputationTooHigh( pSoldier->ubProfile ) ) { // too high, inform - ubSnitchEventsCounter = RememberSnitchableEvent(pSoldier->ubProfile,NOBODY,fSameGroupOnly,SNITCH_REPUTATION,SnitchEvents,ubSnitchEventsCounter); + ubSnitchEventsCounter = RememberSnitchableEvent(pSoldier->ubProfile,NO_PROFILE,fSameGroupOnly,SNITCH_REPUTATION,SnitchEvents,ubSnitchEventsCounter); } // check his opinion about player activity if( MercThinksPlayerIsInactiveTooLong( pSoldier->ubProfile ) ) { // player inactive, inform - ubSnitchEventsCounter = RememberSnitchableEvent(pSoldier->ubProfile,NOBODY,fSameGroupOnly,SNITCH_PROGRESS,SnitchEvents,ubSnitchEventsCounter); + ubSnitchEventsCounter = RememberSnitchableEvent(pSoldier->ubProfile,NO_PROFILE,fSameGroupOnly,SNITCH_PROGRESS,SnitchEvents,ubSnitchEventsCounter); } // check if player owes him money if( MercIsOwedTooMuchMoney( pSoldier->ubProfile ) ) { // player owes him money, inform - ubSnitchEventsCounter = RememberSnitchableEvent(pSoldier->ubProfile,NOBODY,fSameGroupOnly,SNITCH_OWED_MONEY,SnitchEvents,ubSnitchEventsCounter); + ubSnitchEventsCounter = RememberSnitchableEvent(pSoldier->ubProfile,NO_PROFILE,fSameGroupOnly,SNITCH_OWED_MONEY,SnitchEvents,ubSnitchEventsCounter); } // check if contract is running out, and will not renew @@ -1347,7 +1347,7 @@ void HandleSnitchCheck( void ) // Only do this if they don't want to renew..... if ( !WillMercRenew( pSoldier, FALSE ) && !(pSoldier->flags.fSignedAnotherContract) ) { - ubSnitchEventsCounter = RememberSnitchableEvent(pSoldier->ubProfile,NOBODY,fSameGroupOnly,SNITCH_GONNA_QUIT,SnitchEvents,ubSnitchEventsCounter); + ubSnitchEventsCounter = RememberSnitchableEvent(pSoldier->ubProfile,NO_PROFILE,fSameGroupOnly,SNITCH_GONNA_QUIT,SnitchEvents,ubSnitchEventsCounter); } } }