From 2a4527fa643b30df53218ddebd04471c4c5afb3f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 2 Sep 2020 14:11:13 -0600
Subject: [PATCH] ok

---
 userraw/maps/mp/bots/_bot_http.gsc    | 55 +--------------
 userraw/maps/mp/bots/_bot_utility.gsc | 96 +++++++++++++++++++--------
 2 files changed, 70 insertions(+), 81 deletions(-)

diff --git a/userraw/maps/mp/bots/_bot_http.gsc b/userraw/maps/mp/bots/_bot_http.gsc
index 2a746cd..509e130 100644
--- a/userraw/maps/mp/bots/_bot_http.gsc
+++ b/userraw/maps/mp/bots/_bot_http.gsc
@@ -1,3 +1,5 @@
+#include maps\mp\bots\_bot_utility;
+
 getRemoteWaypoints(mapname)
 {
   url = "https://raw.githubusercontent.com/ineedbots/iw4x_waypoints/master/" + mapname + "_wp.csv";
@@ -43,35 +45,7 @@ linesToWaypoints(res)
   {
     tokens = tokenizeLine(res.lines[i], ",");
     
-    waypoint = spawnStruct();
-
-    orgStr = tokens[0];
-		orgToks = strtok(orgStr, " ");
-		waypoint.origin = (int(orgToks[0]), int(orgToks[1]), int(orgToks[2]));
-
-		childStr = tokens[1];
-		childToks = strtok(childStr, " ");
-		waypoint.childCount = childToks.size;
-		waypoint.children = [];
-		for( j=0; j<childToks.size; j++ )
-			waypoint.children[j] = int(childToks[j]);
-
-		type = tokens[2];
-		waypoint.type = type;
-
-		anglesStr = tokens[3];
-		if (isDefined(anglesStr) && anglesStr != "")
-		{
-			anglesToks = strtok(anglesStr, " ");
-			waypoint.angles = (int(anglesToks[0]), int(anglesToks[1]), int(anglesToks[2]));
-		}
-
-		javStr = tokens[4];
-		if (isDefined(javStr) && javStr != "")
-		{
-			javToks = strtok(javStr, " ");
-			waypoint.jav_point = (int(javToks[0]), int(javToks[1]), int(javToks[2]));
-    }
+    waypoint = parseTokensIntoWaypoint(tokens);
 
     waypoints[i-1] = waypoint;
   }
@@ -79,29 +53,6 @@ linesToWaypoints(res)
   return waypoints;
 }
 
-tokenizeLine(line, tok)
-{
-  tokens = [];
-
-  token = "";
-  for (i = 0; i < line.size; i++)
-  {
-    c = line[i];
-
-    if (c == tok)
-    {
-      tokens[tokens.size] = token;
-      token = "";
-      continue;
-    }
-
-    token += c;
-  }
-  tokens[tokens.size] = token;
-
-  return tokens;
-}
-
 getLinesFromUrl(url)
 {
   result = spawnStruct();
diff --git a/userraw/maps/mp/bots/_bot_utility.gsc b/userraw/maps/mp/bots/_bot_utility.gsc
index c37b478..08a3c2f 100644
--- a/userraw/maps/mp/bots/_bot_utility.gsc
+++ b/userraw/maps/mp/bots/_bot_utility.gsc
@@ -384,6 +384,65 @@ RoundUp( floatVal )
 		return i;
 }
 
+tokenizeLine(line, tok)
+{
+  tokens = [];
+
+  token = "";
+  for (i = 0; i < line.size; i++)
+  {
+    c = line[i];
+
+    if (c == tok)
+    {
+      tokens[tokens.size] = token;
+      token = "";
+      continue;
+    }
+
+    token += c;
+  }
+  tokens[tokens.size] = token;
+
+  return tokens;
+}
+
+parseTokensIntoWaypoint(tokens)
+{
+	waypoint = spawnStruct();
+
+	orgStr = tokens[0];
+	orgToks = strtok(orgStr, " ");
+	waypoint.origin = (int(orgToks[0]), int(orgToks[1]), int(orgToks[2]));
+
+	childStr = tokens[1];
+	childToks = strtok(childStr, " ");
+	waypoint.childCount = childToks.size;
+	waypoint.children = [];
+	for( j=0; j<childToks.size; j++ )
+		waypoint.children[j] = int(childToks[j]);
+
+	type = tokens[2];
+	waypoint.type = type;
+
+	anglesStr = tokens[3];
+	if (isDefined(anglesStr) && anglesStr != "")
+	{
+		anglesToks = strtok(anglesStr, " ");
+		waypoint.angles = (int(anglesToks[0]), int(anglesToks[1]), int(anglesToks[2]));
+	}
+
+	javStr = tokens[4];
+	if (isDefined(javStr) && javStr != "")
+	{
+		javToks = strtok(javStr, " ");
+		waypoint.jav_point = (int(javToks[0]), int(javToks[1]), int(javToks[2]));
+	}
+
+	return waypoint;
+}
+
+// https://github.com/leiizko/cod4x_lua_plugin/blob/master/LuaScripts/Rotu-R/waypoints.gsc
 wpsFromCSV(mapname)
 {
 	fileName =  "waypoints/"+ toLower(mapname) + "_wp.csv";
@@ -399,35 +458,14 @@ wpsFromCSV(mapname)
 
 	for (i = 1; i <= waypointCount; i++)
 	{
-		waypoint = spawnStruct();
-
-		orgStr = tableLookupByRow(fileName, i, 0);
-		orgToks = strtok(orgStr, " ");
-		waypoint.origin = (int(orgToks[0]), int(orgToks[1]), int(orgToks[2]));
-
-		childStr = tableLookupByRow(fileName, i, 1);
-		childToks = strtok(childStr, " ");
-		waypoint.childCount = childToks.size;
-		waypoint.children = [];
-		for( j=0; j<childToks.size; j++ )
-			waypoint.children[j] = int(childToks[j]);
-
-		type = tableLookupByRow(fileName, i, 2);
-		waypoint.type = type;
-
-		anglesStr = tableLookupByRow(fileName, i, 3);
-		if (anglesStr != "")
-		{
-			anglesToks = strtok(anglesStr, " ");
-			waypoint.angles = (int(anglesToks[0]), int(anglesToks[1]), int(anglesToks[2]));
-		}
-
-		javStr = tableLookupByRow(fileName, i, 4);
-		if (javStr != "")
-		{
-			javToks = strtok(javStr, " ");
-			waypoint.jav_point = (int(javToks[0]), int(javToks[1]), int(javToks[2]));
-		}
+		tokens = [];
+		tokens[tokens.size] = tableLookupByRow(fileName, i, 0);
+		tokens[tokens.size] = tableLookupByRow(fileName, i, 1);
+		tokens[tokens.size] = tableLookupByRow(fileName, i, 2);
+		tokens[tokens.size] = tableLookupByRow(fileName, i, 3);
+		tokens[tokens.size] = tableLookupByRow(fileName, i, 4);
+		
+		waypoint = parseTokensIntoWaypoint(tokens);
 
 		waypoints[i-1] = waypoint;
 	}