]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'refs/remotes/origin/divVerent/tag_seeker'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 9 May 2010 18:01:03 +0000 (20:01 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 9 May 2010 18:01:03 +0000 (20:01 +0200)
1  2 
qcsrc/client/View.qc

diff --combined qcsrc/client/View.qc
index 2c898bbcbb5470a5ffbd5ee39cd5d62384b60f8a,0802adef8711f8417811dd418e319f3cba848dce..0557db1160be5c4a8d0e7d4ae9339e9b72837aae
@@@ -291,6 -291,10 +291,10 @@@ float TrueAimCheck(
                        mi = '-16 -16 -16';
                        ma = '16 16 16';
                        break;
+               case WEP_SEEKER: // projectile has a size!
+                       mi = '-2 -2 -2';
+                       ma = '2 2 2';
+                       break;
                case WEP_ELECTRO: // projectile has a size!
                        mi = '0 0 -3';
                        ma = '0 0 -3';
@@@ -363,19 -367,17 +367,19 @@@ void CSQC_UpdateView(float w, float h
        vo = '0 0 1' * getstati(STAT_VIEWHEIGHT);
  
        warpzone_fixview_origin = pmove_org + vo;
 -      warpzone_fixview_angles = input_angles;
 +      warpzone_fixview_cl_viewangles = input_angles;
 +      warpzone_fixview_angles = view_angles;
        WarpZone_FixView();
        pmove_org = warpzone_fixview_origin - vo;
 -      input_angles = warpzone_fixview_angles;
 +      input_angles = warpzone_fixview_cl_viewangles;
 +      view_angles = warpzone_fixview_angles;
  
        if(cvar("cl_lockview"))
        {
 -              pmove_org = warpzone_fixview_origin = freeze_pmove_org;
 -              input_angles = freeze_input_angles;
 +              pmove_org = freeze_pmove_org;
 +              input_angles = view_angles = freeze_input_angles;
                R_SetView(VF_ORIGIN, pmove_org + vo);
 -              R_SetView(VF_ANGLES, input_angles);
 +              R_SetView(VF_ANGLES, view_angles);
                //R_SetView(VF_CL_VIEWANGLES, input_angles);
        }
        freeze_pmove_org = pmove_org;