From: terencehill <piuntn@gmail.com>
Date: Tue, 24 Apr 2012 21:34:39 +0000 (+0200)
Subject: Fix "sv_cmd records" printing an empty line for every missing record, up to 10
X-Git-Tag: xonotic-v0.7.0~194^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1d7e49d061ce2904d1896d5460452af4f7e1f0b0;p=xonotic%2Fxonotic-data.pk3dir.git

Fix "sv_cmd records" printing an empty line for every missing record, up to 10
---

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index f8697ddcf..65d94820f 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -808,15 +808,15 @@ void spawnfunc_worldspawn (void)
 	addstat(STAT_MOVEVARS_MAXSPEED, AS_FLOAT, stat_sv_maxspeed);
 	addstat(STAT_MOVEVARS_AIRACCEL_QW, AS_FLOAT, stat_sv_airaccel_qw);
 	addstat(STAT_MOVEVARS_AIRSTRAFEACCEL_QW, AS_FLOAT, stat_sv_airstrafeaccel_qw);
-	
+
 	// secrets
 	addstat(STAT_SECRETS_TOTAL, AS_FLOAT, stat_secrets_total);
 	addstat(STAT_SECRETS_FOUND, AS_FLOAT, stat_secrets_found);
-	
+
 	next_pingtime = time + 5;
 
 	detect_maptype();
-	
+
 	// set up information replies for clients and server to use
 	lsmaps_reply = "^7Maps available: ";
 	lsnewmaps_reply = "^7Maps without a record set: ";
@@ -829,18 +829,18 @@ void spawnfunc_worldspawn (void)
 					col = "^2";
 				else
 					col = "^3";
-					
+
 				++j;
-				
+
 				lsmaps_reply = strcat(lsmaps_reply, col, MapInfo_Map_bspname, " ");
-				
+
 				if(g_race && !stof(db_get(ServerProgsDB, strcat(MapInfo_Map_bspname, RACE_RECORD, "time"))))
 					lsnewmaps_reply = strcat(lsnewmaps_reply, col, MapInfo_Map_bspname, " ");
 				else if(g_cts && !stof(db_get(ServerProgsDB, strcat(MapInfo_Map_bspname, CTS_RECORD, "time"))))
 					lsnewmaps_reply = strcat(lsnewmaps_reply, col, MapInfo_Map_bspname, " ");
 			}
 	}
-	
+
 	lsmaps_reply = strzone(strcat(lsmaps_reply, "\n"));
 	lsnewmaps_reply = strzone(strcat(((!g_race && !g_cts) ? "Need to be playing race or CTS for lsnewmaps to work." : lsnewmaps_reply), "\n"));
 
@@ -863,9 +863,11 @@ void spawnfunc_worldspawn (void)
 
 	for(i = 0; i < 10; ++i)
 	{
-		records_reply[i] = strzone(getrecords(i));
+		s = getrecords(i);
+		if (s)
+			records_reply[i] = strzone(s);
 	}
-	
+
 	ladder_reply = strzone(getladder());
 
 	rankings_reply = strzone(getrankings());
@@ -1326,10 +1328,10 @@ float mapvote_initialized;
 void IntermissionThink()
 {
 	FixIntermissionClient(self);
-	
+
 	float server_screenshot = (autocvar_sv_autoscreenshot && self.cvar_cl_autoscreenshot);
 	float client_screenshot = (self.cvar_cl_autoscreenshot == 2);
-	
+
 	if( (server_screenshot || client_screenshot)
 		&& ((self.autoscreenshot > 0) && (time > self.autoscreenshot)) )
 	{