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

- Fix: Tanks take damage even when crushing down simple wooden fence. (by anv)

Browse Source 
- dynamic opinion events no longer happen for non-player or vehicular characters
- renamed a flag

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7340 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-07-15 21:00:59 +00:00
parent 64bd7f3f07
commit 05cb329230
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/DynamicDialogue.cpp
+10
View File
@@ -1160,6 +1160,16 @@ void AddOpinionEvent( UINT8 usProfileA, UINT8 usProfileB, UINT8 usEvent, BOOLEAN
if ( usEvent >= OPINIONEVENT_MAX )
return;
// we don't want any events for people not on our team or vehicles
SOLDIERTYPE* pSoldier = FindSoldierByProfileID( usProfileA, TRUE );
if ( !pSoldier || pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE )
return;
pSoldier = FindSoldierByProfileID( usProfileB, TRUE );
if ( !pSoldier || pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE )
return;
UINT32 ustmpFlagmask[OPINION_FLAGMASKS_NUMBER];
for ( UINT8 i = 0; i < OPINION_FLAGMASKS_NUMBER; ++i )
{