From ec7ca32da65d45721c3c7c34d453b9e0bb46a3e5 Mon Sep 17 00:00:00 2001 From: INeedBots Date: Fri, 18 Dec 2020 16:13:57 -0600 Subject: [PATCH] new print func --- main_shared/maps/mp/bots/_bot_http.gsc | 14 +++++++------- main_shared/maps/mp/bots/_bot_utility.gsc | 18 +++++++++++++++--- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/main_shared/maps/mp/bots/_bot_http.gsc b/main_shared/maps/mp/bots/_bot_http.gsc index fb471a4..ebbe01b 100644 --- a/main_shared/maps/mp/bots/_bot_http.gsc +++ b/main_shared/maps/mp/bots/_bot_http.gsc @@ -15,7 +15,7 @@ getRemoteWaypoints(mapname) url = "https://raw.githubusercontent.com/ineedbots/cod4x_waypoints/master/" + mapname + "_wp.csv"; filename = "waypoints/" + mapname + "_wp.csv"; - println("Attempting to get remote waypoints from " + url); + printToConsole("Attempting to get remote waypoints from " + url); res = getLinesFromUrl(url, filename); if (!res.lines.size) @@ -24,7 +24,7 @@ getRemoteWaypoints(mapname) waypointCount = int(res.lines[0]); waypoints = []; - println("Loading remote waypoints..."); + printToConsole("Loading remote waypoints..."); for (i = 1; i <= waypointCount; i++) { @@ -38,7 +38,7 @@ getRemoteWaypoints(mapname) if (waypoints.size) { level.waypoints = waypoints; - println("Loaded " + waypoints.size + " waypoints from remote."); + printToConsole("Loaded " + waypoints.size + " waypoints from remote."); } } @@ -51,18 +51,18 @@ doVersionCheck() if (!isDefined(remoteVersion)) { - println("Error getting remote version of Bot Warfare."); + printToConsole("Error getting remote version of Bot Warfare."); return false; } if (level.bw_VERSION != remoteVersion) { - println("There is a new version of Bot Warfare!"); - println("You are on version " + level.bw_VERSION + " but " + remoteVersion + " is available!"); + printToConsole("There is a new version of Bot Warfare!"); + printToConsole("You are on version " + level.bw_VERSION + " but " + remoteVersion + " is available!"); return false; } - println("You are on the latest version of Bot Warfare!"); + printToConsole("You are on the latest version of Bot Warfare!"); return true; } diff --git a/main_shared/maps/mp/bots/_bot_utility.gsc b/main_shared/maps/mp/bots/_bot_utility.gsc index ab67f24..1c54e5d 100644 --- a/main_shared/maps/mp/bots/_bot_utility.gsc +++ b/main_shared/maps/mp/bots/_bot_utility.gsc @@ -930,6 +930,18 @@ getABotName() return name; } +/* + Prints to the console +*/ +printToConsole(str) +{ +#if isSyscallDefined PrintConsole + PrintConsole( str + "\n" ); +#else + println(str); +#endif +} + /* Read from file a csv, and returns an array of waypoints */ @@ -941,7 +953,7 @@ readWpsFromFile(mapname) if (!FS_TestFile(filename)) return waypoints; - println("Attempting to read waypoints from " + filename); + printToConsole("Attempting to read waypoints from " + filename); csv = FS_FOpen(filename, "read"); @@ -986,7 +998,7 @@ load_waypoints() if (wps.size) { level.waypoints = wps; - println("Loaded " + wps.size + " waypoints from file."); + printToConsole("Loaded " + wps.size + " waypoints from file."); } else { @@ -1061,7 +1073,7 @@ load_waypoints() } if (level.waypoints.size) - println("Loaded " + level.waypoints.size + " waypoints from script."); + printToConsole("Loaded " + level.waypoints.size + " waypoints from script."); } if (!level.waypoints.size)