r5905 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-02-20 04:15:44 -0500 (Fri, 20 Feb 2009)
New Revision: 5905

Modified:
   trunk/data/qcsrc/server/ctf.qc
   trunk/data/qcsrc/server/g_subs.qc
   trunk/data/qcsrc/server/waypointsprites.qc
Log:
turn some errors into warnings with error recovery so we can release


Modified: trunk/data/qcsrc/server/ctf.qc
===================================================================
--- trunk/data/qcsrc/server/ctf.qc	2009-02-20 08:54:30 UTC (rev 5904)
+++ trunk/data/qcsrc/server/ctf.qc	2009-02-20 09:15:44 UTC (rev 5905)
@@ -150,7 +150,10 @@
 void place_flag()
 {
 	if(self.classname != "item_flag_team")
-		error("PlaceFlag a non-flag");
+	{
+		backtrace("PlaceFlag a non-flag");
+		return;
+	}
 
 	if(!self.t_width)
 		self.t_width = 0.1; // frame animation rate
@@ -198,7 +201,10 @@
 void RegenFlag(entity e)
 {
 	if(e.classname != "item_flag_team")
-		error("RegenFlag a non-flag");
+	{
+		backtrace("RegenFlag a non-flag");
+		return;
+	}
 
 	setattachment(e, world, "");
 	e.damageforcescale = 0;
@@ -217,7 +223,10 @@
 void ReturnFlag(entity e)
 {
 	if(e.classname != "item_flag_team")
-		error("ReturnFlag a non-flag");
+	{
+		backtrace("ReturnFlag a non-flag");
+		return;
+	}
 
 	if (e.owner)
 	if (e.owner.flagcarried == e)
@@ -237,7 +246,10 @@
 	local entity p;
 
 	if(e.classname != "item_flag_team")
-		error("DropFlag a non-flag");
+	{
+		backtrace("DropFlag a non-flag");
+		return;
+	}
 
 	if(e.speedrunning)
 	{

Modified: trunk/data/qcsrc/server/g_subs.qc
===================================================================
--- trunk/data/qcsrc/server/g_subs.qc	2009-02-20 08:54:30 UTC (rev 5904)
+++ trunk/data/qcsrc/server/g_subs.qc	2009-02-20 09:15:44 UTC (rev 5905)
@@ -568,6 +568,11 @@
 		}
 	}
 
+	if(cvar("loddebug") < 0)
+	{
+		self.lodmodel1 = self.lodmodel2 = ""; // don't even initialize
+	}
+
 	if(self.lodmodel1 != "")
 	{
 		vector mi, ma;

Modified: trunk/data/qcsrc/server/waypointsprites.qc
===================================================================
--- trunk/data/qcsrc/server/waypointsprites.qc	2009-02-20 08:54:30 UTC (rev 5904)
+++ trunk/data/qcsrc/server/waypointsprites.qc	2009-02-20 09:15:44 UTC (rev 5905)
@@ -104,7 +104,10 @@
 	if(!wp)
 		return;
 	if(wp.classname != "sprite_waypoint")
-		error("Trying to disown a non-waypointsprite");
+	{
+		backtrace("Trying to disown a non-waypointsprite");
+		return;
+	}
 	if(wp.owner)
 	{
 		if(wp.exteriormodeltoclient == wp.owner)