Merge branch 'master' into mirceakitsune/damage_effects

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / Main.qc

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index f2f5ac86dc24b8ab339691071925d43d766c7193..81c1369a0e61e45b660d73dd82130eeaf33388c7 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -197,11 +197,7 @@ void CSQC_Init(void)
        hud_configure_prev = -1;
        tab_panel = -1;
 
-
-       precache_model("models/null.md3");
-
        draw_currentSkin = strzone(strcat("gfx/menu/", cvar_string("menu_skin")));
-
 }
 
 // CSQC_Shutdown : Called every time the CSQC code is shutdown (changing maps, quitting, etc)
@@ -791,7 +787,8 @@ void Gamemode_Init()
 {
        if not(isdemo())
        {
-               localcmd("\n_cl_hook_gamestart ", MapInfo_Type_ToString(gametype), "\n");
+               if(!(calledhooks & HOOK_START))
+                       localcmd("\n_cl_hook_gamestart ", MapInfo_Type_ToString(gametype), "\n");
                calledhooks |= HOOK_START;
        }
 }