From c606e5f848ffb0a2e92d7fb471a9f8b9e3cbfe97 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 9 Jun 2016 21:45:49 +1000 Subject: [PATCH] Remove even more self --- .../gamemodes/gamemode/onslaught/onslaught.qc | 4 +- qcsrc/common/t_items.qc | 2 +- qcsrc/lib/warpzone/server.qc | 2 +- qcsrc/lib/warpzone/server.qh | 2 +- qcsrc/server/cl_player.qc | 2 +- qcsrc/server/item_key.qc | 2 +- qcsrc/server/miscfunctions.qc | 88 +++++++++---------- qcsrc/server/miscfunctions.qh | 4 +- qcsrc/server/mutators/events.qh | 1 + qcsrc/server/mutators/mutator/gamemode_ctf.qc | 2 +- .../mutators/mutator/gamemode_domination.qc | 2 +- 11 files changed, 56 insertions(+), 55 deletions(-) diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc b/qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc index 1b6433076c..08d0183e35 100644 --- a/qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc +++ b/qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc @@ -889,7 +889,7 @@ void ons_ControlPoint_Setup(entity cp) { setorigin(cp, cp.origin + '0 0 20'); cp.noalign = false; - WITHSELF(cp, droptofloor()); + droptofloor(cp); cp.movetype = MOVETYPE_TOSS; } @@ -1126,7 +1126,7 @@ void ons_GeneratorSetup(entity gen) // called when spawning a generator entity o gen.colormap = 1024 + (teamnumber - 1) * 17; // generator placement - WITHSELF(gen, droptofloor()); + droptofloor(gen); // waypointsprites WaypointSprite_SpawnFixed(WP_Null, gen.origin + CPGEN_WAYPOINT_OFFSET, gen, sprite, RADARICON_NONE); diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc index f8002c8cf0..8848aa917b 100644 --- a/qcsrc/common/t_items.qc +++ b/qcsrc/common/t_items.qc @@ -1131,7 +1131,7 @@ void _StartItem(entity this, entity def, float defaultrespawntime, float default this.SendFlags |= ISF_SIZE; // note droptofloor returns false if stuck/or would fall too far if (!this.noalign) - WITHSELF(this, droptofloor()); + droptofloor(this); waypoint_spawnforitem(this); } diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc index 0fb8dd235f..28c11e91ce 100644 --- a/qcsrc/lib/warpzone/server.qc +++ b/qcsrc/lib/warpzone/server.qc @@ -497,7 +497,7 @@ float WarpZone_Projectile_Touch(entity this) } #endif - if(WarpZone_Projectile_Touch_ImpactFilter_Callback()) + if(WarpZone_Projectile_Touch_ImpactFilter_Callback(this, other)) return true; #endif diff --git a/qcsrc/lib/warpzone/server.qh b/qcsrc/lib/warpzone/server.qh index c6c7b9840c..9abea2a689 100644 --- a/qcsrc/lib/warpzone/server.qh +++ b/qcsrc/lib/warpzone/server.qh @@ -7,7 +7,7 @@ float WarpZone_Projectile_Touch(entity this); // THESE must be defined by calling QC code: void WarpZone_PostTeleportPlayer_Callback(entity pl); -float WarpZone_Projectile_Touch_ImpactFilter_Callback(); +bool WarpZone_Projectile_Touch_ImpactFilter_Callback(entity this, entity toucher); // server must also define a float called ENT_CLIENT_WARPZONE for the initial byte of WarpZone entities //const float ENT_CLIENT_WARPZONE; diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc index 42a301eaf8..1c17abdd34 100644 --- a/qcsrc/server/cl_player.qc +++ b/qcsrc/server/cl_player.qc @@ -675,7 +675,7 @@ int Say(entity source, int teamsay, entity privatesay, string msgin, bool floodc if (!teamsay && !privatesay) if (substring(msgin, 0, 1) == " ") msgin = substring(msgin, 1, -1); // work around DP say bug (say_team does not have this!) - msgin = formatmessage(msgin); + msgin = formatmessage(source, msgin); string colorstr; if (!IS_PLAYER(source)) diff --git a/qcsrc/server/item_key.qc b/qcsrc/server/item_key.qc index bf389377f7..cbc6f94f48 100644 --- a/qcsrc/server/item_key.qc +++ b/qcsrc/server/item_key.qc @@ -119,7 +119,7 @@ void spawn_item_key(entity this) // first nudge it off the floor a little bit to avoid math errors setorigin(this, this.origin + '0 0 1'); // note droptofloor returns false if stuck/or would fall too far - WITHSELF(this, droptofloor()); + droptofloor(this); } settouch(this, item_key_touch); diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 3a918c2730..bcb8d02d9a 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -210,8 +210,8 @@ string NearestLocation(vector p) return ret; } -string formatmessage(string msg) -{SELFPARAM(); +string formatmessage(entity this, string msg) +{ float p, p1, p2; float n; vector cursor; @@ -223,12 +223,12 @@ string formatmessage(string msg) n = 7; ammoitems = "batteries"; - if(self.items & ITEM_Plasma.m_itemid) ammoitems = ITEM_Plasma.m_name; - if(self.items & ITEM_Cells.m_itemid) ammoitems = ITEM_Cells.m_name; - if(self.items & ITEM_Rockets.m_itemid) ammoitems = ITEM_Rockets.m_name; - if(self.items & ITEM_Shells.m_itemid) ammoitems = ITEM_Shells.m_name; + if(this.items & ITEM_Plasma.m_itemid) ammoitems = ITEM_Plasma.m_name; + if(this.items & ITEM_Cells.m_itemid) ammoitems = ITEM_Cells.m_name; + if(this.items & ITEM_Rockets.m_itemid) ammoitems = ITEM_Rockets.m_name; + if(this.items & ITEM_Shells.m_itemid) ammoitems = ITEM_Shells.m_name; - WarpZone_crosshair_trace(self); + WarpZone_crosshair_trace(this); cursor = trace_endpos; cursor_ent = trace_ent; @@ -259,21 +259,21 @@ string formatmessage(string msg) case "%": replacement = "%"; break; case "\\":replacement = "\\"; break; case "n": replacement = "\n"; break; - case "a": replacement = ftos(floor(self.armorvalue)); break; - case "h": replacement = ftos(floor(self.health)); break; - case "l": replacement = NearestLocation(self.origin); break; + case "a": replacement = ftos(floor(this.armorvalue)); break; + case "h": replacement = ftos(floor(this.health)); break; + case "l": replacement = NearestLocation(this.origin); break; case "y": replacement = NearestLocation(cursor); break; - case "d": replacement = NearestLocation(self.death_origin); break; - case "w": replacement = ((PS(self).m_weapon == WEP_Null) ? ((PS(self).m_switchweapon == WEP_Null) ? Weapons_from(self.cnt) : PS(self).m_switchweapon) : PS(self).m_weapon).m_name; break; + case "d": replacement = NearestLocation(this.death_origin); break; + case "w": replacement = ((PS(this).m_weapon == WEP_Null) ? ((PS(this).m_switchweapon == WEP_Null) ? Weapons_from(this.cnt) : PS(this).m_switchweapon) : PS(this).m_weapon).m_name; break; case "W": replacement = ammoitems; break; case "x": replacement = ((cursor_ent.netname == "" || !cursor_ent) ? "nothing" : cursor_ent.netname); break; - case "s": replacement = ftos(vlen(self.velocity - self.velocity_z * '0 0 1')); break; - case "S": replacement = ftos(vlen(self.velocity)); break; + case "s": replacement = ftos(vlen(this.velocity - this.velocity_z * '0 0 1')); break; + case "S": replacement = ftos(vlen(this.velocity)); break; case "t": replacement = seconds_tostring(ceil(max(0, autocvar_timelimit * 60 + game_starttime - time))); break; case "T": replacement = seconds_tostring(floor(time - game_starttime)); break; default: { - MUTATOR_CALLHOOK(FormatMessage, escape, replacement, msg); + MUTATOR_CALLHOOK(FormatMessage, this, escape, replacement, msg); escape = format_escape; replacement = format_replacement; break; @@ -970,13 +970,13 @@ void adaptor_think2use_hittype_splash(entity this) // for timed projectile deton // deferred dropping void DropToFloor_Handler(entity this) { - builtin_droptofloor(); - self.dropped_origin = self.origin; + WITHSELF(this, builtin_droptofloor()); + this.dropped_origin = this.origin; } -void droptofloor() -{SELFPARAM(); - InitializeEntity(self, DropToFloor_Handler, INITPRIO_DROPTOFLOOR); +void droptofloor(entity this) +{ + InitializeEntity(this, DropToFloor_Handler, INITPRIO_DROPTOFLOOR); } @@ -1030,8 +1030,8 @@ float tracebox_hits_box(vector start, vector mi, vector ma, vector end, vector t return trace_hits_box(start, end, thmi - ma, thma - mi); } -float SUB_NoImpactCheck() -{SELFPARAM(); +bool SUB_NoImpactCheck(entity this, entity toucher) +{ // zero hitcontents = this is not the real impact, but either the // mirror-impact of something hitting the projectile instead of the // projectile hitting the something, or a touchareagrid one. Neither of @@ -1039,17 +1039,17 @@ float SUB_NoImpactCheck() if(trace_dphitcontents == 0) { //dprint("A hit happened with zero hit contents... DEBUG THIS, this should never happen for projectiles! Projectile will self-destruct.\n"); - LOG_TRACEF("A hit from a projectile happened with no hit contents! DEBUG THIS, this should never happen for projectiles! Profectile will self-destruct. (edict: %d, classname: %s, origin: %s)\n", etof(self), self.classname, vtos(self.origin)); - checkclient(); + LOG_TRACEF("A hit from a projectile happened with no hit contents! DEBUG THIS, this should never happen for projectiles! Profectile will self-destruct. (edict: %d, classname: %s, origin: %s)\n", etof(this), this.classname, vtos(this.origin)); + WITHSELF(this, checkclient()); } if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT) - return 1; - if (other == world && self.size != '0 0 0') + return true; + if (toucher == world && this.size != '0 0 0') { vector tic; - tic = self.velocity * sys_frametime; - tic = tic + normalize(tic) * vlen(self.maxs - self.mins); - traceline(self.origin - tic, self.origin + tic, MOVE_NORMAL, self); + tic = this.velocity * sys_frametime; + tic = tic + normalize(tic) * vlen(this.maxs - this.mins); + traceline(this.origin - tic, this.origin + tic, MOVE_NORMAL, this); if (trace_fraction >= 1) { LOG_TRACE("Odd... did not hit...?\n"); @@ -1057,37 +1057,37 @@ float SUB_NoImpactCheck() else if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT) { LOG_TRACE("Detected and prevented the sky-grapple bug.\n"); - return 1; + return true; } } - return 0; + return false; } -#define SUB_OwnerCheck() (other && (other == self.owner)) +#define SUB_OwnerCheck(ent,oth) ((oth) && ((oth) == (ent).owner)) void W_Crylink_Dequeue(entity e); -float WarpZone_Projectile_Touch_ImpactFilter_Callback() -{SELFPARAM(); - if(SUB_OwnerCheck()) +bool WarpZone_Projectile_Touch_ImpactFilter_Callback(entity this, entity toucher) +{ + if(SUB_OwnerCheck(this, toucher)) return true; - if(SUB_NoImpactCheck()) + if(SUB_NoImpactCheck(this, toucher)) { - if(self.classname == "nade") + if(this.classname == "nade") return false; // no checks here - else if(self.classname == "grapplinghook") - RemoveGrapplingHook(self.realowner); - else if(self.classname == "spike") + else if(this.classname == "grapplinghook") + RemoveGrapplingHook(this.realowner); + else if(this.classname == "spike") { - W_Crylink_Dequeue(self); - remove(self); + W_Crylink_Dequeue(this); + remove(this); } else - remove(self); + remove(this); return true; } if(trace_ent && trace_ent.solid > SOLID_TRIGGER) - UpdateCSQCProjectile(self); + UpdateCSQCProjectile(this); return false; } diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh index a5256c9ea8..de42eda519 100644 --- a/qcsrc/server/miscfunctions.qh +++ b/qcsrc/server/miscfunctions.qh @@ -56,7 +56,7 @@ void stopsoundto(float _dest, entity e, float chan); void soundtoat(float _dest, entity e, vector o, float chan, string samp, float vol, float _atten); void objerror(string s); -void droptofloor(); +void droptofloor(entity this); void attach_sameorigin(entity e, entity to, string tag); @@ -68,7 +68,7 @@ void detach_sameorigin(entity e); void follow_sameorigin(entity e, entity to); -string formatmessage(string msg); +string formatmessage(entity this, string msg); void GameLogEcho(string s); diff --git a/qcsrc/server/mutators/events.qh b/qcsrc/server/mutators/events.qh index ad97997e2f..bfec6f2192 100644 --- a/qcsrc/server/mutators/events.qh +++ b/qcsrc/server/mutators/events.qh @@ -115,6 +115,7 @@ MUTATOR_HOOKABLE(SpectateCopy, EV_SpectateCopy); /** called when formatting a chat message to replace fancy functions */ #define EV_FormatMessage(i, o) \ + /**/ i(entity, __self) \ /**/ i(string, format_escape) \ /**/ i(string, format_replacement) \ /**/ o(string, format_replacement) \ diff --git a/qcsrc/server/mutators/mutator/gamemode_ctf.qc b/qcsrc/server/mutators/mutator/gamemode_ctf.qc index cbd5272890..84a80a7860 100644 --- a/qcsrc/server/mutators/mutator/gamemode_ctf.qc +++ b/qcsrc/server/mutators/mutator/gamemode_ctf.qc @@ -1285,7 +1285,7 @@ void ctf_FlagSetup(int teamnumber, entity flag) // called when spawning a flag e else // drop to floor, automatically find a platform and set that as spawn origin { flag.noalign = false; - WITHSELF(flag, droptofloor()); + droptofloor(flag); flag.movetype = MOVETYPE_TOSS; } diff --git a/qcsrc/server/mutators/mutator/gamemode_domination.qc b/qcsrc/server/mutators/mutator/gamemode_domination.qc index 5514ed201b..84d7200b54 100644 --- a/qcsrc/server/mutators/mutator/gamemode_domination.qc +++ b/qcsrc/server/mutators/mutator/gamemode_domination.qc @@ -355,7 +355,7 @@ void dom_controlpoint_setup(entity this) self.flags = FL_ITEM; setsize(self, '-32 -32 -32', '32 32 32'); setorigin(self, self.origin + '0 0 20'); - droptofloor(); + droptofloor(self); waypoint_spawnforitem(self); WaypointSprite_SpawnFixed(WP_DomNeut, self.origin + '0 0 32', self, sprite, RADARICON_DOMPOINT); -- 2.39.2