Merge branch 'master' into Mario/turrets

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / turrets / turrets.qc

diff --git a/qcsrc/common/turrets/turrets.qc b/qcsrc/common/turrets/turrets.qc
index 01fb6607abc40a8138a02ea1eadd6bfda294e41a..4c588e9562afd1b111ee3a093601306a73602268 100644 (file)
--- a/qcsrc/common/turrets/turrets.qc
+++ b/qcsrc/common/turrets/turrets.qc
@@ -15,7 +15,6 @@ void turrets_common_precache()
        precache_model ("models/turrets/head-gib2.md3");
        precache_model ("models/turrets/head-gib3.md3");
        precache_model ("models/turrets/head-gib4.md3");
-       precache_model ("models/turrets/terrainbase.md3");
        precache_model ("models/turrets/base.md3");
        precache_model ("models/turrets/rocket.md3");
        
@@ -23,6 +22,7 @@ void turrets_common_precache()
        precache_model ("models/marker.md3");
        
 #ifdef TURRET_DEBUG
+       precache_model ("models/turrets/terrainbase.md3");
        precache_model ("models/turrets/c512.md3");
        precache_model ("models/pathlib/goodsquare.md3");
        precache_model ("models/pathlib/badsquare.md3");
@@ -50,7 +50,6 @@ void register_turret(float id, float(float) func, float turretflags, vector min_
        
        #ifndef MENUQC
        turrets_common_precache();
-       func(TR_PRECACHE);
        #endif
 }
 float t_null(float dummy) { return 0; }