#include "portals.qh"
#include "g_hook.qh"
-#include "mutators/mutators_include.qh"
+#include "mutators/all.qh"
#include "../common/constants.qh"
-#include "../common/deathtypes.qh"
-#include "../common/notifications.qh"
+#include "../common/deathtypes/all.qh"
+#include "../common/notifications/all.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 "../warpzonelib/common.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"
*/
// PLAYERS use different math
-#ifndef POSITIVE_PITCH_IS_DOWN
+#if !(POSITIVE_PITCH_IS_DOWN)
ang.x = -ang.x;
#endif
//print("GOOD path: ", vtos(ang), "\n");
}
-#ifndef POSITIVE_PITCH_IS_DOWN
+#if !(POSITIVE_PITCH_IS_DOWN)
ang.x = -ang.x;
#endif
ang.z = vangle.z;
{
vector o;
o = portal.origin;
- portal.mins = PL_MIN - SAFERNUDGE;
- portal.maxs = PL_MAX + SAFERNUDGE;
+ portal.mins = STAT(PL_MIN, NULL) - SAFERNUDGE;
+ portal.maxs = STAT(PL_MAX, NULL) + SAFERNUDGE;
fixedmakevectors(portal.mangle);
portal.origin += 16 * v_forward;
if(!move_out_of_solid(portal))
}
}
-void Portal_Damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
-{SELFPARAM();
- if(deathtype == DEATH_TELEFRAG)
+void Portal_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
+{
+ if(deathtype == DEATH_TELEFRAG.m_id)
return;
- if(attacker != self.aiment)
- if(IS_INDEPENDENT_PLAYER(attacker) || IS_INDEPENDENT_PLAYER(self.aiment))
+ if(attacker != this.aiment)
+ if(IS_INDEPENDENT_PLAYER(attacker) || IS_INDEPENDENT_PLAYER(this.aiment))
return;
- self.health -= damage;
- if(self.health < 0)
- Portal_Remove(self, 1);
+ this.health -= damage;
+ if(this.health < 0)
+ Portal_Remove(this, 1);
}
void Portal_Think_TryTeleportPlayer(entity e, vector g)
void Portal_Think()
{SELFPARAM();
- entity e, o;
+ entity o;
vector g;
#ifdef PORTALS_ARE_NOT_SOLID
fixedmakevectors(self.mangle);
- FOR_EACH_PLAYER(e)
- {
- if(e != o)
- if(IS_INDEPENDENT_PLAYER(e) || IS_INDEPENDENT_PLAYER(o))
+ FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(
+ if(it != o)
+ if(IS_INDEPENDENT_PLAYER(it) || IS_INDEPENDENT_PLAYER(o))
continue; // cannot go through someone else's portal
- if(e != o || time >= self.portal_activatetime)
- Portal_Think_TryTeleportPlayer(e, g);
+ if(it != o || time >= self.portal_activatetime)
+ Portal_Think_TryTeleportPlayer(it, g);
- if(e.hook)
- Portal_Think_TryTeleportPlayer(e.hook, g);
- }
+ if(it.hook)
+ Portal_Think_TryTeleportPlayer(it.hook, g);
+ ));
self.solid = SOLID_TRIGGER;
self.aiment = o;
#endif
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;