X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fportals.qc;h=e3cba938335f83b3752732db2bdbe7f8bebe95a1;hb=42e255d014f2c6a1871177ea511f630624cdfb57;hp=b79b28285dc9e2839be9d713b623429be35db94a;hpb=2aed36e128f8f00da9c76f9e66baae89d5bb26b2;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc index b79b28285..e3cba9383 100644 --- a/qcsrc/server/portals.qc +++ b/qcsrc/server/portals.qc @@ -1,18 +1,20 @@ #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/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 "../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 @@ -51,7 +53,7 @@ vector Portal_ApplyTransformToPlayerAngle(vector transform, vector vangle) */ // PLAYERS use different math -#ifndef POSITIVE_PITCH_IS_DOWN +#if !(POSITIVE_PITCH_IS_DOWN) ang.x = -ang.x; #endif @@ -92,7 +94,7 @@ vector Portal_ApplyTransformToPlayerAngle(vector transform, vector vangle) //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; @@ -146,7 +148,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 +156,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; } @@ -206,14 +208,14 @@ float Portal_FindSafeOrigin(entity portal) { 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)) { #ifdef DEBUG - print("NO SAFE ORIGIN\n"); + LOG_INFO("NO SAFE ORIGIN\n"); #endif return 0; } @@ -248,7 +250,7 @@ float Portal_WillHitPlane(vector eorg, vector emins, vector emaxs, vector evel, } void Portal_Touch() -{ +{SELFPARAM(); vector g; #ifdef PORTALS_ARE_NOT_SOLID @@ -414,32 +416,32 @@ void Portal_Remove(entity portal, float killed) if(killed) { fixedmakevectors(portal.mangle); - sound(portal, CH_SHOTS, "porto/explode.wav", VOL_BASE, ATTEN_NORM); - Send_Effect("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) +void Portal_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force) { - if(deathtype == DEATH_TELEFRAG) + 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) -{ +{SELFPARAM(); if(!Portal_WillHitPlane(e.origin, e.mins, e.maxs, e.velocity + g, self.origin, v_forward, self.maxs.x)) return; @@ -451,8 +453,8 @@ void Portal_Think_TryTeleportPlayer(entity e, vector g) } void Portal_Think() -{ - entity e, o; +{SELFPARAM(); + entity o; vector g; #ifdef PORTALS_ARE_NOT_SOLID @@ -471,18 +473,17 @@ void Portal_Think() 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 @@ -494,7 +495,7 @@ void Portal_Think() } float Portal_Customize() -{ +{SELFPARAM(); if(IS_SPEC(other)) other = other.enemy; if(other == self.aiment) @@ -574,7 +575,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) @@ -622,8 +623,7 @@ entity Portal_Spawn(entity own, vector org, vector ang) 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; @@ -636,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;