From 016ac26a8b1326f7a4a8aa9d9792901c93a4ee6f Mon Sep 17 00:00:00 2001
From: terencehill <piuntn@gmail.com>
Date: Mon, 15 Jan 2018 18:25:42 +0100
Subject: [PATCH] Fix compilation broken by the previous merge commit
---
qcsrc/server/bot/default/navigation.qc | 2 +-
qcsrc/server/mutators/mutator/gamemode_race.qc | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc
index 3754897bda..e491a327dc 100644
--- a/qcsrc/server/bot/default/navigation.qc
+++ b/qcsrc/server/bot/default/navigation.qc
@@ -1598,7 +1598,7 @@ int navigation_poptouchedgoals(entity this)
if (this.jumppadcount && !boxesoverlap(this.goalcurrent.absmin, this.goalcurrent.absmax,
this.lastteleport_origin + STAT(PL_MIN, this), this.lastteleport_origin + STAT(PL_MAX, this)))
{
- return;
+ return removed_goals;
}
if(this.aistatus & AI_STATUS_WAYPOINT_PERSONAL_GOING)
diff --git a/qcsrc/server/mutators/mutator/gamemode_race.qc b/qcsrc/server/mutators/mutator/gamemode_race.qc
index 690d23ca8b..aa6d12a83e 100644
--- a/qcsrc/server/mutators/mutator/gamemode_race.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_race.qc
@@ -36,6 +36,7 @@ void havocbot_role_race(entity this)
goto search_racecheckpoints;
}
navigation_routerating(this, it, 1000000, 5000);
+ }
});
navigation_goalrating_end(this);
--
2.39.5