Merge branch 'master' into Mario/vaporizer_damage

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / weapons / hitplot.qc

diff --git a/qcsrc/server/weapons/hitplot.qc b/qcsrc/server/weapons/hitplot.qc
index ace69b6721402710ec76c5b7388c60320fab59f2..065edf1b1478661e197562cf4f3e413c61e9d704 100644 (file)
--- a/qcsrc/server/weapons/hitplot.qc
+++ b/qcsrc/server/weapons/hitplot.qc
@@ -1,21 +1,15 @@
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "../../dpdefs/progsdefs.qc"
-    #include "../../dpdefs/dpextensions.qc"
-    #include "../../common/weapons/weapons.qh"
-    #include "hitplot.qh"
-    #include "../autocvars.qh"
-    #include "../defs.qh"
-    #include "../antilag.qh"
-#endif
+#include "hitplot.qh"
+#include "../_all.qh"
+
+#include "../antilag.qh"
+#include "../../common/weapons/all.qh"
 
 vector W_HitPlotUnnormalizedUntransform(vector screenforward, vector screenright, vector screenup, vector v)
 {
        vector ret;
-       ret_x = screenright * v;
-       ret_y = screenup * v;
-       ret_z = screenforward * v;
+       ret.x = screenright * v;
+       ret.y = screenup * v;
+       ret.z = screenforward * v;
        return ret;
 }
 
@@ -38,8 +32,8 @@ vector W_HitPlotNormalizedUntransform(vector org, entity targ, vector screenforw
                thisv = W_HitPlotUnnormalizedUntransform(screenforward, screenright, screenup, thisv);
                if(i || j || k)
                {
-                       if(mi.x > thisv.x) mi_x = thisv.x; if(ma.x < thisv.x) ma_x = thisv.x;
-                       if(mi.y > thisv.y) mi_y = thisv.y; if(ma.y < thisv.y) ma_y = thisv.y;
+                       if(mi.x > thisv.x) mi.x = thisv.x; if(ma.x < thisv.x) ma.x = thisv.x;
+                       if(mi.y > thisv.y) mi.y = thisv.y; if(ma.y < thisv.y) ma.y = thisv.y;
                        //if(mi_z > thisv_z) mi_z = thisv_z; if(ma_z < thisv_z) ma_y = thisv_z;
                }
                else
@@ -50,9 +44,9 @@ vector W_HitPlotNormalizedUntransform(vector org, entity targ, vector screenforw
        }
 
        thisv = W_HitPlotUnnormalizedUntransform(screenforward, screenright, screenup, v);
-       ret_x = (thisv.x - mi.x) / (ma.x - mi.x);
-       ret_y = (thisv.y - mi.y) / (ma.y - mi.y);
-       ret_z = thisv.z - myv.z;
+       ret.x = (thisv.x - mi.x) / (ma.x - mi.x);
+       ret.y = (thisv.y - mi.y) / (ma.y - mi.y);
+       ret.z = thisv.z - myv.z;
        return ret;
 }
 
@@ -72,7 +66,7 @@ void W_HitPlotAnalysis(entity player, vector screenforward, vector screenright,
 
                org = player.origin + player.view_ofs;
                traceline_antilag_force(player, org, org + screenforward * MAX_SHOT_DISTANCE, MOVE_NORMAL, player, lag);
-               if(IS_CLIENT(trace_ent) || (trace_ent.flags & FL_MONSTER))
+               if(IS_CLIENT(trace_ent) || IS_MONSTER(trace_ent))
                {
                        antilag_takeback(trace_ent, time - lag);
                        hitplot = W_HitPlotNormalizedUntransform(org, trace_ent, screenforward, screenright, screenup, trace_endpos);