From: FruitieX <rasse@rasse-laptop.(none)>
Date: Tue, 26 Oct 2010 11:50:37 +0000 (+0300)
Subject: ladder fixes (hopefully)
X-Git-Tag: xonotic-v0.1.0preview~202^2~29
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1e69841aa48c5f20c383321839e0bc82d79eb6ad;p=xonotic%2Fxonotic-data.pk3dir.git

ladder fixes (hopefully)
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index ee8b487f8..e5af0f3cf 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1603,7 +1603,7 @@ void ClientConnect (void)
 		race_send_speedaward(MSG_ONE);
 
 		speedaward_alltimebest = stof(db_get(ServerProgsDB, strcat(GetMapname(), rr, "speed/speed")));
-		speedaward_alltimebest_holder = db_get(ServerProgsDB, strcat(GetMapname(), rr, "speed/netname"));
+		speedaward_alltimebest_holder = uid2name(db_get(ServerProgsDB, strcat(GetMapname(), rr, "speed/crypto_idfp")));
 		race_send_speedaward_alltimebest(MSG_ONE);
 
 		float i;
diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc
index 376e54f24..d27717623 100644
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@ -1325,7 +1325,6 @@ void SV_PlayerPhysics()
 				speedaward_alltimebest = speedaward_speed;
 				speedaward_alltimebest_holder = speedaward_holder;
 				db_put(ServerProgsDB, strcat(GetMapname(), rr, "speed/speed"), ftos(speedaward_alltimebest));
-				db_put(ServerProgsDB, strcat(GetMapname(), rr, "speed/netname"), speedaward_alltimebest_holder);
 				db_put(ServerProgsDB, strcat(GetMapname(), rr, "speed/crypto_idfp"), speedaward_alltimebest_holder);
 				race_send_speedaward_alltimebest(MSG_ALL);
 			}
diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index b277bb627..0b3501b2f 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -2267,6 +2267,12 @@ string getladder()
     s = "";
     temp_s = "";
 
+    string rr;
+    if(g_cts)
+	rr = CTS_RECORD;
+    else
+	rr = RACE_RECORD;
+
     string myuid;
 
     for (k = 0; k < MapInfo_count; ++k)
@@ -2274,10 +2280,20 @@ string getladder()
         if (MapInfo_Get_ByID(k))
 	{
 		for (i = 0; i <= LADDER_CNT; ++i) { // i = 0 because it is the speed award
-			if(race_readTime(GetMapname(), i) == 0)
-			    break;
+			if(i == 0) // speed award
+			{
+				if(stof(db_get(ServerProgsDB, strcat(GetMapname(), rr, "speed/speed"))) == 0);
+					break;
 
-			myuid = race_readUID(GetMapname(), i);
+				myuid = db_get(ServerProgsDB, strcat(GetMapname(), rr, "speed/crypto_idfp"));
+			}
+			else // normal record, if it exists (else break)
+			{
+				if(race_readTime(GetMapname(), i) == 0)
+				    break;
+
+				myuid = race_readUID(GetMapname(), i);
+			}
 
 			// string s contains:
 			// arg 0 = # of speed recs