]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Revert "Potential fix for arc's buffer overflow issue (hacky method)"
authorMario <mario@smbclan.net>
Mon, 11 Jun 2018 14:48:35 +0000 (00:48 +1000)
committerMario <mario@smbclan.net>
Mon, 11 Jun 2018 14:48:35 +0000 (00:48 +1000)
This reverts commit d35415a2feca70c00f7e009e290513a5a0b48014.

qcsrc/common/weapons/weapon/arc.qc

index 3fe93fe4cd3d189416b938a52a6e4d862cc495d8..e5d4f2eb23253dccbe414e522d0bc5ec84e8c1f0 100644 (file)
@@ -863,8 +863,6 @@ void Reset_ArcBeam()
        }
 }
 
-.float beam_tag_index;
-.int beam_prevusevieworigin;
 void Draw_ArcBeam(entity this)
 {
        float dt = time - this.move_time;
@@ -913,16 +911,10 @@ void Draw_ArcBeam(entity this)
                else
                        { start_pos = this.origin; }
 
-               if(this.beam_prevusevieworigin != this.beam_usevieworigin)
-               {
-                       this.beam_prevusevieworigin = this.beam_usevieworigin;
-                       int v_shot_idx;  // used later
-                       (v_shot_idx = gettagindex(wepent, "shot")) || (v_shot_idx = gettagindex(wepent, "tag_shot"));
-                       this.beam_tag_index = v_shot_idx;
-               }
-
-               if(this.beam_tag_index && this.beam_usevieworigin == 2)
-                       start_pos = gettaginfo(wepent, this.beam_tag_index) - '0 0 2';
+               int v_shot_idx;  // used later
+               (v_shot_idx = gettagindex(wepent, "shot")) || (v_shot_idx = gettagindex(wepent, "tag_shot"));
+               if(v_shot_idx && this.beam_usevieworigin == 2)
+                       start_pos = gettaginfo(wepent, v_shot_idx) - '0 0 2';
 
                // trace forward with an estimation
                WarpZone_TraceLine(
@@ -941,7 +933,7 @@ void Draw_ArcBeam(entity this)
 
                // move shot origin to the actual gun muzzle origin
                vector origin_offset = '0 0 0';
-               if(!this.beam_tag_index || this.beam_usevieworigin != 2)
+               if(!v_shot_idx || this.beam_usevieworigin != 2)
                {
                        this.beam_shotorigin = wepent.movedir;
                        origin_offset =