+#include "portals.qh"
+#include "_all.qh"
+
+#include "g_hook.qh"
+#include "mutators/mutators_include.qh"
+#include "../common/constants.qh"
+#include "../common/deathtypes.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"
+
#define PORTALS_ARE_NOT_SOLID
-#define SAFENUDGE '1 1 1'
-#define SAFERNUDGE '8 8 8'
+const vector SAFENUDGE = '1 1 1';
+const vector SAFERNUDGE = '8 8 8';
.vector portal_transform;
.vector portal_safe_origin;
{
vector vbest;
- if(v_x < 0) vbest_x = p.mins_x; else vbest_x = p.maxs_x;
- if(v_y < 0) vbest_y = p.mins_y; else vbest_y = p.maxs_y;
- if(v_z < 0) vbest_z = p.mins_z; else vbest_z = p.maxs_z;
+ if(v.x < 0) vbest.x = p.mins.x; else vbest.x = p.maxs.x;
+ if(v.y < 0) vbest.y = p.mins.y; else vbest.y = p.maxs.y;
+ if(v.z < 0) vbest.z = p.mins.z; else vbest.z = p.maxs.z;
return vbest * v;
}
// PLAYERS use different math
#ifndef POSITIVE_PITCH_IS_DOWN
- ang_x = -ang_x;
+ ang.x = -ang.x;
#endif
//print("reference: ", vtos(AnglesTransform_ApplyToVAngles(transform, ang)), "\n");
fixedmakevectors(ang);
old_forward = v_forward;
old_up = v_up;
- fixedmakevectors(ang_y * '0 1 0');
+ fixedmakevectors(ang.y * '0 1 0');
old_yawforward = v_forward;
// their aiming directions are portalled...
//
// new_up could now point forward OR backward... which direction to choose?
- if(new_forward_z > 0.7 || new_forward_z < -0.7) // far up; in this case, the "up" vector points backwards
+ if(new_forward.z > 0.7 || new_forward.z < -0.7) // far up; in this case, the "up" vector points backwards
{
// new_yawforward and new_yawup define the new aiming half-circle
// we "just" need to find out whether new_up or -new_up is in that half circle
ang = fixedvectoangles(new_forward); // this still gets us a nice pitch value...
if(new_up * new_yawforward < 0)
new_up = -1 * new_up;
- ang_y = vectoyaw(new_up); // this vector is the yaw we want
+ ang.y = vectoyaw(new_up); // this vector is the yaw we want
//print("UP/DOWN path: ", vtos(ang), "\n");
}
else
}
#ifndef POSITIVE_PITCH_IS_DOWN
- ang_x = -ang_x;
+ ang.x = -ang.x;
#endif
- ang_z = vangle_z;
+ ang.z = vangle.z;
return ang;
}
// 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)
{
vector v;
dist = (eorg - porg) * pnorm;
- dist += min(emins_x * pnorm_x, emaxs_x * pnorm_x);
- dist += min(emins_y * pnorm_y, emaxs_y * pnorm_y);
- dist += min(emins_z * pnorm_z, emaxs_z * pnorm_z);
+ dist += min(emins.x * pnorm.x, emaxs.x * pnorm.x);
+ dist += min(emins.y * pnorm.y, emaxs.y * pnorm.y);
+ dist += min(emins.z * pnorm.z, emaxs.z * pnorm.z);
if(dist < -1) // other side?
return 0;
#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");
return; // cannot go through someone else's portal
fixedmakevectors(self.mangle);
g = frametime * '0 0 -1' * autocvar_sv_gravity;
- if(!Portal_WillHitPlane(other.origin, other.mins, other.maxs, other.velocity + g, self.origin, v_forward, self.maxs_x))
+ if(!Portal_WillHitPlane(other.origin, other.mins, other.maxs, other.velocity + g, self.origin, v_forward, self.maxs.x))
return;
/*
- if(other.mins_x < PL_MIN_x || other.mins_y < PL_MIN_y || other.mins_z < PL_MIN_z
- || other.maxs_x > PL_MAX_x || other.maxs_y > PL_MAX_y || other.maxs_z > PL_MAX_z)
+ if(other.mins_x < PL_MIN.x || other.mins_y < PL_MIN.y || other.mins_z < PL_MIN.z
+ || other.maxs_x > PL_MAX.x || other.maxs_y > PL_MAX.y || other.maxs_z > PL_MAX.z)
{
// can't teleport this
return;
{
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);
+ Send_Effect("rocket_explode", portal.origin + v_forward * 16, v_forward * 1024, 4);
remove(portal);
}
else
}
}
-void Portal_Damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
+void Portal_Damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
{
if(deathtype == DEATH_TELEFRAG)
return;
void Portal_Think_TryTeleportPlayer(entity e, vector g)
{
- if(!Portal_WillHitPlane(e.origin, e.mins, e.maxs, e.velocity + g, self.origin, v_forward, self.maxs_x))
+ if(!Portal_WillHitPlane(e.origin, e.mins, e.maxs, e.velocity + g, self.origin, v_forward, self.maxs.x))
return;
// if e would hit the portal in a frame...
{
self.modelindex = self.savemodelindex;
}
- return TRUE;
+ return true;
}
// cleanup:
setorigin(portal, org);
portal.mangle = ang;
portal.angles = ang;
- portal.angles_x = -portal.angles_x; // is a bmodel
+ portal.angles_x = -portal.angles.x; // is a bmodel
portal.think = Portal_Think;
portal.nextthink = 0;
portal.portal_activatetime = time + 0.1;
projects / xonotic / xonotic-data.pk3dir.git / blobdiff