r5830 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-02-11 01:02:47 -0500 (Wed, 11 Feb 2009)
New Revision: 5830

Modified:
   trunk/data/qcsrc/server/ctf.qc
   trunk/data/qcsrc/server/waypointsprites.qc
Log:
add some debugging checks to finally find the reason of the write to a wrong entity


Modified: trunk/data/qcsrc/server/ctf.qc
===================================================================
--- trunk/data/qcsrc/server/ctf.qc	2009-02-11 05:45:39 UTC (rev 5829)
+++ trunk/data/qcsrc/server/ctf.qc	2009-02-11 06:02:47 UTC (rev 5830)
@@ -149,6 +149,9 @@
 
 void place_flag()
 {
+	if(self.classname != "item_flag_team")
+		error("PlaceFlag a non-flag");
+
 	if(!self.t_width)
 		self.t_width = 0.1; // frame animation rate
 	if(!self.t_length)
@@ -194,6 +197,9 @@
 
 void RegenFlag(entity e)
 {
+	if(e.classname != "item_flag_team")
+		error("RegenFlag a non-flag");
+
 	setattachment(e, world, "");
 	e.damageforcescale = 0;
 	e.movetype = MOVETYPE_NONE;
@@ -210,6 +216,9 @@
 
 void ReturnFlag(entity e)
 {
+	if(e.classname != "item_flag_team")
+		error("ReturnFlag a non-flag");
+
 	if (e.owner)
 	if (e.owner.flagcarried == e)
 	{
@@ -227,6 +236,9 @@
 {
 	local entity p;
 
+	if(e.classname != "item_flag_team")
+		error("DropFlag a non-flag");
+
 	if(e.speedrunning)
 	{
 		ReturnFlag(e);

Modified: trunk/data/qcsrc/server/waypointsprites.qc
===================================================================
--- trunk/data/qcsrc/server/waypointsprites.qc	2009-02-11 05:45:39 UTC (rev 5829)
+++ trunk/data/qcsrc/server/waypointsprites.qc	2009-02-11 06:02:47 UTC (rev 5830)
@@ -103,6 +103,8 @@
 {
 	if(!wp)
 		return;
+	if(wp.classname != "sprite_waypoint")
+		error("Trying to disown a non-waypointsprite");
 	if(wp.owner)
 	{
 		if(wp.exteriormodeltoclient == wp.owner)