1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fix: opinion events on drinking alcohol did not happen

Browse Source 
- Fix: mercs in transit complain about mercs present in Arulco

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7965 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2015-08-09 22:21:37 +00:00
parent 13875810a4
commit 80cf6af0ce
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/DynamicDialogue.cpp
+5 -1
View File
@@ -1675,6 +1675,10 @@ void CheckForFriendsofHated( SOLDIERTYPE* pSoldier )
SOLDIERTYPE* pOtherSoldier; SOLDIERTYPE* pOtherSoldier;
SOLDIERTYPE* pThirdSoldier; SOLDIERTYPE* pThirdSoldier;
// make sure we ourselves aren't in transit
if ( !pSoldier->bActive || pSoldier->ubProfile == NO_PROFILE || pSoldier->bAssignment == IN_TRANSIT || pSoldier->bAssignment == ASSIGNMENT_DEAD )
return;
bMercID = pSoldier->ubID; bMercID = pSoldier->ubID;
bLastTeamID = gTacticalStatus.Team[gbPlayerNum].bLastID; bLastTeamID = gTacticalStatus.Team[gbPlayerNum].bLastID;
@@ -1833,7 +1837,7 @@ void HandleDynamicOpinionRetreat( )
void HandleDynamicOpinionTeamDrinking( SOLDIERTYPE* pSoldier ) void HandleDynamicOpinionTeamDrinking( SOLDIERTYPE* pSoldier )
{ {
// need to be drunk for this // need to be drunk for this
if ( !pSoldier || pSoldier->ubProfile == NO_PROFILE || !pSoldier->newdrugs.drinkstaken <= 0.0 ) if ( !pSoldier || pSoldier->ubProfile == NO_PROFILE || pSoldier->newdrugs.drinkstaken <= 0.0 )
return; return;
SOLDIERTYPE* pTeamSoldier = NULL; SOLDIERTYPE* pTeamSoldier = NULL;