From 2879e6167121b07025a705731b234ed415ec8973 Mon Sep 17 00:00:00 2001
From: savagex <savagex@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Sun, 19 Feb 2006 15:16:54 +0000
Subject: [PATCH] re-included Urre's changes (don't load navnodes when no bots
 are in the game). Taking this out didn't fix the buggy bots at all.

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1093 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/gamec/bots.c | 57 ++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/data/qcsrc/server/gamec/bots.c b/data/qcsrc/server/gamec/bots.c
index 67bf135c8..1afaae79d 100644
--- a/data/qcsrc/server/gamec/bots.c
+++ b/data/qcsrc/server/gamec/bots.c
@@ -153,35 +153,38 @@ void() Bots_Shared =
 		urrebots_combattime = cvar("urrebots_combattime");
 		stratsearch_distance = cvar("urrebots_stratsearch_dist");
 		minisearch_distance = cvar("urrebots_minisearch_dist");
-		if (loadstep == 0)
+		if (cvar("urrebots") || cvar("bot_number"))
 		{
-			LoadNavNodes();
-			loadstep = 1;
-			return;
-		}
-		else if (loadstep == 1)
-		{
-			LinkNavNodes();
-			loadstep = 2;
-			return;
-		}
-		else if (loadstep == 2)
-		{
-			if (navnodes)
-			if (urrebots_navopt)
-				OptimiseNavigation();
-			loadstep = 3;
-			return;
-		}
-		else if (loadstep == 3)
-		{
-			if (navnodes)
-				ItemEvals();
-			loadstep = 4;
-			return;
+			if (loadstep == 0)
+			{
+				LoadNavNodes();
+				loadstep = 1;
+				return;
+			}
+			else if (loadstep == 1)
+			{
+				LinkNavNodes();
+				loadstep = 2;
+				return;
+			}
+			else if (loadstep == 2)
+			{
+				if (navnodes)
+				if (urrebots_navopt)
+					OptimiseNavigation();
+				loadstep = 3;
+				return;
+			}
+			else if (loadstep == 3)
+			{
+				if (navnodes)
+					ItemEvals();
+				loadstep = 4;
+				return;
+			}
 		}
 		f = cvar("urrebots");
-		if (urrebots < f)
+		if (urrebots < f && loadstep == 4)
 		{
 			bot = UrreBotAdd(BOT_TYPE_URREBOT);
 			bot.bot_type = BOT_TYPE_URREBOT;
@@ -206,7 +209,7 @@ void() Bots_Shared =
 		if (f > bot_number)
 		{
 			bot = world;
-			if (navnodes)
+			if (navnodes && loadstep == 4)
 			{
 				bot = UrreBotAdd(BOT_TYPE_AUTOURRE);
 				if (bot)
-- 
2.39.2