1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 6853 from branches/ja2_source_official_2014:

Browse Source 
- Fix: with a very large team in dire circumstances, accumulated snitch events corrupted memory
- Fix: missing morale event handling (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6854 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-01-29 21:31:41 +00:00
parent a9008cf53d
commit 0c03bd402a
3 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Merc Contract.cpp
+1 -1
View File
@@ -777,7 +777,7 @@ void HandleSoldierLeavingWithLowMorale( SOLDIERTYPE *pSoldier )
gMercProfiles[ pSoldier->ubProfile ].ubDaysOfMoraleHangover = (UINT8) (3 + Random(4));
// piss off his buddies too
HandleBuddiesReactionToFiringMerc(pSoldier, MORALE_BUDDY_FIRED_EARLY);
HandleBuddiesReactionToFiringMerc(pSoldier, MORALE_BUDDY_FIRED_ON_BAD_TERMS);
}
}