From: Rudolf Polzer Date: Thu, 22 Jul 2010 10:36:13 +0000 (+0200) Subject: yes, FALSE is the same as MOVE_NORMAL, but let's be more explicit about the trace... X-Git-Tag: xonotic-v0.1.0preview~423^2~22 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c62114bd907660df7809c18e12ae35ce5bd36428;p=xonotic%2Fxonotic-data.pk3dir.git yes, FALSE is the same as MOVE_NORMAL, but let's be more explicit about the trace type --- diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc index 8fd66038e..02cfa0a6e 100644 --- a/qcsrc/server/w_electro.qc +++ b/qcsrc/server/w_electro.qc @@ -237,9 +237,9 @@ void lgbeam_think() vecs = debug_shotorg; org = self.owner.origin + self.owner.view_ofs + v_forward * vecs_x + v_right * -vecs_y + v_up * vecs_z; - WarpZone_traceline_antilag(self.owner, self.owner.origin + self.owner.view_ofs, self.owner.origin + self.owner.view_ofs + angle * cvar("g_balance_electro_primary_range"), FALSE, self.owner, ANTILAG_LATENCY(self.owner)); + WarpZone_traceline_antilag(self.owner, self.owner.origin + self.owner.view_ofs, self.owner.origin + self.owner.view_ofs + angle * cvar("g_balance_electro_primary_range"), MOVE_NORMAL, self.owner, ANTILAG_LATENCY(self.owner)); endpos = WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos); - WarpZone_traceline_antilag(self.owner, org, endpos, FALSE, self.owner, ANTILAG_LATENCY(self.owner)); + WarpZone_traceline_antilag(self.owner, org, endpos, MOVE_NORMAL, self.owner, ANTILAG_LATENCY(self.owner)); if not(self.owner.items & IT_UNLIMITED_WEAPON_AMMO) self.owner.ammo_cells = max(0, self.owner.ammo_cells - cvar("g_balance_electro_primary_ammo") * frametime); diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc index abf1a39ef..ed1d36db8 100644 --- a/qcsrc/server/w_laser.qc +++ b/qcsrc/server/w_laser.qc @@ -168,9 +168,9 @@ void gauntletbeam_think() vecs = debug_shotorg; org = self.owner.origin + self.owner.view_ofs + v_forward * vecs_x + v_right * -vecs_y + v_up * vecs_z; - WarpZone_traceline_antilag(self.owner, self.owner.origin + self.owner.view_ofs, self.owner.origin + self.owner.view_ofs + angle * myradius, FALSE, self.owner, ANTILAG_LATENCY(self.owner)); + WarpZone_traceline_antilag(self.owner, self.owner.origin + self.owner.view_ofs, self.owner.origin + self.owner.view_ofs + angle * myradius, MOVE_NORMAL, self.owner, ANTILAG_LATENCY(self.owner)); endpos = WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos); - WarpZone_traceline_antilag(self.owner, org, endpos, FALSE, self.owner, ANTILAG_LATENCY(self.owner)); + WarpZone_traceline_antilag(self.owner, org, endpos, MOVE_NORMAL, self.owner, ANTILAG_LATENCY(self.owner)); // apply the damage if(trace_fraction < 1)