Fix more server #includes

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index a68354a1ab315192e9dd9c3a8fe922785b99c440..2d70942bf4813b5a7348e320cd43dbc7e160280d 100644 (file)
--- 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 429f3c311f31099048c2f309d0c704a612d6ce96..143395ba8683c236fd89b29ad76daf52f5ebbfab 100644 (file)
--- 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 b81e0c07d1ccb817938c0f8813c56d702ff1f7df..43ead3b1f8f01327c89930ff05b8450f29f17242 100644 (file)
--- 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 3a67bc1fd5cfd9c215738e2fb3f1dd94f42d418b..7da5b95b9061d9ee2ad4be8d678e62e146d2b32b 100644 (file)
--- 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 5a013b7d3c086e167e213e9ddc8ac3289390e324..b3266f38d6a0bc0e41cb188f16de9c82f8547c65 100644 (file)
--- 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()
 {