From 542b45a7f90374b27018978ad0743a723a8266d1 Mon Sep 17 00:00:00 2001 From: div0 Date: Fri, 12 Sep 2008 05:33:24 +0000 Subject: [PATCH] remove the debug code that now causes portals to crash git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4452 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/portals.qc | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/data/qcsrc/server/portals.qc b/data/qcsrc/server/portals.qc index 65a17b088..3efb66036 100644 --- a/data/qcsrc/server/portals.qc +++ b/data/qcsrc/server/portals.qc @@ -1,5 +1,3 @@ -float portals_must_not_break; // debug code - .vector portal_transform; .vector portal_safe_origin; .float portal_wants_to_vanish; @@ -86,10 +84,6 @@ float Portal_TeleportPlayer(entity teleporter, entity player) vector old_yawforward; float planeshift, s, t; - if(!portals_must_not_break) - error("Portal_TeleportPlayer called for unprotected portals"); - print("Portalling using ", etos(teleporter), " to ", etos(teleporter.enemy), "\n"); - from = teleporter.origin; transform = teleporter.portal_transform; @@ -199,9 +193,6 @@ float Portal_TeleportPlayer(entity teleporter, entity player) TeleportPlayer(teleporter, player, to, ang, newvel, teleporter.enemy.absmin, teleporter.enemy.absmax); // reset fade counter - if(!portals_must_not_break) - error("Portal_TeleportPlayer ended with unprotected portals"); - print("Portalled using ", etos(teleporter), " to ", etos(teleporter.enemy), "\n"); teleporter.portal_wants_to_vanish = 0; teleporter.fade_time = time + 15; teleporter.enemy.health = 300; @@ -271,23 +262,15 @@ void Portal_Touch() return; } - print("Portal ID ", etos(self), " verified working.\n"); - portals_must_not_break = 1; - if(Portal_TeleportPlayer(self, other)) if(other.classname == "porto") if(other.effects & EF_RED) other.effects += EF_BLUE - EF_RED; - - portals_must_not_break = 0; } void Portal_Think(); void Portal_MakeBrokenPortal(entity portal) { - if(portals_must_not_break) - error("Trying to remove a portal during teleporting"); - portal.solid = SOLID_NOT; portal.touch = SUB_Null; portal.think = SUB_Null; @@ -385,9 +368,6 @@ void Portal_Remove(entity portal, float killed) entity e; e = portal.enemy; - if(portals_must_not_break) - error("Trying to remove a portal during teleporting"); - if(e) { Portal_Disconnect(portal, e); @@ -439,9 +419,6 @@ void Portal_Think() if(!self.enemy) error("Portal_Think called for a broken portal\n"); - //print("Portal ID ", etos(self), " verified working.\n"); - portals_must_not_break = 1; - o = self.owner; self.solid = SOLID_BBOX; self.owner = world; @@ -462,8 +439,6 @@ void Portal_Think() self.solid = SOLID_TRIGGER; self.owner = o; - portals_must_not_break = 0; - self.nextthink = time; if(time > self.fade_time) -- 2.39.2