Port some minor code fixes from the default-erasable branch

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / all.qc

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index 9feb5ffe4369ae217f1db46954bca4f70ef1264f..bb4ae216a5a5d6db8a582404ec1a7779a4b39823 100644 (file)
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -3,7 +3,6 @@
 #define WEAPONS_ALL_C
 
 #if defined(CSQC)
-       #include <client/defs.qh>
        #include "../constants.qh"
        #include "../stats.qh"
        #include <lib/warpzone/anglestransform.qh>
@@ -29,12 +28,11 @@
     #include <common/util.qh>
     #include "../monsters/_mod.qh"
     #include "config.qh"
+    #include <server/weapons/common.qh>
     #include <server/weapons/csqcprojectile.qh>
     #include <server/weapons/tracing.qh>
-    #include "../t_items.qh"
+    #include <server/items/spawning.qh>
     #include <server/autocvars.qh>
-    #include <server/constants.qh>
-    #include <server/defs.qh>
     #include "../notifications/all.qh"
     #include "../deathtypes/all.qh"
     #include <server/mutators/_mod.qh>
@@ -42,7 +40,7 @@
     #include <server/command/_mod.qh>
     #include <lib/csqcmodel/sv_model.qh>
     #include <server/portals.qh>
-    #include <server/g_hook.qh>
+    #include <server/hook.qh>
 #endif
 #ifdef GAMEQC
        #include "calculations.qc"
@@ -567,7 +565,7 @@ REGISTER_NET_TEMP(wframe)
 #ifdef CSQC
 NET_HANDLE(wframe, bool isNew)
 {
-       int fr = ReadByte();
+       WFRAME fr = ReadByte();
        float t = ReadFloat();
     int slot = ReadByte();
        bool restartanim = ReadByte();
@@ -803,10 +801,8 @@ NET_HANDLE(w_muzzleflash, bool isNew)
 
        vector md = wepent.movedir_aligned;
        vector vecs = ((md.x > 0) ? md : '0 0 0');
-       vector dv = right * -vecs.y + up * vecs.z;
+       vector dv = forward * vecs.x + right * -vecs.y + up * vecs.z;
        vector org = rlplayer.origin + rlplayer.view_ofs + dv;
-       tracebox(org, '0 0 0', '0 0 0', org + forward * (vecs.x + 1), MOVE_NORMAL, rlplayer);
-       org = trace_endpos - forward * 1;
 
        pointparticles(thiswep.m_muzzleeffect, org, forward * 1000, 1);