[nexuiz-commits] r6659 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: mand1nga
Date: 2009-05-04 09:28:11 -0400 (Mon, 04 May 2009)
New Revision: 6659

Modified:
   trunk/data/qcsrc/server/bots.qc
Log:
Fix bug in the loading of hardired links. Also these links are reloaded after saving a new waypoints file.

Modified: trunk/data/qcsrc/server/bots.qc
===================================================================
--- trunk/data/qcsrc/server/bots.qc	2009-05-04 10:18:55 UTC (rev 6658)
+++ trunk/data/qcsrc/server/bots.qc	2009-05-04 13:28:11 UTC (rev 6659)
@@ -940,6 +940,7 @@
 	return TRUE;
 };
 
+float botframe_loadedforcedlinks;
 void waypoint_load_links_hardwired()
 {
 	local string filename, s;
@@ -950,6 +951,8 @@
 	filename = strcat(filename, ".waypoints.hardwired");
 	file = fopen(filename, FILE_READ);
 
+	botframe_loadedforcedlinks = TRUE;
+
 	if (file < 0)
 	{
 		dprint("waypoint links load from ");
@@ -1154,6 +1157,7 @@
 		bprint(" failed\n");
 	}
 	waypoint_save_links();
+	botframe_loadedforcedlinks = FALSE;
 };
 
 // load waypoints from file
@@ -2823,7 +2827,10 @@
 	if (botframe_spawnedwaypoints)
 	{
 		if(botframe_cachedwaypointlinks)
-			waypoint_load_links_hardwired();
+		{
+			if(!botframe_loadedforcedlinks)
+				waypoint_load_links_hardwired();
+		}
 		else
 		{
 			// TODO: Make this check cleaner