#include "portals.qh"
-#include "_all.qh"
#include "g_hook.qh"
-#include "mutators/mutators_include.qh"
+#include "mutators/all.qh"
#include "../common/constants.qh"
-#include "../common/deathtypes.qh"
+#include "../common/deathtypes/all.qh"
#include "../common/notifications.qh"
#include "../common/triggers/teleporters.qh"
#include "../common/triggers/subs.qh"
#include "../common/util.qh"
#include "../common/weapons/all.qh"
-#include "../csqcmodellib/sv_model.qh"
-#include "../warpzonelib/anglestransform.qh"
-#include "../warpzonelib/util_server.qh"
+#include "../lib/csqcmodel/sv_model.qh"
+#include "../lib/warpzone/anglestransform.qh"
+#include "../lib/warpzone/util_server.qh"
+#include "../lib/warpzone/common.qh"
+#include "../common/vehicles/vehicle.qh"
+#include "../common/vehicles/sv_vehicles.qh"
#define PORTALS_ARE_NOT_SOLID
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;
}
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;
}
// factor -1 allows chaining portals, but may be weird
player.right_vector = -1 * AnglesTransform_Apply(transform, player.right_vector);
- entity oldself = self;
- self = player;
- MUTATOR_CALLHOOK(PortalTeleport);
- player = self;
- self = oldself;
+ MUTATOR_CALLHOOK(PortalTeleport, player);
if (!teleporter.enemy)
{
if(!move_out_of_solid(portal))
{
#ifdef DEBUG
- print("NO SAFE ORIGIN\n");
+ LOG_INFO("NO SAFE ORIGIN\n");
#endif
return 0;
}
}
void Portal_Touch()
-{
+{SELFPARAM();
vector g;
#ifdef PORTALS_ARE_NOT_SOLID
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");
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)
-{
- if(deathtype == DEATH_TELEFRAG)
+{SELFPARAM();
+ if(deathtype == DEATH_TELEFRAG.m_id)
return;
if(attacker != self.aiment)
if(IS_INDEPENDENT_PLAYER(attacker) || IS_INDEPENDENT_PLAYER(self.aiment))
}
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;
}
void Portal_Think()
-{
+{SELFPARAM();
entity e, o;
vector g;
}
float Portal_Customize()
-{
+{SELFPARAM();
if(IS_SPEC(other))
other = other.enemy;
if(other == self.aiment)
W_Porto_Remove(own);
}
void Portal_RemoveLater_Think()
-{
+{SELFPARAM();
Portal_Remove(self, self.cnt);
}
void Portal_RemoveLater(entity portal, float kill)
if(!CheckWireframeBox(own, org - 48 * v_right - 48 * v_up + 16 * v_forward, 96 * v_right, 96 * v_up, 96 * v_forward))
return world;
- portal = spawn();
- portal.classname = "portal";
+ portal = new(portal);
portal.aiment = own;
setorigin(portal, org);
portal.mangle = 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;