r1736 - branches/nexuiz-2.0/data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sat Jul 8 18:39:14 EDT 2006


Author: div0
Date: 2006-07-08 18:39:13 -0400 (Sat, 08 Jul 2006)
New Revision: 1736

Modified:
   branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc
   branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
Log:
Defatalization merge


Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc	2006-07-08 16:10:20 UTC (rev 1735)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc	2006-07-08 22:39:13 UTC (rev 1736)
@@ -380,7 +380,7 @@
 
 	if(self.weapon_think == w_ready && func != w_ready && self.weaponentity.state == WS_RAISE)
 	{
-		error("Tried to override initial weapon think function - should this really happen?\n");
+		backtrace("Tried to override initial weapon think function - should this really happen?");
 	}
 
 	if(cvar("g_runematch"))

Modified: branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc	2006-07-08 16:10:20 UTC (rev 1735)
+++ branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc	2006-07-08 22:39:13 UTC (rev 1736)
@@ -407,3 +407,17 @@
 	fclose(fh);
 	return TRUE;
 }
+
+void backtrace(string msg)
+{
+	float dev;
+	dev = cvar("developer");
+	cvar_set("developer", "1");
+	dprint("\n");
+	dprint("--- CUT HERE ---\nWARNING: ");
+	dprint(msg);
+	dprint("\n");
+	remove(world); // isn't there any better way to cause a backtrace?
+	dprint("\n--- CUT UNTIL HERE ---\n");
+	cvar_set("developer", ftos(dev));
+}




More information about the nexuiz-commits mailing list