From fef3dfbbb4483533913b4e30f273b9ed9b568ecd Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 23 Aug 2015 20:28:54 +1000 Subject: [PATCH] Make it run --- qcsrc/common/notifications.qh | 2 +- qcsrc/server/mutators/gamemode_onslaught.qc | 14 +++++++------- qcsrc/server/waypointsprites.qc | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh index cdc391d94..92386b313 100644 --- a/qcsrc/common/notifications.qh +++ b/qcsrc/common/notifications.qh @@ -1366,7 +1366,7 @@ float NOTIF_CHOICE_COUNT; // notification limits -- INCREASE AS NECESSARY const float NOTIF_ANNCE_MAX = 100; -const float NOTIF_INFO_MAX = 300; +const float NOTIF_INFO_MAX = 350; const float NOTIF_CENTER_MAX = 250; const float NOTIF_MULTI_MAX = 200; const float NOTIF_CHOICE_MAX = 30; diff --git a/qcsrc/server/mutators/gamemode_onslaught.qc b/qcsrc/server/mutators/gamemode_onslaught.qc index 12035f413..28532528d 100644 --- a/qcsrc/server/mutators/gamemode_onslaught.qc +++ b/qcsrc/server/mutators/gamemode_onslaught.qc @@ -536,7 +536,7 @@ void ons_ControlPoint_Icon_BuildThink() self.owner.iscaptured = true; self.solid = SOLID_BBOX; - pointparticles(particleeffectnum(sprintf("%s_cap", Static_Team_ColorName_Lower(self.owner.team))), self.owner.origin, '0 0 0', 1); + Send_Effect(sprintf("%s_cap", Static_Team_ColorName_Lower(self.owner.team)), self.owner.origin, '0 0 0', 1); WaypointSprite_UpdateMaxHealth(self.owner.sprite, self.max_health); WaypointSprite_UpdateHealth(self.owner.sprite, self.health); @@ -567,7 +567,7 @@ void ons_ControlPoint_Icon_BuildThink() setmodel_fixsize(self.owner, "models/onslaught/controlpoint_pad2.md3"); if(random() < 0.9 - self.health / self.max_health) - pointparticles(particleeffectnum("rage"), self.origin + 10 * randomvec(), '0 0 -1', 1); + Send_Effect("rage", self.origin + 10 * randomvec(), '0 0 -1', 1); } void ons_ControlPoint_Icon_Spawn(entity cp, entity player) @@ -595,7 +595,7 @@ void ons_ControlPoint_Icon_Spawn(entity cp, entity player) cp.team = e.team; cp.colormap = e.colormap; - pointparticles(particleeffectnum(sprintf("%sflag_touch", Static_Team_ColorName_Lower(player.team))), e.origin, '0 0 0', 1); + Send_Effect(sprintf("%sflag_touch", Static_Team_ColorName_Lower(player.team)), e.origin, '0 0 0', 1); WaypointSprite_UpdateBuildFinished(cp.sprite, time + (e.max_health - e.health) / (e.count / ONS_CP_THINKRATE)); WaypointSprite_UpdateRule(cp.sprite,cp.team,SPRITERULE_TEAMPLAY); @@ -670,7 +670,7 @@ void ons_ControlPoint_Touch() entity toucher = other; int attackable; - if((toucher.vehicle_flags & VHF_ISVEHICLE) && toucher.owner) + if(IS_VEHICLE(toucher) && toucher.owner) if(autocvar_g_onslaught_allow_vehicle_touch) toucher = toucher.owner; else @@ -923,7 +923,7 @@ void ons_GeneratorDamage(entity inflictor, entity attacker, float damage, int de else { // particles on every hit - pointparticles(particleeffectnum("sparks"), hitloc, force * -1, 1); + Send_Effect("sparks", hitloc, force * -1, 1); //sound on every hit if (random() < 0.5) @@ -1689,7 +1689,7 @@ bool ons_Teleport(entity player, entity tele_target, float range, bool tele_effe { if ( tele_effects ) { - pointparticles(particleeffectnum("teleport"), player.origin, '0 0 0', 1); + Send_Effect("teleport", player.origin, '0 0 0', 1); sound (player, CH_TRIGGER, "misc/teleport.wav", VOL_BASE, ATTEN_NORM); } setorigin(player, loc); @@ -1699,7 +1699,7 @@ bool ons_Teleport(entity player, entity tele_target, float range, bool tele_effe player.teleport_antispam = time + autocvar_g_onslaught_teleport_wait; if ( tele_effects ) - pointparticles(particleeffectnum("teleport"), player.origin + v_forward * 32, '0 0 0', 1); + Send_Effect("teleport", player.origin + v_forward * 32, '0 0 0', 1); return true; } } diff --git a/qcsrc/server/waypointsprites.qc b/qcsrc/server/waypointsprites.qc index 4a4d98643..136beddb9 100644 --- a/qcsrc/server/waypointsprites.qc +++ b/qcsrc/server/waypointsprites.qc @@ -203,7 +203,7 @@ float WaypointSprite_visible_for_player(entity e) { if(!autocvar_sv_itemstime) return FALSE; - if(!warmup_stage && e.classname == "player") + if(!warmup_stage && IS_PLAYER(e)) return FALSE; } else if(self.team && self.rule == SPRITERULE_DEFAULT) -- 2.39.2