From e1d927cb0bef5778aa555e9d4820f3073e9044e4 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 28 Oct 2011 16:15:23 +0200 Subject: [PATCH] race/cts: store UID2Name info prefixed with "/uid2name/" not "uid2name", to not clash in case a map's name starts with "uid2name". --- qcsrc/server/cl_client.qc | 2 +- qcsrc/server/miscfunctions.qc | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index aaca49da6..657334fe8 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -3250,7 +3250,7 @@ void PlayerPostThink (void) self.stored_netname = strzone(uid2name(self.crypto_idfp)); if(self.stored_netname != self.netname) { - db_put(ServerProgsDB, strcat("uid2name", self.crypto_idfp), self.netname); + db_put(ServerProgsDB, strcat("/uid2name/", self.crypto_idfp), self.netname); strunzone(self.stored_netname); self.stored_netname = strzone(self.netname); } diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 8b9cfec12..2fe562774 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -2037,7 +2037,19 @@ void print_to(entity e, string s) string uid2name(string myuid) { string s; - s = db_get(ServerProgsDB, strcat("uid2name", myuid)); + s = db_get(ServerProgsDB, strcat("/uid2name/", myuid)); + + // FIXME remove this later after 0.6 release + // convert old style broken records to correct style + if(s == "") + { + s = db_get(ServerProgsDB, strcat("uid2name", myuid)); + if(s != "") + { + db_put(ServerProgsDB, strcat("/uid2name/", myuid), s); + db_put(ServerProgsDB, strcat("uid2name", myuid), ""); + } + } if(s == "") s = "^1Unregistered Player"; -- 2.39.2