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: FACT_HILLBILLIES_KILLED could be set TRUE even if the hicks were still alive breaking vendor Keith's quest. An additional check prevents this.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7879 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2015-05-27 17:12:04 +00:00
parent effc2d0d58
commit 5c107cee7e
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TacticalAI/NPC.cpp
+11 -7
View File
@@ -3819,15 +3819,19 @@ void HandleVictoryInNPCSector( INT16 sSectorX, INT16 sSectorY, INT16 sSectorZ )
{
// we won over the hillbillies
// set fact they are dead
if( CheckFact( FACT_HILLBILLIES_KILLED, KEITH ) == FALSE )
// silversurfer: Only if Darren and Daryl are dead and we didn't just fight other opponents in their sector!
if ( gMercProfiles[DARREL].bMercStatus == MERC_IS_DEAD && gMercProfiles[DARYL].bMercStatus == MERC_IS_DEAD )
{
SetFactTrue( FACT_HILLBILLIES_KILLED );
}
if( CheckFact( FACT_HILLBILLIES_KILLED, KEITH ) == FALSE )
{
SetFactTrue( FACT_HILLBILLIES_KILLED );
}
// check if keith is out of business
if( CheckFact( FACT_KEITH_OUT_OF_BUSINESS, KEITH ) == TRUE )
{
SetFactFalse( FACT_KEITH_OUT_OF_BUSINESS );
// check if keith is out of business
if( CheckFact( FACT_KEITH_OUT_OF_BUSINESS, KEITH ) == TRUE )
{
SetFactFalse( FACT_KEITH_OUT_OF_BUSINESS );
}
}
}
}