X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fportals.qc;h=30fa073849d9f9b5827a050a5b269ce1b7269b03;hb=9a3b01ba5da2726001a5ed74645a15ce764a3675;hp=438ff00d3453e443e4d7e7d0f63970a5e0dcdf45;hpb=0b7855b8e65e0220238a08cdcdd2ca7386e3d06e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc
index 438ff00d3..30fa07384 100644
--- a/qcsrc/server/portals.qc
+++ b/qcsrc/server/portals.qc
@@ -146,7 +146,7 @@ float Portal_TeleportPlayer(entity teleporter, entity player)
 	tracebox(safe, player.mins - SAFENUDGE, player.maxs + SAFENUDGE, step, MOVE_NOMONSTERS, player);
 	if(trace_startsolid)
 	{
-		print("'safe' teleport location is not safe!\n");
+		LOG_INFO("'safe' teleport location is not safe!\n");
 		// FAIL TODO why does this happen?
 		return 0;
 	}
@@ -154,7 +154,7 @@ float Portal_TeleportPlayer(entity teleporter, entity player)
 	tracebox(safe, player.mins - SAFENUDGE, player.maxs + SAFENUDGE, to, MOVE_NOMONSTERS, player);
 	if(trace_startsolid)
 	{
-		print("trace_endpos in solid, this can't be!\n");
+		LOG_INFO("trace_endpos in solid, this can't be!\n");
 		// FAIL TODO why does this happen? (reported by MrBougo)
 		return 0;
 	}
@@ -213,7 +213,7 @@ float Portal_FindSafeOrigin(entity portal)
 	if(!move_out_of_solid(portal))
 	{
 #ifdef DEBUG
-		print("NO SAFE ORIGIN\n");
+		LOG_INFO("NO SAFE ORIGIN\n");
 #endif
 		return 0;
 	}
@@ -248,7 +248,7 @@ float Portal_WillHitPlane(vector eorg, vector emins, vector emaxs, vector evel,
 }
 
 void Portal_Touch()
-{
+{SELFPARAM();
 	vector g;
 
 #ifdef PORTALS_ARE_NOT_SOLID
@@ -266,6 +266,10 @@ void Portal_Touch()
 	if(other.classname == "grapplinghook")
 		return; // handled by think
 
+	if(!autocvar_g_vehicles_teleportable)
+	if(other.vehicle_flags & VHF_ISVEHICLE)
+		return; // no teleporting vehicles?
+
 	if(!self.enemy)
 		error("Portal_Touch called for a broken portal\n");
 
@@ -410,20 +414,20 @@ void Portal_Remove(entity portal, float killed)
 	if(killed)
 	{
 		fixedmakevectors(portal.mangle);
-		sound(portal, CH_SHOTS, "porto/explode.wav", VOL_BASE, ATTEN_NORM);
-		pointparticles(particleeffectnum("rocket_explode"), portal.origin + v_forward * 16, v_forward * 1024, 4);
+		sound(portal, CH_SHOTS, SND_PORTO_EXPLODE, VOL_BASE, ATTEN_NORM);
+		Send_Effect(EFFECT_ROCKET_EXPLODE, portal.origin + v_forward * 16, v_forward * 1024, 4);
 		remove(portal);
 	}
 	else
 	{
 		Portal_MakeBrokenPortal(portal);
-		sound(portal, CH_SHOTS, "porto/expire.wav", VOL_BASE, ATTEN_NORM);
+		sound(portal, CH_SHOTS, SND_PORTO_EXPIRE, VOL_BASE, ATTEN_NORM);
 		SUB_SetFade(portal, time, 0.5);
 	}
 }
 
 void Portal_Damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
-{
+{SELFPARAM();
 	if(deathtype == DEATH_TELEFRAG)
 		return;
 	if(attacker != self.aiment)
@@ -435,7 +439,7 @@ void Portal_Damage(entity inflictor, entity attacker, float damage, int deathtyp
 }
 
 void Portal_Think_TryTeleportPlayer(entity e, vector g)
-{
+{SELFPARAM();
 	if(!Portal_WillHitPlane(e.origin, e.mins, e.maxs, e.velocity + g, self.origin, v_forward, self.maxs.x))
 		return;
 
@@ -447,7 +451,7 @@ void Portal_Think_TryTeleportPlayer(entity e, vector g)
 }
 
 void Portal_Think()
-{
+{SELFPARAM();
 	entity e, o;
 	vector g;
 
@@ -490,7 +494,7 @@ void Portal_Think()
 }
 
 float Portal_Customize()
-{
+{SELFPARAM();
 	if(IS_SPEC(other))
 		other = other.enemy;
 	if(other == self.aiment)
@@ -570,7 +574,7 @@ void Portal_ClearAll(entity own)
 	W_Porto_Remove(own);
 }
 void Portal_RemoveLater_Think()
-{
+{SELFPARAM();
 	Portal_Remove(self, self.cnt);
 }
 void Portal_RemoveLater(entity portal, float kill)
@@ -632,7 +636,7 @@ entity Portal_Spawn(entity own, vector org, vector ang)
 	portal.event_damage = Portal_Damage;
 	portal.fade_time = time + autocvar_g_balance_portal_lifetime;
 	portal.health = autocvar_g_balance_portal_health;
-	setmodel(portal, "models/portal.md3");
+	setmodel(portal, MDL_PORTAL);
 	portal.savemodelindex = portal.modelindex;
 	portal.customizeentityforclient = Portal_Customize;