Remove unused SELFPARAM()

diff --git a/qcsrc/client/hud/panel/weapons.qc b/qcsrc/client/hud/panel/weapons.qc
index 44499566eea72d8c8a7ec9bac9d1583e1c0d1051..c465caf4fddc3911ca2e997adaead177a2f6fa40 100644 (file)
--- a/qcsrc/client/hud/panel/weapons.qc
+++ b/qcsrc/client/hud/panel/weapons.qc
@@ -21,7 +21,6 @@ int weaponorder_cmp(int i, int j, entity pass)
 
 void HUD_Weapons()
 {
-       SELFPARAM();
        // declarations
        WepSet weapons_stat = WepSet_GetFromStat();
        int i;

diff --git a/qcsrc/client/player_skeleton.qc b/qcsrc/client/player_skeleton.qc
index 49da661ad69cfdcc076ab0571a9ac073342aa052..c8abdc6f57b6cf7d62f20ae5c6288aae3397549f 100644 (file)
--- a/qcsrc/client/player_skeleton.qc
+++ b/qcsrc/client/player_skeleton.qc
@@ -110,7 +110,7 @@ void free_skeleton_from_frames(entity e)
 }
 
 void skeleton_from_frames(entity e, bool is_dead)
-{SELFPARAM();
+{
     TC(bool, is_dead);
        float m = e.modelindex;
        if(!e.skeletonindex)

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index cf25209c769d6edbc7492eea099ddadda51efa35..c49fa65fc72b894bc44999393adf8c8de40b814d 100644 (file)
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -1002,7 +1002,6 @@ float HUD_WouldDrawScoreboard() {
 float average_accuracy;
 vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size)
 {
-       SELFPARAM();
        WepSet weapons_stat = WepSet_GetFromStat();
        WepSet weapons_inmap = WepSet_GetFromStat_InMap();
        float initial_posx = pos.x;

diff --git a/qcsrc/common/effects/qc/rubble.qh b/qcsrc/common/effects/qc/rubble.qh
index 73744e6220c951086dd5c474d917c7f2255c4c73..6b36b2c53e4a283c43a2f6f5b9b8cd053cdb0d53 100644 (file)
--- a/qcsrc/common/effects/qc/rubble.qh
+++ b/qcsrc/common/effects/qc/rubble.qh
@@ -8,7 +8,6 @@ class(Rubble).float creationtime;
 
 void RubbleLimit(string cname, float limit, void(entity) deleteproc)
 {
-       SELFPARAM();
        entity e;
        entity oldest;
        float c;

diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc b/qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc
index c17c7865974f2b5f0ecd3b931df4246c1b8d6776..f4776388277f2059869a39f2217f4208409302a2 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc
+++ b/qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc
@@ -1923,7 +1923,7 @@ MUTATOR_HOOKFUNCTION(ons, PlayerSpawn)
 }
 
 MUTATOR_HOOKFUNCTION(ons, PlayerDies)
-{SELFPARAM();
+{
        frag_target.ons_deathloc = frag_target.origin;
        entity l;
        for(l = ons_worldgeneratorlist; l; l = l.ons_worldgeneratornext)

diff --git a/qcsrc/common/monsters/spawn.qc b/qcsrc/common/monsters/spawn.qc
index 70459263f1087da264e10fe71d95b218bbf59279..5e1af3df7d305198f93ee75bf27875a78816454b 100644 (file)
--- a/qcsrc/common/monsters/spawn.qc
+++ b/qcsrc/common/monsters/spawn.qc
@@ -9,7 +9,7 @@
     #include <server/defs.qh>
 #endif
 entity spawnmonster (string monster, float monster_id, entity spawnedby, entity own, vector orig, float respwn, float invincible, float moveflag)
-{SELFPARAM();
+{
        float i;
        entity e = spawn();
 

diff --git a/qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc b/qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc
index fa30be11ca9ce4c7d97bae59824f4144145ee24f..0e7d5813e2a5755c0222e37eb6c1e36eda0f7e09 100644 (file)
--- a/qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc
+++ b/qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc
@@ -284,7 +284,9 @@ MUTATOR_HOOKFUNCTION(bugrigs, PM_Physics)
 
 MUTATOR_HOOKFUNCTION(bugrigs, PlayerPhysics)
 {
+#ifdef SVQC
     SELFPARAM();
+#endif
        if(!PHYS_BUGRIGS(self)) { return false; }
 #ifdef SVQC
        self.bugrigs_prevangles = self.angles;

diff --git a/qcsrc/common/mutators/mutator/itemstime.qc b/qcsrc/common/mutators/mutator/itemstime.qc
index f3612554d63e383e16d66bf93642311d8d157055..e6599e6142922936c6e71aa2c57b488b491f3d16 100644 (file)
--- a/qcsrc/common/mutators/mutator/itemstime.qc
+++ b/qcsrc/common/mutators/mutator/itemstime.qc
@@ -149,7 +149,7 @@ float Item_ItemsTime_UpdateTime(entity e, float t)
 }
 
 MUTATOR_HOOKFUNCTION(itemstime, reset_map_global)
-{SELFPARAM();
+{
     Item_ItemsTime_ResetTimes();
     // ALL the times need to be reset before .reset()ing each item
     // since Item_Reset schedules respawn of superweapons and powerups

diff --git a/qcsrc/common/mutators/mutator/midair/midair.qc b/qcsrc/common/mutators/mutator/midair/midair.qc
index 622572c365a6863d8c6dfd8f65d7a8c3500a3fa1..c02642dab4828cafa38262ba0742c48dba74cf73 100644 (file)
--- a/qcsrc/common/mutators/mutator/midair/midair.qc
+++ b/qcsrc/common/mutators/mutator/midair/midair.qc
@@ -7,7 +7,7 @@ REGISTER_MUTATOR(midair, cvar("g_midair"));
 .float midair_shieldtime;
 
 MUTATOR_HOOKFUNCTION(midair, PlayerDamage_Calculate)
-{SELFPARAM();
+{
        if(IS_PLAYER(frag_attacker))
        if(IS_PLAYER(frag_target))
        if(time < frag_target.midair_shieldtime)

diff --git a/qcsrc/common/triggers/platforms.qc b/qcsrc/common/triggers/platforms.qc
index c834a06a29c5ffb205366067c2c130de624957d7..a2efc1142e316aeee6e4cd5b4ab740cc72a924ea 100644 (file)
--- a/qcsrc/common/triggers/platforms.qc
+++ b/qcsrc/common/triggers/platforms.qc
@@ -1,6 +1,7 @@
 void generic_plat_blocked()
-{SELFPARAM();
+{
 #ifdef SVQC
+    SELFPARAM();
        if(self.dmg && other.takedamage != DAMAGE_NO)
        {
                if(self.dmgtime2 < time)

diff --git a/qcsrc/common/triggers/subs.qh b/qcsrc/common/triggers/subs.qh
index 19ccde9dca08ec764fa86fd5a0a788e915642d36..aebda5d0a33b5a9ac3709b157f2e21a22d69b893 100644 (file)
--- a/qcsrc/common/triggers/subs.qh
+++ b/qcsrc/common/triggers/subs.qh
@@ -29,7 +29,7 @@
 .vector move_origin;
 
        void SUB_SETORIGIN(entity s, vector v)
-       {SELFPARAM();
+       {
                s.move_origin = v;
                _Movetype_LinkEdict(s, true);
        }

diff --git a/qcsrc/common/triggers/teleporters.qc b/qcsrc/common/triggers/teleporters.qc
index 52324733f05b6b68da3def7c0bcb36575a02e075..afeabfcddc3cba2cf3da9d779b5007a79176505c 100644 (file)
--- a/qcsrc/common/triggers/teleporters.qc
+++ b/qcsrc/common/triggers/teleporters.qc
@@ -68,7 +68,7 @@ void spawn_tdeath(vector v0, entity e, vector v)
 #endif
 
 void TeleportPlayer(entity teleporter, entity player, vector to, vector to_angles, vector to_velocity, vector telefragmin, vector telefragmax, float tflags)
-{SELFPARAM();
+{
        entity telefragger;
        vector from;
 
@@ -80,6 +80,7 @@ void TeleportPlayer(entity teleporter, entity player, vector to, vector to_angle
        makevectors (to_angles);
 
 #ifdef SVQC
+    SELFPARAM();
        if(player.teleportable == TELEPORT_NORMAL) // don't play sounds or show particles for anything that isn't a player, maybe change later to block only observers
        {
                if(self.pushltime < time) // only show one teleport effect per teleporter per 0.2 seconds, for better fps
@@ -299,7 +300,7 @@ entity Teleport_Find(vector mi, vector ma)
 }
 
 void WarpZone_PostTeleportPlayer_Callback(entity pl)
-{SELFPARAM();
+{
 #ifdef SVQC
        makevectors(pl.angles);
        Reset_ArcBeam(pl, v_forward);

diff --git a/qcsrc/common/vehicles/cl_vehicles.qc b/qcsrc/common/vehicles/cl_vehicles.qc
index 72334b100840ea0c24402c2fb401a6b68e120c2a..9a9b8b08bc3b6b2f43dafb2932ffe118c5ac8a41 100644 (file)
--- a/qcsrc/common/vehicles/cl_vehicles.qc
+++ b/qcsrc/common/vehicles/cl_vehicles.qc
@@ -294,7 +294,6 @@ void Vehicles_drawHUD(
 
 void Vehicles_drawCrosshair(string crosshair)
 {
-       SELFPARAM();
        vector tmpSize = '0 0 0';
        vector tmpPos  = '0 0 0';
 

diff --git a/qcsrc/common/vehicles/vehicle/racer.qc b/qcsrc/common/vehicles/vehicle/racer.qc
index 6d0a2b9785657648071a65725afa1e3e9fc0ac3d..ce5e0043da807878bca059e2e5a8f18ba6e2e538 100644 (file)
--- a/qcsrc/common/vehicles/vehicle/racer.qc
+++ b/qcsrc/common/vehicles/vehicle/racer.qc
@@ -578,8 +578,8 @@ METHOD(Racer, vr_impact, void(Racer thisveh, entity instance))
 
 METHOD(Racer, vr_enter, void(Racer thisveh, entity instance))
 {
-    SELFPARAM();
 #ifdef SVQC
+    SELFPARAM();
     self.movetype = MOVETYPE_BOUNCE;
     self.owner.vehicle_health = (self.vehicle_health / autocvar_g_vehicle_racer_health)  * 100;
     self.owner.vehicle_shield = (self.vehicle_shield / autocvar_g_vehicle_racer_shield)  * 100;
@@ -587,15 +587,15 @@ METHOD(Racer, vr_enter, void(Racer thisveh, entity instance))
     if(self.owner.flagcarried)
        setorigin(self.owner.flagcarried, '-190 0 96');
 #elif defined(CSQC)
-
+    SELFPARAM();
     self.move_movetype = MOVETYPE_BOUNCE;
 #endif
 }
 
 METHOD(Racer, vr_spawn, void(Racer thisveh, entity instance))
 {
-    SELFPARAM();
 #ifdef SVQC
+    SELFPARAM();
     if(self.scale != 0.5)
     {
         if(autocvar_g_vehicle_racer_hovertype != 0)
@@ -676,8 +676,8 @@ METHOD(Racer, vr_crosshair, void(Racer thisveh))
 #endif
 METHOD(Racer, vr_setup, void(Racer thisveh, entity instance))
 {
-    SELFPARAM();
 #ifdef SVQC
+    SELFPARAM();
     self.vehicle_exit = racer_exit;
 #endif
 

diff --git a/qcsrc/common/vehicles/vehicle/racer_weapon.qc b/qcsrc/common/vehicles/vehicle/racer_weapon.qc
index 6b9fd722b4a7ff2fe875b338e012d0b60855ebf5..85938cee74dfd2baba2420591d3d64077c5234fd 100644 (file)
--- a/qcsrc/common/vehicles/vehicle/racer_weapon.qc
+++ b/qcsrc/common/vehicles/vehicle/racer_weapon.qc
@@ -84,7 +84,7 @@ void racer_rocket_tracker();
 void racer_rocket_groundhugger();
 
 void racer_fire_rocket(entity player, vector org, vector dir, entity trg)
-{SELFPARAM();
+{
     entity rocket = vehicles_projectile(EFFECT_RACER_ROCKETLAUNCH.eent_eff_name, SND_ROCKET_FIRE,
                            org, dir * autocvar_g_vehicle_racer_rocket_speed,
                            autocvar_g_vehicle_racer_rocket_damage, autocvar_g_vehicle_racer_rocket_radius, autocvar_g_vehicle_racer_rocket_force, 3,

diff --git a/qcsrc/server/bot/havocbot/havocbot.qc b/qcsrc/server/bot/havocbot/havocbot.qc
index 68ff899ea402dee92dca393f56a0edde7bd2211e..a2e1372da7fcacec8522ae1c1ce5e02a09d91410 100644 (file)
--- a/qcsrc/server/bot/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/havocbot/havocbot.qc
@@ -1270,7 +1270,7 @@ void havocbot_setupbot()
 }
 
 vector havocbot_dodge()
-{SELFPARAM();
+{
        // LordHavoc: disabled because this is too expensive
        return '0 0 0';
 #if 0

diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc
index 6e43d9a7bf6af39824138bec8789cf774bb071ca..14965d8c73be1189f3c0abb44675cd0af0ffcedc 100644 (file)
--- a/qcsrc/server/command/common.qc
+++ b/qcsrc/server/command/common.qc
@@ -321,7 +321,6 @@ void CommonCommand_cvar_purechanges(float request, entity caller)
 
 void CommonCommand_editmob(int request, entity caller, int argc)
 {
-       SELFPARAM();
        switch (request)
        {
                case CMD_REQUEST_COMMAND:

diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
index 75f63b71f60a17e0e2b0e470d28c1427deaac77c..e713caf7946714b8bc7c4d631638e09b8104b382 100644 (file)
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -220,7 +220,6 @@ void GameCommand_allspec(float request, float argc)
 
 void GameCommand_anticheat(float request, float argc)
 {
-       SELFPARAM();
        switch (request)
        {
                case CMD_REQUEST_COMMAND:

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index c59e8a4bfaaf7f939dc2ccd5d9b90cb309ad9759..4814c408022374fcfd84bf36cdc9f2f75043aea0 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -754,7 +754,7 @@ void precache_playermodels(string s)
 }
 
 void precache()
-{SELFPARAM();
+{
     // gamemode related things
 
     // Precache all player models if desired

diff --git a/qcsrc/server/mutators/mutator/gamemode_ctf.qc b/qcsrc/server/mutators/mutator/gamemode_ctf.qc
index fc2bf49d89c23d35f025f60f4535f587db85f36c..a29e3d55a0cb7d84cd3714a393b2fcfd1adc4d6f 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_ctf.qc
@@ -1187,7 +1187,7 @@ void ctf_DelayedFlagSetup() // called after a flag is placed on a map by ctf_Fla
 .bool pushable;
 
 void ctf_FlagSetup(int teamnumber, entity flag) // called when spawning a flag entity on the map as a spawnfunc
-{SELFPARAM();
+{
        // declarations
        setself(flag); // for later usage with droptofloor()
 

diff --git a/qcsrc/server/mutators/mutator/gamemode_freezetag.qc b/qcsrc/server/mutators/mutator/gamemode_freezetag.qc
index 4d7b8c9f9d47f14d8ffe284cfcb83499f7ad5d32..5bc82f19601c28ea0882bf273c4a7f9e509acd93 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_freezetag.qc
@@ -365,13 +365,13 @@ void ft_RemovePlayer()
 }
 
 MUTATOR_HOOKFUNCTION(ft, ClientDisconnect)
-{SELFPARAM();
+{
        ft_RemovePlayer();
        return 1;
 }
 
 MUTATOR_HOOKFUNCTION(ft, MakePlayerObserver)
-{SELFPARAM();
+{
        ft_RemovePlayer();
        return false;
 }
@@ -455,7 +455,7 @@ MUTATOR_HOOKFUNCTION(ft, PlayerSpawn)
 }
 
 MUTATOR_HOOKFUNCTION(ft, reset_map_players)
-{SELFPARAM();
+{
        FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(
                it.killcount = 0;
                it.freezetag_frozen_timeout = -1;

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index c94ff92d98c2ae5d2aaf32753f48b7fb771dfcb7..ad1b4588e90c9aa488e17fd3cc64cc78e6ad375a 100644 (file)
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -156,7 +156,6 @@ bool autocvar_sv_autopause = true;
 float RedirectionThink();
 void StartFrame()
 {
-       SELFPARAM();
        execute_next_frame();
        if (autocvar_sv_autopause && !server_is_dedicated) Pause_TryPause(true);