From: FruitieX <rasse@rasse-laptop.(none)>
Date: Tue, 26 Oct 2010 18:43:00 +0000 (+0300)
Subject: move more rankings code into race_writeTime... hopefully making stuff work
X-Git-Tag: xonotic-v0.1.0preview~202^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=94e835a6d26832fbf3478d208f23ec4d35449839;p=xonotic%2Fxonotic-data.pk3dir.git

move more rankings code into race_writeTime... hopefully making stuff work
---

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index b2149c7af..a0d525298 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -2107,7 +2107,7 @@ float race_readPos(string map, float t) {
 	return 0; // pos is zero if unranked
 }
 
-void race_writeTime(string map, float t, string myuid, float pos)
+void race_writeTime(string map, float t, string myuid)
 {
 	string rr;
 	if(g_cts)
@@ -2115,13 +2115,30 @@ void race_writeTime(string map, float t, string myuid, float pos)
 	else
 		rr = RACE_RECORD;
 
-	if(!pos)
-		pos = race_readPos(map, t);
+	float newpos;
+	newpos = race_readPos(map, t);
 
-	if(pos) { // don't even ALLOW writing unranked times into the db, less stuff to worry about in other code then :-)
-		db_put(ServerProgsDB, strcat(map, rr, "time", ftos(pos)), ftos(t));
-		db_put(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(pos)), myuid);
+	float i, prevpos;
+	for(i = 1; i <= RANKINGS_CNT; ++i)
+	{
+		if(race_readUID(map, i) == myuid)
+			prevpos = i;
 	}
+	if (prevpos) { // player improved his existing record, only have to iterate on ranks between new and old recs
+		for (i = prevpos; i > newpos; --i) {
+			db_put(ServerProgsDB, strcat(map, rr, "time", ftos(i)), ftos(race_readTime(map, i - 1)));
+			db_put(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(i)), race_readUID(map, i - 1));
+		}
+	} else { // player has no ranked record yet
+		for (i = RANKINGS_CNT; i > newpos; --i) {
+			db_put(ServerProgsDB, strcat(map, rr, "time", ftos(i)), ftos(race_readTime(map, i - 1)));
+			db_put(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(i)), race_readUID(map, i - 1));
+		}
+	}
+
+	// store new time itself
+	db_put(ServerProgsDB, strcat(map, rr, "time", ftos(newpos)), ftos(t));
+	db_put(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(newpos)), myuid);
 }
 
 string race_readName(string map, float pos)
diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc
index faeaba930..3786edbe5 100644
--- a/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@ -169,20 +169,9 @@ void race_setTime(string map, float t, string myuid, string mynetname, entity e)
 
 	oldrec = race_readTime(GetMapname(), newpos);
 	oldrec_holder = race_readName(GetMapname(), newpos);
-
-	// move other rankings out of the way
-	if (player_prevpos) { // player improved his existing record, only have to iterate on ranks between new and old recs
-		for (i = player_prevpos; i > newpos; --i) {
-			race_writeTime(GetMapname(), race_readTime(GetMapname(), i-1), race_readUID(GetMapname(), i-1), i);
-		}
-	} else { // player has no ranked record yet
-		for (i = RANKINGS_CNT; i > newpos; --i) {
-			race_writeTime(GetMapname(), race_readTime(GetMapname(), i-1), race_readUID(GetMapname(), i-1), i);
-		}
-	}
 	
 	// store new ranking
-	race_writeTime(GetMapname(), t, myuid, 0); // 0 = autodetect pos
+	race_writeTime(GetMapname(), t, myuid);
 
 	if (newpos == 1) {
 		write_recordmarker(e, time - TIME_DECODE(t), TIME_DECODE(t));