Merge remote-tracking branch 'remotes/origin/master' into TimePath/itemsys

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

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 63f2db883298b7071bd86532e4684899c5e1d9b1..a31670a08a050f6997b9eb6f81e2277e3cdfe584 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -25,7 +25,7 @@
 #include "../common/constants.qh"
 #include "../common/deathtypes.qh"
 #include "../common/mapinfo.qh"
 #include "../common/constants.qh"
 #include "../common/deathtypes.qh"
 #include "../common/mapinfo.qh"

-#include "../common/monsters/monsters.qh"
+#include "../common/monsters/all.qh"

 #include "../common/monsters/sv_monsters.qh"
 #include "../common/notifications.qh"
 #include "../common/playerstats.qh"
 #include "../common/monsters/sv_monsters.qh"
 #include "../common/notifications.qh"
 #include "../common/playerstats.qh"


@@ -33,7 +33,7 @@
 #include "../common/teams.qh"
 #include "../common/util.qh"
 #include "../common/items/all.qh"
 #include "../common/teams.qh"
 #include "../common/util.qh"
 #include "../common/items/all.qh"

-#include "../common/weapons/weapons.qh"
+#include "../common/weapons/all.qh"

 
 const float LATENCY_THINKRATE = 10;
 .float latency_sum;
 
 const float LATENCY_THINKRATE = 10;
 .float latency_sum;


@@ -189,6 +189,8 @@ void cvar_changes_init()
                BADCVAR("g_configversion");
                BADCVAR("g_maplist_index");
                BADCVAR("halflifebsp");
                BADCVAR("g_configversion");
                BADCVAR("g_maplist_index");
                BADCVAR("halflifebsp");

+               BADCVAR("sv_mapformat_is_quake2");
+               BADCVAR("sv_mapformat_is_quake3");

                BADPREFIX("sv_world");
 
                // client
                BADPREFIX("sv_world");
 
                // client