From 0d81502b46cc2a2a791a41d792160dcfafde6660 Mon Sep 17 00:00:00 2001 From: div0 Date: Tue, 21 Apr 2009 15:58:18 +0000 Subject: [PATCH] Try fixing bug on http://alientrap.org/forum/viewtopic.php?p=58125#58125 by no longer relying on the FL_NOTARGET flag. Also, makes possible to fix the cheat "notarget" in the future by making bots and turrets actually honor that field. git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6547 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_client.qc | 6 +++--- data/qcsrc/server/cl_physics.qc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index 553772871..a53b90ed7 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -385,7 +385,7 @@ float Client_customizeentityforclient() float distance; float f; - if(self.flags & FL_NOTARGET) // we don't need LOD for spectators + if(self.classname != "player") return TRUE; if(other.cvar_cl_playerdetailreduction <= 0) @@ -1922,7 +1922,7 @@ float SpectateUpdate() { if (self == self.enemy) return 0; - if(self.enemy.flags & FL_NOTARGET) + if(self.enemy.classname != "player") return 0; SpectateCopy(self.enemy); @@ -1987,7 +1987,7 @@ void LeaveSpectatorMode() if(cvar("g_campaign")) campaign_bots_may_start = 1; PutClientInServer(); - if(!(self.flags & FL_NOTARGET)) + if(self.classname == "player") bprint ("^4", self.netname, "^4 is playing now\n"); if(!cvar("g_campaign")) centerprint(self,""); // clear MOTD diff --git a/data/qcsrc/server/cl_physics.qc b/data/qcsrc/server/cl_physics.qc index 4c33f0343..747f141b0 100644 --- a/data/qcsrc/server/cl_physics.qc +++ b/data/qcsrc/server/cl_physics.qc @@ -440,14 +440,14 @@ void SV_PlayerPhysics() swampspd_mod = self.swamp_slowdown; //cvar("g_balance_swamp_moverate"); } - if(self.flags & FL_NOTARGET) + if(self.classname != "player") { maxspd_mod = cvar("sv_spectator_speed_multiplier"); if(!self.spectatorspeed) self.spectatorspeed = maxspd_mod; if(self.impulse && self.impulse <= 19) { - if(self.lastflags & FL_NOTARGET) + // if(self.lastflags & FL_NOTARGET) { if(self.impulse == 10 || self.impulse == 15 || self.impulse == 18) self.spectatorspeed = bound(1, self.spectatorspeed + 0.5, 5); -- 2.39.2