From ebd097398ee7818d7c0a8e272f8220ef81d48e7e Mon Sep 17 00:00:00 2001 From: div0 Date: Sat, 1 Aug 2009 20:46:49 +0000 Subject: [PATCH] make portals solid in a better place git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7290 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/portals.qc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/data/qcsrc/server/portals.qc b/data/qcsrc/server/portals.qc index 58acf6bc0..c800c0f01 100644 --- a/data/qcsrc/server/portals.qc +++ b/data/qcsrc/server/portals.qc @@ -319,11 +319,7 @@ void Portal_MakeWaitingPortal(entity portal) 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 @@ void Portal_Connect(entity teleporter, entity destination) 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) -- 2.39.2