Purge autocvars.qh from the codebase, cvars are defined in the headers of the feature...

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

diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc
index 24f725bd268b069b7cb1667584950adf59af9247..5531d223f72c6b226af5bb20633e5ca911671208 100644 (file)
--- a/qcsrc/server/world.qc
+++ b/qcsrc/server/world.qc
@@ -37,6 +37,7 @@
 #include <server/hook.qh>
 #include <server/intermission.qh>
 #include <server/ipban.qh>
+#include <server/items/items.qh>
 #include <server/main.qh>
 #include <server/mapvoting.qh>
 #include <server/mutators/_mod.qh>
@@ -590,7 +591,7 @@ spawnfunc(__init_dedicated_server)
 
        delete_fn = remove_unsafely;
 
-       entity e = spawn();
+       entity e = new(GotoFirstMap);
        setthink(e, GotoFirstMap);
        e.nextthink = time; // this is usually 1 at this point
 
@@ -1828,7 +1829,7 @@ void readplayerstartcvars()
        start_ammo_plasma = 0;
        if (random_start_ammo == NULL)
        {
-               random_start_ammo = spawn();
+               random_start_ammo = new(random_start_ammo);
        }
        start_health = cvar("g_balance_health_start");
        start_armorvalue = cvar("g_balance_armor_start");