Split projectiles and scores out of constants.qh and remove lib definitions from...

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

diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh
index 071ac4c565a7e1f076674b40ecb8d85a34110816..83fe0c19673ccc513463f50eb13145c90a8d5f1b 100644 (file)
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -20,6 +20,7 @@ WepSet ReadWepSet();
 
 #ifdef GAMEQC
 #include "calculations.qh"
+#include "projectiles.qh"
 #include <common/models/all.qh>
 #endif
 
@@ -143,10 +144,12 @@ X(weaponreplace, string)
 X(weaponstartoverride, float)
 X(weaponstart, float)
 X(weaponthrowable, float)
+#ifdef SVQC
 X(reload_ammo, float)
 .float reloading_ammo = reload_ammo;
 X(reload_time, float)
 .float reloading_time = reload_time;
+#endif
 #undef X
 
 
@@ -333,12 +336,6 @@ vector weaponentity_glowmod(Weapon wep, entity actor, int c, entity wepent)
     return g;
 }
 
-#ifdef SVQC
-.entity gunaligns[5];
-#else
-entity gunaligns[5];
-#endif
-
 .int m_gunalign;
 
 //.int weapon; // current weapon