Merge branch 'master' into Mario/turrets

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

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index d998ea7999b836763b21472eedd131204983e1b2..eb457449ec61aca0073cd66fd5fd2d80d52757b6 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -23,7 +23,6 @@
     #include "../common/notifications.qh"
     #include "../common/deathtypes.qh"
     #include "mutators/mutators_include.qh"
     #include "../common/notifications.qh"
     #include "../common/deathtypes.qh"
     #include "mutators/mutators_include.qh"

-    #include "tturrets/include/turrets_early.qh"

     #include "../common/mapinfo.qh"
     #include "command/common.qh"
     #include "../csqcmodellib/sv_model.qh"
     #include "../common/mapinfo.qh"
     #include "command/common.qh"
     #include "../csqcmodellib/sv_model.qh"


@@ -1017,11 +1016,6 @@ void precache()
     precache_model ("models/misc/chatbubble.spr");
        precache_model("models/ice/ice.md3");
 
     precache_model ("models/misc/chatbubble.spr");
        precache_model("models/ice/ice.md3");
 

-#ifdef TTURRETS_ENABLED
-    if (autocvar_g_turrets)
-        turrets_precash();
-#endif
-

     // Precache all player models if desired
     if (autocvar_sv_precacheplayermodels)
     {
     // Precache all player models if desired
     if (autocvar_sv_precacheplayermodels)
     {