From 38e77c72956c50c4e0d8aff8715d0fb5e3ced83d Mon Sep 17 00:00:00 2001 From: Wanne Date: Wed, 4 Nov 2015 08:12:47 +0000 Subject: [PATCH] Fix: Fixed compilation errors when trying to compile UB version git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8001 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/Game Event Hook.cpp | 5 ++++- Tactical/Overhead.cpp | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Strategic/Game Event Hook.cpp b/Strategic/Game Event Hook.cpp index 9edde3e6..ce199e1c 100644 --- a/Strategic/Game Event Hook.cpp +++ b/Strategic/Game Event Hook.cpp @@ -525,7 +525,9 @@ BOOLEAN ExecuteStrategicEvent( STRATEGICEVENT *pEvent ) case EVENT_PMC_REINFORCEMENT_ARRIVAL: HandlePMCArrival( (UINT8)pEvent->uiParam ); break; - +#ifdef JA2UB + // No Kingpin Events in UB +#else case EVENT_KINGPIN_BOUNTY_INITIAL: // if Kingpin, Angel and Maria are still alive, we can start the quest if ( gMercProfiles[KINGPIN].bMercStatus != MERC_IS_DEAD && !CheckFact( FACT_KINGPIN_DEAD, NO_PROFILE ) && !CheckFact( FACT_KINGPIN_IS_ENEMY, NO_PROFILE ) && @@ -571,6 +573,7 @@ BOOLEAN ExecuteStrategicEvent( STRATEGICEVENT *pEvent ) EndQuest( QUEST_KINGPIN_ANGEL_MARIA, gWorldSectorX, gWorldSectorY ); break; + #endif } gfPreventDeletionOfAnyEvent = fOrigPreventFlag; return TRUE; diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp index 9a594bd2..a135420b 100644 --- a/Tactical/Overhead.cpp +++ b/Tactical/Overhead.cpp @@ -3841,6 +3841,8 @@ void HandleNPCTeamMemberDeath( SOLDIERTYPE *pSoldierOld ) } } +#ifdef JA2UB +#else // if Angel an Maria are dead and the bounty hunter quest is still ongoing, then finish it if ( gubQuest[QUEST_KINGPIN_ANGEL_MARIA] == QUESTINPROGRESS ) { @@ -3854,6 +3856,8 @@ void HandleNPCTeamMemberDeath( SOLDIERTYPE *pSoldierOld ) DeleteStrategicEvent( EVENT_KINGPIN_BOUNTY_END_TIME_PASSED, 0 ); } } +#endif + } else if ( pSoldierOld->bTeam == MILITIA_TEAM ) {