From 4612af90f09601d26f66f431d4ee0c773afb30de Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Wed, 23 Jan 2008 15:58:38 +0000
Subject: [PATCH] revert that CTF change. Instead, don't load/save the DB _at
 all_ with sv_cheats.

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3240 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/common/util.qc    |  5 +++++
 data/qcsrc/common/util.qh    |  1 +
 data/qcsrc/server/ctf.qc     | 22 ++++++----------------
 data/qcsrc/server/g_world.qc |  8 ++++++--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/data/qcsrc/common/util.qc b/data/qcsrc/common/util.qc
index e0bd95de0..a6050590e 100644
--- a/data/qcsrc/common/util.qc
+++ b/data/qcsrc/common/util.qc
@@ -249,6 +249,11 @@ void db_save(float db, string pFilename)
 	fclose(fh);
 }
 
+float db_create()
+{
+	return buf_create();
+}
+
 float db_load(string pFilename)
 {
 	float db, fh, i, j, n;
diff --git a/data/qcsrc/common/util.qh b/data/qcsrc/common/util.qh
index af0c04bd7..561f2a700 100644
--- a/data/qcsrc/common/util.qh
+++ b/data/qcsrc/common/util.qh
@@ -38,6 +38,7 @@ string fstrunzone(string s);
 
 // database (NOTE: keys are case sensitive)
 void db_save(float db, string filename);
+float db_create();
 float db_load(string filename);
 void db_close(float db);
 string db_get(float db, string key);
diff --git a/data/qcsrc/server/ctf.qc b/data/qcsrc/server/ctf.qc
index c9f9b65ca..6435507d0 100644
--- a/data/qcsrc/server/ctf.qc
+++ b/data/qcsrc/server/ctf.qc
@@ -248,10 +248,7 @@ void() FlagTouch =
 		t = time - other.flagcarried.flagpickuptime;
 		s = ftos_decimals(t, 2);
 		s0 = ftos_decimals(flagcaptimerecord, 2);
-		if(sv_cheats)
-			h0 = "some cheater";
-		else
-			h0 = db_get(ServerProgsDB, strcat(GetMapname(), "/captimerecord/netname"));
+		h0 = db_get(ServerProgsDB, strcat(GetMapname(), "/captimerecord/netname"));
 		if(h0 == other.netname)
 			h0 = "his";
 		else
@@ -260,21 +257,15 @@ void() FlagTouch =
 		{
 			bprint(other.netname, "^7 captured the ", other.flagcarried.netname, " in ", s, " seconds\n");
 			flagcaptimerecord = t;
-			if(!sv_cheats)
-			{
-				db_put(ServerProgsDB, strcat(GetMapname(), "/captimerecord/time"), ftos(t));
-				db_put(ServerProgsDB, strcat(GetMapname(), "/captimerecord/netname"), other.netname);
-			}
+			db_put(ServerProgsDB, strcat(GetMapname(), "/captimerecord/time"), ftos(t));
+			db_put(ServerProgsDB, strcat(GetMapname(), "/captimerecord/netname"), other.netname);
 		}
 		else if (t < flagcaptimerecord)
 		{
 			bprint(other.netname, "^7 captured the ", other.flagcarried.netname, " in ", s, ", breaking ", strcat(h0, " previous record of ", s0, " seconds\n"));
 			flagcaptimerecord = t;
-			if(!sv_cheats)
-			{
-				db_put(ServerProgsDB, strcat(GetMapname(), "/captimerecord/time"), ftos(t));
-				db_put(ServerProgsDB, strcat(GetMapname(), "/captimerecord/netname"), other.netname);
-			}
+			db_put(ServerProgsDB, strcat(GetMapname(), "/captimerecord/time"), ftos(t));
+			db_put(ServerProgsDB, strcat(GetMapname(), "/captimerecord/netname"), other.netname);
 		}
 		else
 		{
@@ -632,8 +623,7 @@ void() ctf_init =
 	e = spawn();
 	e.think = ctf_delayedinit;
 	e.nextthink = time + 0.1;
-	if(!sv_cheats)
-		flagcaptimerecord = stof(db_get(ServerProgsDB, strcat(GetMapname(), "/captimerecord/time")));
+	flagcaptimerecord = stof(db_get(ServerProgsDB, strcat(GetMapname(), "/captimerecord/time")));
 };
 
 void(entity flag) ctf_setstatus2 =
diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc
index 8d9eab9ad..953e3c86b 100644
--- a/data/qcsrc/server/g_world.qc
+++ b/data/qcsrc/server/g_world.qc
@@ -100,7 +100,10 @@ void worldspawn (void)
 	MapInfo_LoadMapSettings(mapname);
 #endif
 
-	ServerProgsDB = db_load("server.db");
+	if(sv_cheats)
+		ServerProgsDB = db_create();
+	else
+		ServerProgsDB = db_load("server.db");
 
 	/*
 	TODO sound pack system
@@ -2236,7 +2239,8 @@ void SV_Shutdown()
 		world_initialized = 0;
 		print("Saving persistent data...\n");
 		Ban_SaveBans();
-		db_save(ServerProgsDB, "server.db");
+		if(!sv_cheats)
+			db_save(ServerProgsDB, "server.db");
 		print("done!\n");
 	}
 	else
-- 
2.39.2