From: Lyberta <lyberta@lyberta.net>
Date: Tue, 3 Oct 2017 16:34:18 +0000 (+0300)
Subject: Partially fixed compilation units.
X-Git-Tag: xonotic-v0.8.5~2426^2~46
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=adef62c921704ea87607f36e90eb64c2c1debaf8;p=xonotic%2Fxonotic-data.pk3dir.git

Partially fixed compilation units.
---

diff --git a/qcsrc/common/items/item/ammo.qh b/qcsrc/common/items/item/ammo.qh
index 209639285..b3361d248 100644
--- a/qcsrc/common/items/item/ammo.qh
+++ b/qcsrc/common/items/item/ammo.qh
@@ -1,6 +1,10 @@
 #pragma once
 
 #include "pickup.qh"
+#ifdef SVQC
+    #include <common/t_items.qh>
+#endif
+
 #ifdef SVQC
 PROPERTY(float, g_pickup_ammo_anyway);
 #endif
@@ -14,9 +18,6 @@ CLASS(Ammo, Pickup)
 #endif
 ENDCLASS(Ammo)
 
-#ifdef SVQC
-    #include <common/t_items.qh>
-#endif
 
 #ifdef GAMEQC
 MODEL(Bullets_ITEM, Item_Model("a_bullets.mdl"));
diff --git a/qcsrc/server/compat/quake3.qc b/qcsrc/server/compat/quake3.qc
index 2e2301d0b..d7dcbf3a8 100644
--- a/qcsrc/server/compat/quake3.qc
+++ b/qcsrc/server/compat/quake3.qc
@@ -2,32 +2,11 @@
 
 #include <server/defs.qh>
 #include <server/miscfunctions.qh>
+#include <server/items.qh>
 #include <common/weapons/_all.qh>
 
-spawnfunc(weapon_crylink);
-spawnfunc(weapon_electro);
-spawnfunc(weapon_hagar);
-spawnfunc(weapon_hook);
-spawnfunc(weapon_machinegun);
-spawnfunc(weapon_vortex);
-spawnfunc(weapon_minelayer);
-
 spawnfunc(target_items);
 
-spawnfunc(item_bullets);
-spawnfunc(item_cells);
-spawnfunc(item_rockets);
-spawnfunc(item_shells);
-
-spawnfunc(item_strength);
-
-spawnfunc(item_armor_big);
-spawnfunc(item_armor_mega);
-spawnfunc(item_armor_small);
-
-spawnfunc(item_health_medium);
-spawnfunc(item_health_mega);
-
 //***********************
 //QUAKE 3 ENTITIES - So people can play quake3 maps with the xonotic weapons
 //***********************
diff --git a/qcsrc/server/compat/wop.qc b/qcsrc/server/compat/wop.qc
index 6c69859fd..39abab09f 100644
--- a/qcsrc/server/compat/wop.qc
+++ b/qcsrc/server/compat/wop.qc
@@ -2,34 +2,10 @@
 
 #include <server/defs.qh>
 #include <server/miscfunctions.qh>
+#include <server/items.qh>
 #include <common/weapons/_all.qh>
-// #include <server/mutators/gamemode.qh>
-
-spawnfunc(weapon_arc);
-spawnfunc(weapon_crylink);
-spawnfunc(weapon_electro);
-spawnfunc(weapon_mortar);
-spawnfunc(weapon_hagar);
-spawnfunc(weapon_machinegun);
-spawnfunc(weapon_devastator);
-spawnfunc(weapon_shotgun);
-spawnfunc(weapon_vortex);
-
-spawnfunc(item_armor_big);
-spawnfunc(item_armor_mega);
-spawnfunc(item_armor_small);
-
-spawnfunc(item_bullets);
-spawnfunc(item_cells);
-spawnfunc(item_quad);
-spawnfunc(item_rockets);
-spawnfunc(item_shells);
-
-spawnfunc(item_jetpack);
 
 spawnfunc(item_haste);
-spawnfunc(item_health_medium);
-spawnfunc(item_health_mega);
 spawnfunc(item_invis);
 
 //***********************
@@ -57,6 +33,11 @@ spawnfunc(ammo_boaster)		{ spawnfunc_item_cells(this);			}
 spawnfunc(ammo_betty)		{ spawnfunc_item_rockets(this);			}
 spawnfunc(ammo_imperius)	{ spawnfunc_item_cells(this);			}
 
+spawnfunc(item_quad)
+{
+	this.classname = "item_strength";
+	spawnfunc_item_strength(this);
+}
 spawnfunc(item_padpower)	{ spawnfunc_item_quad(this);			}
 spawnfunc(item_climber)		{ spawnfunc_item_invincible(this);		}
 spawnfunc(item_speedy)		{ spawnfunc_item_haste(this);			}
diff --git a/qcsrc/server/items.qc b/qcsrc/server/items.qc
index 0b20af1c4..c0fb7648d 100644
--- a/qcsrc/server/items.qc
+++ b/qcsrc/server/items.qc
@@ -5,7 +5,6 @@
 /// game items.
 /// \copyright GNU GPLv2 or any later version.
 
-#include <common/t_items.qh>
 #include <common/mutators/mutator/instagib/sv_instagib.qh>
 
 .bool m_isloot; ///< Holds whether item is loot.
@@ -418,9 +417,3 @@ spawnfunc(item_health1) { spawnfunc_item_health_small(this); }
 spawnfunc(item_health25) { spawnfunc_item_health_medium(this); }
 spawnfunc(item_health_large) { spawnfunc_item_health_big(this); }
 spawnfunc(item_health100) { spawnfunc_item_health_mega(this); }
-
-spawnfunc(item_quad)
-{
-	this.classname = "item_strength";
-	spawnfunc_item_strength(this);
-}