r3240 - in trunk/data/qcsrc: common server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-01-23 10:58:38 -0500 (Wed, 23 Jan 2008)
New Revision: 3240

Modified:
   trunk/data/qcsrc/common/util.qc
   trunk/data/qcsrc/common/util.qh
   trunk/data/qcsrc/server/ctf.qc
   trunk/data/qcsrc/server/g_world.qc
Log:
revert that CTF change. Instead, don't load/save the DB _at all_ with sv_cheats.


Modified: trunk/data/qcsrc/common/util.qc
===================================================================
--- trunk/data/qcsrc/common/util.qc	2008-01-23 15:50:26 UTC (rev 3239)
+++ trunk/data/qcsrc/common/util.qc	2008-01-23 15:58:38 UTC (rev 3240)
@@ -249,6 +249,11 @@
 	fclose(fh);
 }
 
+float db_create()
+{
+	return buf_create();
+}
+
 float db_load(string pFilename)
 {
 	float db, fh, i, j, n;

Modified: trunk/data/qcsrc/common/util.qh
===================================================================
--- trunk/data/qcsrc/common/util.qh	2008-01-23 15:50:26 UTC (rev 3239)
+++ trunk/data/qcsrc/common/util.qh	2008-01-23 15:58:38 UTC (rev 3240)
@@ -38,6 +38,7 @@
 
 // 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);

Modified: trunk/data/qcsrc/server/ctf.qc
===================================================================
--- trunk/data/qcsrc/server/ctf.qc	2008-01-23 15:50:26 UTC (rev 3239)
+++ trunk/data/qcsrc/server/ctf.qc	2008-01-23 15:58:38 UTC (rev 3240)
@@ -248,10 +248,7 @@
 		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 @@
 		{
 			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 @@
 	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 =

Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2008-01-23 15:50:26 UTC (rev 3239)
+++ trunk/data/qcsrc/server/g_world.qc	2008-01-23 15:58:38 UTC (rev 3240)
@@ -100,7 +100,10 @@
 	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 @@
 		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