mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
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
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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 )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user