X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fall.qc;h=763dd6e8de83646cefda1786d8f6b51d3ce1dbaf;hp=ea949da50cf6a048ab613f1dd8677a68f58149cf;hb=34e7f534e2015466228eb3a78c9857741b736dca;hpb=4f133bdb70d13143f2ce4b9de097744371c1f92a

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index ea949da50..763dd6e8d 100644
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -1,8 +1,7 @@
+#include "all.qh"
 #ifndef WEAPONS_ALL_C
 #define WEAPONS_ALL_C
 
-#include "all.qh"
-
 #if defined(CSQC)
 	#include <client/defs.qh>
 	#include "../constants.qh"
@@ -19,6 +18,7 @@
 	#include <lib/csqcmodel/cl_model.qh>
 #elif defined(MENUQC)
 #elif defined(SVQC)
+	#include <common/items/_mod.qh>
     #include <lib/warpzone/anglestransform.qh>
     #include <lib/warpzone/common.qh>
     #include <lib/warpzone/util_server.qh>
@@ -27,7 +27,7 @@
     #include "../stats.qh"
     #include "../teams.qh"
     #include "../util.qh"
-    #include "../monsters/all.qh"
+    #include "../monsters/_mod.qh"
     #include "config.qh"
     #include <server/weapons/csqcprojectile.qh>
     #include <server/weapons/tracing.qh>
@@ -37,14 +37,14 @@
     #include <server/defs.qh>
     #include "../notifications/all.qh"
     #include "../deathtypes/all.qh"
-    #include <server/mutators/all.qh>
+    #include <server/mutators/_mod.qh>
     #include "../mapinfo.qh"
-    #include <server/command/common.qh>
+    #include <server/command/_mod.qh>
     #include <lib/csqcmodel/sv_model.qh>
     #include <server/portals.qh>
     #include <server/g_hook.qh>
 #endif
-#ifndef MENUQC
+#ifdef GAMEQC
 	#include "calculations.qc"
 #endif
 #ifdef SVQC
@@ -204,7 +204,7 @@ void W_RandomWeapons(entity e, float n)
 		RandomSelection_Init();
 		FOREACH(Weapons, it != WEP_Null, {
 			if (remaining & (it.m_wepset))
-				RandomSelection_Add(it, 0, string_null, 1, 1);
+				RandomSelection_AddEnt(it, 1, 1);
 		});
 		Weapon w = RandomSelection_chosen_ent;
 		result |= WepSet_FromWeapon(w);
@@ -275,7 +275,7 @@ string W_Model(string w_mdl)
 	return M_ARGV(1, string);
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 vector shotorg_adjustfromclient(vector vecs, float y_is_right, float algn)
 {
 	switch (algn)
@@ -462,7 +462,7 @@ void CL_WeaponEntity_SetModel(entity this, string name, bool _anim)
 			}
 			else
 			{
-				LOG_WARNINGF("weapon model %s does not support the 'shot' tag, will display shots TOTALLY wrong\n",
+				LOG_WARNF("weapon model %s does not support the 'shot' tag, will display shots TOTALLY wrong",
 					this.model);
 				this.movedir = '0 0 0';
 			}
@@ -481,7 +481,7 @@ void CL_WeaponEntity_SetModel(entity this, string name, bool _anim)
 			}
 			else
 			{
-				LOG_WARNINGF("weapon model %s does not support the 'shell' tag, will display casings wrong\n",
+				LOG_WARNF("weapon model %s does not support the 'shell' tag, will display casings wrong",
 					this.model);
 				this.spawnorigin = this.movedir;
 			}
@@ -503,7 +503,7 @@ void CL_WeaponEntity_SetModel(entity this, string name, bool _anim)
 			}
 			else
 			{
-				LOG_WARNINGF(
+				LOG_WARNF(
 					"weapon model %s does not support the 'handle' tag "
 					"and neither does the v_ model support the 'shot' tag, "
 					"will display muzzle flashes TOTALLY wrong\n",
@@ -547,7 +547,7 @@ void CL_WeaponEntity_SetModel(entity this, string name, bool _anim)
 }
 #endif
 
-#ifndef MENUQC
+#ifdef GAMEQC
 
 REGISTER_NET_TEMP(wframe)
 #ifdef CSQC