[nexuiz-commits] r7290 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-08-01 16:46:49 -0400 (Sat, 01 Aug 2009)
New Revision: 7290

Modified:
   trunk/data/qcsrc/server/portals.qc
Log:
make portals solid in a better place


Modified: trunk/data/qcsrc/server/portals.qc
===================================================================
--- trunk/data/qcsrc/server/portals.qc	2009-08-01 20:35:57 UTC (rev 7289)
+++ trunk/data/qcsrc/server/portals.qc	2009-08-01 20:46:49 UTC (rev 7290)
@@ -319,11 +319,7 @@
 void Portal_MakeInPortal(entity portal)
 {
 	portal.skin = 0;
-#ifdef PORTALS_ARE_NOT_SOLID
-	portal.solid = SOLID_TRIGGER;
-#else
-	portal.solid = SOLID_BSP;
-#endif
+	portal.solid = SOLID_NOT; // this is done when connecting them!
 	portal.touch = Portal_Touch;
 	portal.think = Portal_Think;
 	portal.effects = EF_RED;
@@ -363,6 +359,11 @@
 	teleporter.portal_wants_to_vanish = 0;
 	destination.portal_wants_to_vanish = 0;
 	teleporter.teleport_time = time;
+#ifdef PORTALS_ARE_NOT_SOLID
+	teleporter.solid = SOLID_TRIGGER;
+#else
+	teleporter.solid = SOLID_BSP;
+#endif
 }
 
 void Portal_Remove(entity portal, float killed)