Merge branch 'master' into TimePath/global_self

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / t_quake3.qc

diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc
index ed90bf054c0c1aeeed5668afd43c3b3e0eb09d26..d20c90055dfcdd91024d68d9a2ee5f6cc3270588 100644 (file)
--- a/qcsrc/server/t_quake3.qc
+++ b/qcsrc/server/t_quake3.qc
@@ -1,4 +1,29 @@
-#include "../common/weapons/weapons.qc"
+#include "_all.qh"
+
+#include "../common/weapons/all.qh"
+#include "../common/buffs.qh"
+
+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
@@ -60,7 +85,7 @@ void target_init_verify()
 }
 
 void spawnfunc_target_init()
-{
+{SELFPARAM();
        self.spawnflags = 0; // remove all weapons except the ones listed below
        self.netname = "shotgun"; // keep these weapons through the remove trigger
        spawnfunc_target_items();
@@ -69,7 +94,7 @@ void spawnfunc_target_init()
 
 // weapon give ent from defrag
 void target_give_init()
-{
+{SELFPARAM();
        entity targ;
        for (targ = world; (targ = find(targ, targetname, self.target)); ) {
                if (targ.classname == "weapon_rocketlauncher" || targ.classname == "weapon_devastator") {
@@ -111,7 +136,7 @@ void target_give_init()
 }
 
 void spawnfunc_target_give()
-{
+{SELFPARAM();
        InitializeEntity(self, target_give_init, INITPRIO_FINDTARGET);
 }
 
@@ -127,7 +152,7 @@ void spawnfunc_target_give()
 // CTF spawnfuncs handled in mutators/gamemode_ctf.qc now
 
 void spawnfunc_item_flight()
-{
+{SELFPARAM();
        if(!cvar("g_buffs") || !cvar("g_buffs_flight"))
                spawnfunc_item_jetpack();
        else
@@ -141,7 +166,7 @@ void spawnfunc_item_flight()
 .float notta;
 .string gametype;
 float DoesQ3ARemoveThisEntity()
-{
+{SELFPARAM();
        // Q3 style filters (DO NOT USE, THIS IS COMPAT ONLY)
 
        if(self.notq3a)