X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fportals.qc;h=99125a1a30c502d58e736cefbdfb59033d02a05a;hb=c936d63198343de2348bd7d753b31c3c77512f21;hp=f0728b720084d011d909ce684835f2fb1c5aacd8;hpb=3d4a324cc2e15c1eb99209674942506eb998e2ec;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc index f0728b720..99125a1a3 100644 --- a/qcsrc/server/portals.qc +++ b/qcsrc/server/portals.qc @@ -1,14 +1,14 @@ #include "portals.qh" #include "g_hook.qh" -#include "mutators/all.qh" +#include "mutators/_mod.qh" #include "../common/constants.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 #include "../lib/csqcmodel/sv_model.qh" #include "../lib/warpzone/anglestransform.qh" #include "../lib/warpzone/util_server.qh" @@ -208,8 +208,8 @@ float Portal_FindSafeOrigin(entity portal) { vector o; o = portal.origin; - portal.mins = STAT(PL_MIN, NULL) - SAFERNUDGE; - portal.maxs = STAT(PL_MAX, NULL) + SAFERNUDGE; + portal.mins = PL_MIN_CONST - SAFERNUDGE; + portal.maxs = PL_MAX_CONST + SAFERNUDGE; fixedmakevectors(portal.mangle); portal.origin += 16 * v_forward; if(!move_out_of_solid(portal)) @@ -249,7 +249,7 @@ float Portal_WillHitPlane(vector eorg, vector emins, vector emaxs, vector evel, #endif } -void Portal_Touch(entity this) +void Portal_Touch(entity this, entity toucher) { vector g; @@ -258,18 +258,18 @@ void Portal_Touch(entity this) if(this.solid != SOLID_TRIGGER) return; // possibly engine bug - if(IS_PLAYER(other)) + if(IS_PLAYER(toucher)) return; // handled by think #endif - if(other.classname == "item_flag_team") + if(toucher.classname == "item_flag_team") return; // never portal these - if(other.classname == "grapplinghook") + if(toucher.classname == "grapplinghook") return; // handled by think if(!autocvar_g_vehicles_teleportable) - if(other.vehicle_flags & VHF_ISVEHICLE) + if(IS_VEHICLE(toucher)) return; // no teleporting vehicles? if(!this.enemy) @@ -283,43 +283,43 @@ void Portal_Touch(entity this) return; // only handle impacts #endif - if(other.classname == "porto") + if(toucher.classname == "porto") { - if(other.portal_id == this.portal_id) + if(toucher.portal_id == this.portal_id) return; } if(time < this.portal_activatetime) - if(other == this.aiment) + if(toucher == this.aiment) { this.portal_activatetime = time + 0.1; return; } - if(other != this.aiment) - if(IS_PLAYER(other)) - if(IS_INDEPENDENT_PLAYER(other) || IS_INDEPENDENT_PLAYER(this.aiment)) + if(toucher != this.aiment) + if(IS_PLAYER(toucher)) + if(IS_INDEPENDENT_PLAYER(toucher) || IS_INDEPENDENT_PLAYER(this.aiment)) return; // cannot go through someone else's portal - if(other.aiment != this.aiment) - if(IS_PLAYER(other.aiment)) - if(IS_INDEPENDENT_PLAYER(other.aiment) || IS_INDEPENDENT_PLAYER(this.aiment)) + if(toucher.aiment != this.aiment) + if(IS_PLAYER(toucher.aiment)) + if(IS_INDEPENDENT_PLAYER(toucher.aiment) || IS_INDEPENDENT_PLAYER(this.aiment)) return; // cannot go through someone else's portal fixedmakevectors(this.mangle); g = frametime * '0 0 -1' * autocvar_sv_gravity; - if(!Portal_WillHitPlane(other.origin, other.mins, other.maxs, other.velocity + g, this.origin, v_forward, this.maxs.x)) + if(!Portal_WillHitPlane(toucher.origin, toucher.mins, toucher.maxs, toucher.velocity + g, this.origin, v_forward, this.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(toucher.mins_x < PL_MIN.x || toucher.mins_y < PL_MIN.y || toucher.mins_z < PL_MIN.z + || toucher.maxs_x > PL_MAX.x || toucher.maxs_y > PL_MAX.y || toucher.maxs_z > PL_MAX.z) { // can't teleport this return; } */ - if(Portal_TeleportPlayer(this, other)) - if(other.classname == "porto") - if(other.effects & EF_RED) - other.effects += EF_BLUE - EF_RED; + if(Portal_TeleportPlayer(this, toucher)) + if(toucher.classname == "porto") + if(toucher.effects & EF_RED) + toucher.effects += EF_BLUE - EF_RED; } void Portal_Think(entity this); @@ -369,8 +369,8 @@ void Portal_MakeOutPortal(entity portal) void Portal_Disconnect(entity teleporter, entity destination) { - teleporter.enemy = world; - destination.enemy = world; + teleporter.enemy = NULL; + destination.enemy = NULL; Portal_MakeBrokenPortal(teleporter); Portal_MakeBrokenPortal(destination); } @@ -407,10 +407,10 @@ void Portal_Remove(entity portal, float killed) } if(portal == portal.aiment.portal_in) - portal.aiment.portal_in = world; + portal.aiment.portal_in = NULL; if(portal == portal.aiment.portal_out) - portal.aiment.portal_out = world; - //portal.aiment = world; + portal.aiment.portal_out = NULL; + //portal.aiment = NULL; // makes the portal vanish if(killed) @@ -418,7 +418,7 @@ void Portal_Remove(entity portal, float killed) fixedmakevectors(portal.mangle); 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); + delete(portal); } else { @@ -467,7 +467,7 @@ void Portal_Think(entity this) o = this.aiment; this.solid = SOLID_BBOX; - this.aiment = world; + this.aiment = NULL; g = frametime * '0 0 -1' * autocvar_sv_gravity; @@ -481,8 +481,12 @@ void Portal_Think(entity this) if(it != o || time >= this.portal_activatetime) Portal_Think_TryTeleportPlayer(this, it, g); - if(it.hook) - Portal_Think_TryTeleportPlayer(this, it.hook, g); + for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) + { + .entity weaponentity = weaponentities[slot]; + if(it.(weaponentity).hook) + Portal_Think_TryTeleportPlayer(this, it.(weaponentity).hook, g); + } )); this.solid = SOLID_TRIGGER; this.aiment = o; @@ -494,15 +498,15 @@ void Portal_Think(entity this) Portal_Remove(this, 0); } -float Portal_Customize() -{SELFPARAM(); - if(IS_SPEC(other)) - other = other.enemy; - if(other == this.aiment) +bool Portal_Customize(entity this, entity client) +{ + if(IS_SPEC(client)) + client = client.enemy; + if(client == this.aiment) { this.modelindex = this.savemodelindex; } - else if(IS_INDEPENDENT_PLAYER(other) || IS_INDEPENDENT_PLAYER(this.aiment)) + else if(IS_INDEPENDENT_PLAYER(client) || IS_INDEPENDENT_PLAYER(this.aiment)) { this.modelindex = 0; } @@ -621,7 +625,7 @@ entity Portal_Spawn(entity own, vector org, vector ang) fixedmakevectors(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; + return NULL; portal = new(portal); portal.aiment = own; @@ -638,12 +642,12 @@ entity Portal_Spawn(entity own, vector org, vector ang) portal.health = autocvar_g_balance_portal_health; setmodel(portal, MDL_PORTAL); portal.savemodelindex = portal.modelindex; - portal.customizeentityforclient = Portal_Customize; + setcefc(portal, Portal_Customize); if(!Portal_FindSafeOrigin(portal)) { - remove(portal); - return world; + delete(portal); + return NULL; } setsize(portal, '-48 -48 -48', '48 48 48');