From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 3 May 2015 03:19:14 +0000 (+1000)
Subject: Fix more server #includes
X-Git-Tag: xonotic-v0.8.1~61^2~16
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f8d8fb1002ad94d7449934e53a70b597d51a314e;p=xonotic%2Fxonotic-data.pk3dir.git

Fix more server #includes
---

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index a68354a1a..2d70942bf 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -1159,7 +1159,6 @@ void spawnfunc_item_rockets (void) {
 	StartItem ("models/items/a_rockets.md3", "misc/itempickup.wav", g_pickup_respawntime_ammo, g_pickup_respawntimejitter_ammo, "rockets", IT_ROCKETS, 0, 0, commodity_pickupevalfunc, 3000);
 }
 
-void spawnfunc_item_shells (void);
 void spawnfunc_item_bullets (void) {
 	if(!weaponswapping)
 	if(autocvar_sv_q3acompat_machineshotgunswap)
diff --git a/qcsrc/server/t_items.qh b/qcsrc/server/t_items.qh
index 429f3c311..143395ba8 100644
--- a/qcsrc/server/t_items.qh
+++ b/qcsrc/server/t_items.qh
@@ -66,6 +66,9 @@ const int ISF_SIZE 				= 128;
 void spawnfunc_item_strength();
 void spawnfunc_item_invincible();
 void spawnfunc_item_armor_small();
+void spawnfunc_item_shells();
+void spawnfunc_item_bullets();
+void spawnfunc_item_rockets();
 
 #ifdef CSQC
 
diff --git a/qcsrc/server/t_quake.qc b/qcsrc/server/t_quake.qc
index b81e0c07d..43ead3b1f 100644
--- a/qcsrc/server/t_quake.qc
+++ b/qcsrc/server/t_quake.qc
@@ -2,6 +2,15 @@
 
 #include "../common/weapons/weapons.qc"
 
+void spawnfunc_weapon_electro();
+void spawnfunc_weapon_hagar();
+void spawnfunc_weapon_machinegun();
+void spawnfunc_item_bullets();
+void spawnfunc_item_armor_large();
+void spawnfunc_item_armor_large();
+void spawnfunc_item_health_mega();
+void spawnfunc_item_health_medium();
+
 //***********************
 //QUAKE 1 ENTITIES - So people can play quake1 maps with the xonotic weapons
 //***********************
diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc
index 3a67bc1fd..7da5b95b9 100644
--- a/qcsrc/server/t_quake3.qc
+++ b/qcsrc/server/t_quake3.qc
@@ -2,6 +2,28 @@
 
 #include "../common/weapons/weapons.qc"
 
+void spawnfunc_weapon_crylink();
+void spawnfunc_weapon_electro();
+void spawnfunc_weapon_hagar();
+void spawnfunc_weapon_machinegun();
+void spawnfunc_weapon_vortex();
+
+void spawnfunc_target_items();
+
+void spawnfunc_item_bullets();
+void spawnfunc_item_cells();
+void spawnfunc_item_rockets();
+void spawnfunc_item_shells();
+
+void spawnfunc_item_jetpack();
+
+void spawnfunc_item_armor_big();
+void spawnfunc_item_armor_large();
+void spawnfunc_item_armor_small();
+
+void spawnfunc_item_health_medium();
+void spawnfunc_item_health_mega();
+
 //***********************
 //QUAKE 3 ENTITIES - So people can play quake3 maps with the xonotic weapons
 //***********************
diff --git a/qcsrc/server/t_teleporters.qc b/qcsrc/server/t_teleporters.qc
index 5a013b7d3..b3266f38d 100644
--- a/qcsrc/server/t_teleporters.qc
+++ b/qcsrc/server/t_teleporters.qc
@@ -1,21 +1,22 @@
 #include "t_teleporters.qh"
 #include "_.qh"
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "../common/constants.qh"
-    #include "../common/util.qh"
-    #include "weapons/csqcprojectile.qh"
-    #include "../common/deathtypes.qh"
-    #include "tturrets/include/turrets_early.qh"
-    #include "vehicles/vehicles_def.qh"
-    #include "../common/mapinfo.qh"
-    #include "anticheat.qh"
-#endif
+#include "anticheat.qh"
+#include "cl_player.qh"
+#include "g_hook.qh"
+#include "bot/waypoints.qh"
+#include "tturrets/include/turrets_early.qh"
+#include "vehicles/vehicles_def.qh"
+#include "weapons/csqcprojectile.qh"
+#include "../common/constants.qh"
+#include "../common/deathtypes.qh"
+#include "../common/mapinfo.qh"
+#include "../common/util.qh"
+#include "../warpzonelib/common.qh"
+#include "../warpzonelib/server.qh"
+#include "../warpzonelib/util_server.qh"
+
+.float lastteleporttime;
 
 void trigger_teleport_use()
 {