From a620ec25f68a2543dd0bd3009ea5f643d59bd85a Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 15 Oct 2015 01:23:12 +1000 Subject: [PATCH] Butcher another hidden gamemode specific block --- .../mutator/waypoints/waypointsprites.qc | 29 +++++-------------- qcsrc/server/mutators/events.qh | 11 +++++++ qcsrc/server/mutators/gamemode_onslaught.qc | 22 ++++++++++++++ 3 files changed, 41 insertions(+), 21 deletions(-) diff --git a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc index 7f317dd9a..173375d91 100644 --- a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc +++ b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc @@ -20,6 +20,14 @@ bool WaypointSprite_SendEntity(entity this, entity to, float sendflags) WriteByte(MSG_ENTITY, sendflags); WriteByte(MSG_ENTITY, self.wp_extra); + int f = 0; + if(self.currentammo) + f |= 1; // hideable + if(self.exteriormodeltoclient == to) + f |= 2; // my own + + MUTATOR_CALLHOOK(SendWaypoint, this, to, sendflags, f); + if (sendflags & 0x80) { if (self.max_health) @@ -62,27 +70,6 @@ bool WaypointSprite_SendEntity(entity this, entity to, float sendflags) WriteCoord(MSG_ENTITY, self.fade_time); WriteCoord(MSG_ENTITY, self.teleport_time); WriteShort(MSG_ENTITY, self.fade_rate); // maxdist - float f = 0; - if (self.currentammo) - f |= 1; // hideable - if (self.exteriormodeltoclient == to) - f |= 2; // my own - if (g_onslaught) - { - if (self.owner.classname == "onslaught_controlpoint") - { - entity wp_owner = self.owner; - entity e = WaypointSprite_getviewentity(to); - if (SAME_TEAM(e, wp_owner) && wp_owner.goalentity.health >= wp_owner.goalentity.max_health) { f |= 2; } - if (!ons_ControlPoint_Attackable(wp_owner, e.team)) { f |= 2; } - } - if (self.owner.classname == "onslaught_generator") - { - entity wp_owner = self.owner; - if (wp_owner.isshielded && wp_owner.health >= wp_owner.max_health) { f |= 2; } - if (wp_owner.health <= 0) { f |= 2; } - } - } WriteByte(MSG_ENTITY, f); } diff --git a/qcsrc/server/mutators/events.qh b/qcsrc/server/mutators/events.qh index b9727c7e1..44801a256 100644 --- a/qcsrc/server/mutators/events.qh +++ b/qcsrc/server/mutators/events.qh @@ -773,4 +773,15 @@ MUTATOR_HOOKABLE(DropSpecialItems, EV_DropSpecialItems); MUTATOR_HOOKABLE(AllowMobButcher, EV_NO_ARGS); MUTATOR_HOOKABLE(ReadLevelCvars, EV_NO_ARGS); + +#define EV_SendWaypoint(i, o) \ + /**/ i(entity, __self) \ + /**/ i(entity, wp_sendto) \ + /**/ i(int, wp_sendflags) \ + /**/ i(int, wp_flag) \ + /**/ +entity wp_sendto; +int wp_sendflags; +int wp_flag; +MUTATOR_HOOKABLE(SendWaypoint, EV_SendWaypoint); #endif diff --git a/qcsrc/server/mutators/gamemode_onslaught.qc b/qcsrc/server/mutators/gamemode_onslaught.qc index cc6ad200c..68318f4d6 100644 --- a/qcsrc/server/mutators/gamemode_onslaught.qc +++ b/qcsrc/server/mutators/gamemode_onslaught.qc @@ -2044,6 +2044,28 @@ MUTATOR_HOOKFUNCTION(ons, PlayHitsound) || (frag_victim.classname == "onslaught_controlpoint_icon" && !frag_victim.owner.isshielded); } +MUTATOR_HOOKFUNCTION(ons, SendWaypoint) +{ + if(wp_sendflags & 16) + { + if(self.owner.classname == "onslaught_controlpoint") + { + entity wp_owner = self.owner; + entity e = WaypointSprite_getviewentity(wp_sendto); + if(SAME_TEAM(e, wp_owner) && wp_owner.goalentity.health >= wp_owner.goalentity.max_health) { wp_flag |= 2; } + if(!ons_ControlPoint_Attackable(wp_owner, e.team)) { wp_flag |= 2; } + } + if(self.owner.classname == "onslaught_generator") + { + entity wp_owner = self.owner; + if(wp_owner.isshielded && wp_owner.health >= wp_owner.max_health) { wp_flag |= 2; } + if(wp_owner.health <= 0) { wp_flag |= 2; } + } + } + + return false; +} + // ========== // Spawnfuncs // ========== -- 2.39.2