From e3b526f44015575d6370db0a96903f886d64de88 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 18 May 2016 18:47:42 +1000 Subject: [PATCH] Clean some self uses from race/cts --- qcsrc/server/mutators/mutator/gamemode_cts.qc | 10 +- .../server/mutators/mutator/gamemode_race.qc | 10 +- qcsrc/server/race.qc | 239 +++++++++--------- qcsrc/server/race.qh | 4 +- 4 files changed, 131 insertions(+), 132 deletions(-) diff --git a/qcsrc/server/mutators/mutator/gamemode_cts.qc b/qcsrc/server/mutators/mutator/gamemode_cts.qc index f05b53ce8..b669553db 100644 --- a/qcsrc/server/mutators/mutator/gamemode_cts.qc +++ b/qcsrc/server/mutators/mutator/gamemode_cts.qc @@ -214,7 +214,7 @@ MUTATOR_HOOKFUNCTION(cts, reset_map_global) MUTATOR_HOOKFUNCTION(cts, ClientConnect) {SELFPARAM(); - race_PreparePlayer(); + race_PreparePlayer(this); self.race_checkpoint = -1; if(IS_REAL_CLIENT(self)) @@ -246,7 +246,7 @@ MUTATOR_HOOKFUNCTION(cts, MakePlayerObserver) else self.frags = FRAGS_SPECTATOR; - race_PreparePlayer(); + race_PreparePlayer(this); self.race_checkpoint = -1; return false; @@ -256,7 +256,7 @@ MUTATOR_HOOKFUNCTION(cts, PlayerSpawn) {SELFPARAM(); if(spawn_spot.target == "") // Emergency: this wasn't a real spawnpoint. Can this ever happen? - race_PreparePlayer(); + race_PreparePlayer(this); // if we need to respawn, do it right self.race_respawn_checkpoint = self.race_checkpoint; @@ -273,9 +273,9 @@ MUTATOR_HOOKFUNCTION(cts, PutClientInServer) if(!gameover) { if(self.killcount == FRAGS_SPECTATOR /* initial spawn */ || g_race_qualifying) // spawn - race_PreparePlayer(); + race_PreparePlayer(this); else // respawn - race_RetractPlayer(); + race_RetractPlayer(this); race_AbandonRaceCheck(self); } diff --git a/qcsrc/server/mutators/mutator/gamemode_race.qc b/qcsrc/server/mutators/mutator/gamemode_race.qc index 7b769e29f..fc87ae979 100644 --- a/qcsrc/server/mutators/mutator/gamemode_race.qc +++ b/qcsrc/server/mutators/mutator/gamemode_race.qc @@ -246,7 +246,7 @@ MUTATOR_HOOKFUNCTION(rc, reset_map_global) MUTATOR_HOOKFUNCTION(rc, ClientConnect) {SELFPARAM(); - race_PreparePlayer(); + race_PreparePlayer(this); self.race_checkpoint = -1; string rr = RACE_RECORD; @@ -279,7 +279,7 @@ MUTATOR_HOOKFUNCTION(rc, MakePlayerObserver) else self.frags = FRAGS_SPECTATOR; - race_PreparePlayer(); + race_PreparePlayer(this); self.race_checkpoint = -1; return false; @@ -289,7 +289,7 @@ MUTATOR_HOOKFUNCTION(rc, PlayerSpawn) {SELFPARAM(); if(spawn_spot.target == "") // Emergency: this wasn't a real spawnpoint. Can this ever happen? - race_PreparePlayer(); + race_PreparePlayer(this); // if we need to respawn, do it right self.race_respawn_checkpoint = self.race_checkpoint; @@ -306,9 +306,9 @@ MUTATOR_HOOKFUNCTION(rc, PutClientInServer) if(!gameover) { if(self.killcount == FRAGS_SPECTATOR /* initial spawn */ || g_race_qualifying) // spawn - race_PreparePlayer(); + race_PreparePlayer(this); else // respawn - race_RetractPlayer(); + race_RetractPlayer(this); race_AbandonRaceCheck(self); } diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc index 6e43b97d9..ba13b14a9 100644 --- a/qcsrc/server/race.qc +++ b/qcsrc/server/race.qc @@ -561,46 +561,45 @@ void dumpsurface(entity e) } } -void checkpoint_passed() -{SELFPARAM(); +void checkpoint_passed(entity this, entity player) +{ string oldmsg; entity cp; - if(other.classname == "porto") + if(player.classname == "porto") { // do not allow portalling through checkpoints - trace_plane_normal = normalize(-1 * other.velocity); - setself(other); - W_Porto_Fail(0); + trace_plane_normal = normalize(-1 * player.velocity); + WITHSELF(player, W_Porto_Fail(0)); return; } /* * Trigger targets */ - if (!((self.spawnflags & 2) && (IS_PLAYER(other)))) + if (!((this.spawnflags & 2) && (IS_PLAYER(player)))) { - oldmsg = self.message; - self.message = ""; - SUB_UseTargets(self, other, other); // TODO: should we be using other for the trigger here? - self.message = oldmsg; + oldmsg = this.message; + this.message = ""; + SUB_UseTargets(this, player, player); // TODO: should we be using other for the trigger here? + this.message = oldmsg; } - if (!IS_PLAYER(other)) + if (!IS_PLAYER(player)) return; /* * Remove unauthorized equipment */ - Portal_ClearAll(other); + Portal_ClearAll(player); - other.porto_forbidden = 2; // decreased by 1 each StartFrame + player.porto_forbidden = 2; // decreased by 1 each StartFrame if(defrag_ents) { - if(self.race_checkpoint == -2) + if(this.race_checkpoint == -2) { - self.race_checkpoint = other.race_checkpoint; + this.race_checkpoint = player.race_checkpoint; } float largest_cp_id = 0; @@ -632,51 +631,51 @@ void checkpoint_passed() } } - if((other.race_checkpoint == -1 && self.race_checkpoint == 0) || (other.race_checkpoint == self.race_checkpoint)) + if((player.race_checkpoint == -1 && this.race_checkpoint == 0) || (player.race_checkpoint == this.race_checkpoint)) { - if(self.race_penalty) + if(this.race_penalty) { - if(other.race_lastpenalty != self) + if(player.race_lastpenalty != this) { - other.race_lastpenalty = self; - race_ImposePenaltyTime(other, self.race_penalty, self.race_penalty_reason); + player.race_lastpenalty = this; + race_ImposePenaltyTime(player, this.race_penalty, this.race_penalty_reason); } } - if(other.race_penalty) + if(player.race_penalty) return; /* * Trigger targets */ - if(self.spawnflags & 2) + if(this.spawnflags & 2) { - oldmsg = self.message; - self.message = ""; - SUB_UseTargets(self, other, other); // TODO: should we be using other for the trigger here? - self.message = oldmsg; + oldmsg = this.message; + this.message = ""; + SUB_UseTargets(this, player, player); // TODO: should we be using other for the trigger here? + this.message = oldmsg; } - if(other.race_respawn_checkpoint != self.race_checkpoint || !other.race_started) - other.race_respawn_spotref = self; // this is not a spot but a CP, but spawnpoint selection will deal with that - other.race_respawn_checkpoint = self.race_checkpoint; - other.race_checkpoint = race_NextCheckpoint(self.race_checkpoint); - other.race_started = 1; + if(player.race_respawn_checkpoint != this.race_checkpoint || !player.race_started) + player.race_respawn_spotref = this; // this is not a spot but a CP, but spawnpoint selection will deal with that + player.race_respawn_checkpoint = this.race_checkpoint; + player.race_checkpoint = race_NextCheckpoint(this.race_checkpoint); + player.race_started = 1; - race_SendTime(other, self.race_checkpoint, other.race_movetime, boolean(other.race_laptime)); + race_SendTime(player, this.race_checkpoint, player.race_movetime, boolean(player.race_laptime)); - if(!self.race_checkpoint) // start line + if(!this.race_checkpoint) // start line { - other.race_laptime = time; - other.race_movetime = other.race_movetime_frac = other.race_movetime_count = 0; - other.race_penalty_accumulator = 0; - other.race_lastpenalty = world; + player.race_laptime = time; + player.race_movetime = player.race_movetime_frac = player.race_movetime_count = 0; + player.race_penalty_accumulator = 0; + player.race_lastpenalty = world; } if(g_race_qualifying) - race_SendNextCheckpoint(other, 0); + race_SendNextCheckpoint(player, 0); - if(defrag_ents && defragcpexists < 0 && self.classname == "target_stopTimer") + if(defrag_ents && defragcpexists < 0 && this.classname == "target_stopTimer") { float fh; defragcpexists = fh = fopen(strcat("maps/", GetMapname(), ".defragcp"), FILE_WRITE); @@ -688,21 +687,21 @@ void checkpoint_passed() fclose(fh); } } - else if(other.race_checkpoint == race_NextCheckpoint(self.race_checkpoint)) + else if(player.race_checkpoint == race_NextCheckpoint(this.race_checkpoint)) { // ignored } else { - if(self.spawnflags & 4) - Damage (other, self, self, 10000, DEATH_HURTTRIGGER.m_id, other.origin, '0 0 0'); + if(this.spawnflags & 4) + Damage (player, this, this, 10000, DEATH_HURTTRIGGER.m_id, player.origin, '0 0 0'); } } void checkpoint_touch() -{ +{SELFPARAM(); EXACTTRIGGER_TOUCH; - checkpoint_passed(); + checkpoint_passed(this, other); } void checkpoint_use(entity this, entity actor, entity trigger) @@ -711,7 +710,7 @@ void checkpoint_use(entity this, entity actor, entity trigger) return; other = actor; - checkpoint_passed(); + checkpoint_passed(this, other); } bool race_waypointsprite_visible_for_player(entity this, entity player, entity view) @@ -908,90 +907,90 @@ vector trigger_race_checkpoint_spawn_evalfunc(entity player, entity spot, vector spawnfunc(trigger_race_checkpoint) { vector o; - if(!g_race && !g_cts) { remove(self); return; } + if(!g_race && !g_cts) { remove(this); return; } EXACTTRIGGER_INIT; - self.use = checkpoint_use; - if (!(self.spawnflags & 1)) - self.touch = checkpoint_touch; + this.use = checkpoint_use; + if (!(this.spawnflags & 1)) + this.touch = checkpoint_touch; - o = (self.absmin + self.absmax) * 0.5; - tracebox(o, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), o - '0 0 1' * (o.z - self.absmin.z), MOVE_NORMAL, self); - waypoint_spawnforitem_force(self, trace_endpos); - self.nearestwaypointtimeout = time + 1000000000; + o = (this.absmin + this.absmax) * 0.5; + tracebox(o, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), o - '0 0 1' * (o.z - this.absmin.z), MOVE_NORMAL, this); + waypoint_spawnforitem_force(this, trace_endpos); + this.nearestwaypointtimeout = time + 1000000000; - if(self.message == "") - self.message = "went backwards"; - if (self.message2 == "") - self.message2 = "was pushed backwards by"; - if (self.race_penalty_reason == "") - self.race_penalty_reason = "missing a checkpoint"; + if(this.message == "") + this.message = "went backwards"; + if (this.message2 == "") + this.message2 = "was pushed backwards by"; + if (this.race_penalty_reason == "") + this.race_penalty_reason = "missing a checkpoint"; - self.race_checkpoint = self.cnt; + this.race_checkpoint = this.cnt; - if(self.race_checkpoint > race_highest_checkpoint) + if(this.race_checkpoint > race_highest_checkpoint) { - race_highest_checkpoint = self.race_checkpoint; - if(self.spawnflags & 8) - race_timed_checkpoint = self.race_checkpoint; + race_highest_checkpoint = this.race_checkpoint; + if(this.spawnflags & 8) + race_timed_checkpoint = this.race_checkpoint; else race_timed_checkpoint = 0; } - if(!self.race_penalty) + if(!this.race_penalty) { - if(self.race_checkpoint) - WaypointSprite_SpawnFixed(WP_RaceCheckpoint, o, self, sprite, RADARICON_NONE); + if(this.race_checkpoint) + WaypointSprite_SpawnFixed(WP_RaceCheckpoint, o, this, sprite, RADARICON_NONE); else - WaypointSprite_SpawnFixed(WP_RaceStartFinish, o, self, sprite, RADARICON_NONE); + WaypointSprite_SpawnFixed(WP_RaceStartFinish, o, this, sprite, RADARICON_NONE); } - self.sprite.waypointsprite_visible_for_player = race_waypointsprite_visible_for_player; - self.spawn_evalfunc = trigger_race_checkpoint_spawn_evalfunc; + this.sprite.waypointsprite_visible_for_player = race_waypointsprite_visible_for_player; + this.spawn_evalfunc = trigger_race_checkpoint_spawn_evalfunc; - InitializeEntity(self, trigger_race_checkpoint_verify, INITPRIO_FINDTARGET); + InitializeEntity(this, trigger_race_checkpoint_verify, INITPRIO_FINDTARGET); } spawnfunc(target_checkpoint) // defrag entity { vector o; - if(!g_race && !g_cts) { remove(self); return; } + if(!g_race && !g_cts) { remove(this); return; } defrag_ents = 1; EXACTTRIGGER_INIT; - self.use = checkpoint_use; - if (!(self.spawnflags & 1)) - self.touch = checkpoint_touch; + this.use = checkpoint_use; + if (!(this.spawnflags & 1)) + this.touch = checkpoint_touch; - o = (self.absmin + self.absmax) * 0.5; - tracebox(o, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), o - '0 0 1' * (o.z - self.absmin.z), MOVE_NORMAL, self); - waypoint_spawnforitem_force(self, trace_endpos); - self.nearestwaypointtimeout = time + 1000000000; + o = (this.absmin + this.absmax) * 0.5; + tracebox(o, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), o - '0 0 1' * (o.z - this.absmin.z), MOVE_NORMAL, this); + waypoint_spawnforitem_force(this, trace_endpos); + this.nearestwaypointtimeout = time + 1000000000; - if(self.message == "") - self.message = "went backwards"; - if (self.message2 == "") - self.message2 = "was pushed backwards by"; - if (self.race_penalty_reason == "") - self.race_penalty_reason = "missing a checkpoint"; + if(this.message == "") + this.message = "went backwards"; + if (this.message2 == "") + this.message2 = "was pushed backwards by"; + if (this.race_penalty_reason == "") + this.race_penalty_reason = "missing a checkpoint"; - if(self.classname == "target_startTimer") - self.race_checkpoint = 0; + if(this.classname == "target_startTimer") + this.race_checkpoint = 0; else - self.race_checkpoint = -2; + this.race_checkpoint = -2; race_timed_checkpoint = 1; - if(self.race_checkpoint == 0) - WaypointSprite_SpawnFixed(WP_RaceStart, o, self, sprite, RADARICON_NONE); + if(this.race_checkpoint == 0) + WaypointSprite_SpawnFixed(WP_RaceStart, o, this, sprite, RADARICON_NONE); else - WaypointSprite_SpawnFixed(WP_RaceCheckpoint, o, self, sprite, RADARICON_NONE); + WaypointSprite_SpawnFixed(WP_RaceCheckpoint, o, this, sprite, RADARICON_NONE); - self.sprite.waypointsprite_visible_for_player = race_waypointsprite_visible_for_player; + this.sprite.waypointsprite_visible_for_player = race_waypointsprite_visible_for_player; - InitializeEntity(self, trigger_race_checkpoint_verify, INITPRIO_FINDTARGET); + InitializeEntity(this, trigger_race_checkpoint_verify, INITPRIO_FINDTARGET); } spawnfunc(target_startTimer) { spawnfunc_target_checkpoint(this); } @@ -1014,34 +1013,34 @@ void race_StartCompleting() FOREACH_CLIENT(IS_PLAYER(it) && IS_DEAD(it), LAMBDA(race_AbandonRaceCheck(it))); } -void race_PreparePlayer() -{SELFPARAM(); - race_ClearTime(self); - self.race_place = 0; - self.race_started = 0; - self.race_respawn_checkpoint = 0; - self.race_respawn_spotref = world; +void race_PreparePlayer(entity this) +{ + race_ClearTime(this); + this.race_place = 0; + this.race_started = 0; + this.race_respawn_checkpoint = 0; + this.race_respawn_spotref = world; } -void race_RetractPlayer() -{SELFPARAM(); +void race_RetractPlayer(entity this) +{ if(!g_race && !g_cts) return; - if(self.race_respawn_checkpoint == 0 || self.race_respawn_checkpoint == race_timed_checkpoint) - race_ClearTime(self); - self.race_checkpoint = self.race_respawn_checkpoint; + if(this.race_respawn_checkpoint == 0 || this.race_respawn_checkpoint == race_timed_checkpoint) + race_ClearTime(this); + this.race_checkpoint = this.race_respawn_checkpoint; } spawnfunc(info_player_race) { - if(!g_race && !g_cts) { remove(self); return; } + if(!g_race && !g_cts) { remove(this); return; } ++race_spawns; spawnfunc_info_player_deathmatch(this); - if(self.race_place > race_highest_place_spawn) - race_highest_place_spawn = self.race_place; - if(self.race_place < race_lowest_place_spawn) - race_lowest_place_spawn = self.race_place; + if(this.race_place > race_highest_place_spawn) + race_highest_place_spawn = this.race_place; + if(this.race_place < race_lowest_place_spawn) + race_lowest_place_spawn = this.race_place; } void race_ClearRecords() @@ -1058,7 +1057,7 @@ void race_ClearRecords() FOREACH_CLIENT(true, LAMBDA( float p = it.race_place; - WITHSELF(it, race_PreparePlayer()); + race_PreparePlayer(it); it.race_place = p; )); } @@ -1113,18 +1112,18 @@ void penalty_use(entity this, entity actor, entity trigger) spawnfunc(trigger_race_penalty) { // TODO: find out why this wasnt done: - //if(!g_cts && !g_race) { remove(self); return; } + //if(!g_cts && !g_race) { remove(this); return; } EXACTTRIGGER_INIT; - self.use = penalty_use; - if (!(self.spawnflags & 1)) - self.touch = penalty_touch; + this.use = penalty_use; + if (!(this.spawnflags & 1)) + this.touch = penalty_touch; - if (self.race_penalty_reason == "") - self.race_penalty_reason = "missing a checkpoint"; - if (!self.race_penalty) - self.race_penalty = 5; + if (this.race_penalty_reason == "") + this.race_penalty_reason = "missing a checkpoint"; + if (!this.race_penalty) + this.race_penalty = 5; } float race_GetFractionalLapCount(entity e) diff --git a/qcsrc/server/race.qh b/qcsrc/server/race.qh index 51ec45900..b69b0006a 100644 --- a/qcsrc/server/race.qh +++ b/qcsrc/server/race.qh @@ -44,7 +44,7 @@ string race_readUID(string map, float pos); string race_readName(string map, float pos); void race_ClearRecords(); void race_SendNextCheckpoint(entity e, float spec); -void race_PreparePlayer(); +void race_PreparePlayer(entity this); void race_send_recordtime(float msg); void race_send_speedaward(float msg); @@ -62,6 +62,6 @@ void race_send_speedaward_alltimebest(float msg); void race_SendRankings(float pos, float prevpos, float del, float msg); -void race_RetractPlayer(); +void race_RetractPlayer(entity this); void race_InitSpectator(); -- 2.39.2