Fix compile

diff --git a/qcsrc/common/mutators/mutator/instagib/instagib.qc b/qcsrc/common/mutators/mutator/instagib/instagib.qc
index 0be98ba06fb2657b2a255b02ce7bef8d6bf38c4d..8bd41449e0e2cc7b21bbca6467d06f41c9808f5e 100644 (file)
--- a/qcsrc/common/mutators/mutator/instagib/instagib.qc
+++ b/qcsrc/common/mutators/mutator/instagib/instagib.qc
@@ -209,7 +209,7 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, PlayerPowerups)
 
        if (player.items & ITEM_Invisibility.m_itemid)
        {
-               play_countdown(player.strength_finished, SND_POWEROFF);
+               play_countdown(player, player.strength_finished, SND_POWEROFF);
                if (time > player.strength_finished)
                {
                        player.alpha = default_player_alpha;
@@ -232,7 +232,7 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, PlayerPowerups)
 
        if (player.items & ITEM_Speed.m_itemid)
        {
-               play_countdown(player.invincible_finished, SND_POWEROFF);
+               play_countdown(player, player.invincible_finished, SND_POWEROFF);
                if (time > player.invincible_finished)
                {
                        player.items &= ~ITEM_Speed.m_itemid;

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index cc3a6028ec2ceeded767a7232a6dafe7689a7ae0..826af04b1bbb81de98a10d6fc9a1fa23608e64a2 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2236,7 +2236,7 @@ void PlayerPreThink ()
                                        if (time > this.respawn_time) {
                                                this.respawn_time = time + 1; // only retry once a second
                                                this.respawn_time_max = this.respawn_time;
-                                               respawn();
+                                               respawn(this);
                                        }
                                }
 

diff --git a/qcsrc/server/cl_client.qh b/qcsrc/server/cl_client.qh
index 65e505de30b86033a6ad031db26325a1c2ba2de2..d540bb16ac8bcc8aee6484da3b4c850ea853aa51 100644 (file)
--- a/qcsrc/server/cl_client.qh
+++ b/qcsrc/server/cl_client.qh
@@ -99,7 +99,7 @@ METHOD(Client, m_unwind, bool(Client this))
 
 float c1, c2, c3, c4;
 
-void play_countdown(float finished, Sound samp);
+void play_countdown(entity this, float finished, Sound samp);
 
 float CalcRotRegen(float current, float regenstable, float regenfactor, float regenlinear, float regenframetime, float rotstable, float rotfactor, float rotlinear, float rotframetime, float limit);
 

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index e74a6923e87af661cb6380c053fed265a8bad0bb..bb7f538c34ad07dbc49e9ee8490c87d15b53bc4a 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -155,7 +155,7 @@ float alreadychangedlevel;
 
 float blockSpectators; //if set, new or existing spectators or observers will be removed unless they become a player within g_maxplayers_spectator_blocktime seconds
 .float spectatortime; //point in time since the client is spectating or observing
-void checkSpectatorBlock();
+void checkSpectatorBlock(entity this);
 
 float game_completion_ratio; // 0 at start, 1 near end
 .float winning;
@@ -405,7 +405,7 @@ const float ACTIVE_TOGGLE   = 3;
 
 .float stat_respawn_time = _STAT(RESPAWN_TIME); // shows respawn time, and is negative when awaiting respawn
 
-void PlayerUseKey();
+void PlayerUseKey(entity this);
 
 USING(spawn_evalfunc_t, vector(entity this, entity player, entity spot, vector current));
 .spawn_evalfunc_t spawn_evalfunc;

diff --git a/qcsrc/server/mutators/mutator/gamemode_cts.qc b/qcsrc/server/mutators/mutator/gamemode_cts.qc
index e54e1801f4bfb67c2a53c09b354a73db4feac172..f72d932c161b467823cf28dd2a744d33176023e1 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_cts.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_cts.qc
@@ -411,7 +411,7 @@ MUTATOR_HOOKFUNCTION(cts, GetRecords)
        M_ARGV(1, string) = ret_string;
 }
 
-void ClientKill_Now();
+void ClientKill_Now(entity this);
 MUTATOR_HOOKFUNCTION(cts, ClientKill)
 {
     entity player = M_ARGV(0, entity);
@@ -423,7 +423,7 @@ MUTATOR_HOOKFUNCTION(cts, ClientKill)
                remove(player.killindicator);
                player.killindicator = world;
 
-               WITHSELF(player, ClientKill_Now()); // allow instant kill in this case
+               ClientKill_Now(player); // allow instant kill in this case
                return;
        }
 }