]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/client/Main.qc
Merge remote branch 'origin/master' into terencehill/hud_config_fixes
[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / Main.qc
index 71cbbba7fc776fa948d4c3577bc4bb3ee6ab7440..d09f5ebb24edc94fdf9158c1b371d6fe71d1c0cf 100644 (file)
@@ -197,9 +197,6 @@ 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")));
 }
 
@@ -790,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;
        }
 }
@@ -883,6 +881,7 @@ void Ent_Init()
        hagar_maxrockets = ReadByte();
 
        g_trueaim_minrange = ReadCoord();
+       g_balance_porto_secondary = ReadByte();
 
        if(!postinit)
                PostInit();