From 4abaadb035542dd3fb294605250c95ed427a0337 Mon Sep 17 00:00:00 2001 From: div0 Date: Fri, 17 Jul 2009 18:08:50 +0000 Subject: [PATCH] split racerecord/ctsrecord DB fields git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7230 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/miscfunctions.qc | 18 +++++++++++++++++- data/qcsrc/server/race.qc | 21 +++++++++++---------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index 0946d233f..33d86da83 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -1964,7 +1964,7 @@ string getrecords() } } - if (g_race || g_cts) + if (g_race) { for (i = 0; i < MapInfo_count; ++i) { @@ -1980,6 +1980,22 @@ string getrecords() } } + if (g_cts) + { + for (i = 0; i < MapInfo_count; ++i) + { + if (MapInfo_Get_ByID(i)) + { + r = stof(db_get(ServerProgsDB, strcat(MapInfo_Map_bspname, "/ctsrecord/time"))); + if (r == 0) + continue; + h = db_get(ServerProgsDB, strcat(MapInfo_Map_bspname, "/ctsrecord/netname")); + s = strcat(s, strpad(32, MapInfo_Map_bspname), " ", strpad(-8, mmsss(r)), " ", h, "\n"); + ++rec; + } + } + } + MapInfo_ClearTemps(); if (s == "") diff --git a/data/qcsrc/server/race.qc b/data/qcsrc/server/race.qc index 14c38d5a6..343acaa41 100644 --- a/data/qcsrc/server/race.qc +++ b/data/qcsrc/server/race.qc @@ -64,10 +64,6 @@ void race_SendNextCheckpoint(entity e, float spec) cp = e.race_checkpoint; recordtime = race_checkpoint_records[cp]; recordholder = race_checkpoint_recordholders[cp]; - /* - recordtime = stof(db_get(ServerProgsDB, strcat(GetMapname(), "/racerecord/", ftos(cp), "/time"))); - recordholder = db_get(ServerProgsDB, strcat(GetMapname(), "/racerecord/", ftos(cp), "/netname")); - */ if(recordholder == e.netname) recordholder = ""; @@ -162,15 +158,20 @@ void race_SendTime(entity e, float cp, float t, float tvalid) { float grecordtime; string grecordholder; - grecordtime = stof(db_get(ServerProgsDB, strcat(GetMapname(), "/racerecord/time"))); - grecordholder = db_get(ServerProgsDB, strcat(GetMapname(), "/racerecord/netname")); + string rr; + if(g_cts) + rr = "/ctsrecord/"; + else + rr = "/racerecord/"; + grecordtime = stof(db_get(ServerProgsDB, strcat(GetMapname(), rr, "time"))); + grecordholder = db_get(ServerProgsDB, strcat(GetMapname(), rr, "netname")); if(grecordholder == e.netname) grecordholder = ""; if(grecordtime == 0) { bprint(e.netname, "^7 set the all-time fastest lap record with ", mmsss(t), "\n"); - db_put(ServerProgsDB, strcat(GetMapname(), "/racerecord/time"), ftos(t)); - db_put(ServerProgsDB, strcat(GetMapname(), "/racerecord/netname"), e.netname); + db_put(ServerProgsDB, strcat(GetMapname(), rr, "time"), ftos(t)); + db_put(ServerProgsDB, strcat(GetMapname(), rr, "netname"), e.netname); write_recordmarker(e, time - t/10, t/10); } else if(t < grecordtime) @@ -179,8 +180,8 @@ void race_SendTime(entity e, float cp, float t, float tvalid) bprint(e.netname, "^7 broke his all-time fastest lap record with ", mmsss(t), "\n"); else bprint(e.netname, "^7 broke ", grecordholder, "^7's all-time fastest lap record with ", mmsss(t), "\n"); - db_put(ServerProgsDB, strcat(GetMapname(), "/racerecord/time"), ftos(t)); - db_put(ServerProgsDB, strcat(GetMapname(), "/racerecord/netname"), e.netname); + db_put(ServerProgsDB, strcat(GetMapname(), rr, "time"), ftos(t)); + db_put(ServerProgsDB, strcat(GetMapname(), rr, "netname"), e.netname); write_recordmarker(e, time - t/10, t/10); } else -- 2.39.2