From: terencehill <piuntn@gmail.com>
Date: Mon, 15 Jan 2018 17:25:42 +0000 (+0100)
Subject: Fix compilation broken by the previous merge commit
X-Git-Tag: xonotic-v0.8.5~2378^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=016ac26a8b1326f7a4a8aa9d9792901c93a4ee6f;p=xonotic%2Fxonotic-data.pk3dir.git

Fix compilation broken by the previous merge commit
---

diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc
index 3754897bd..e491a327d 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 690d23ca8..aa6d12a83 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);