allow docks with different names than "dock", duh :P

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 2c9cbc7d0d052250b552ea4c30dae590e2ef77d7..7d36cb0424e0a0c735dc1c98414abbd3cb375aa4 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1331,7 +1331,7 @@ seta hud_configure_grid 0 "snap to grid when moving/resizing panels"
 seta hud_configure_grid_x 10 "snap each X pixels"
 seta hud_configure_grid_y 10 "snap each Y pixels"
 
 seta hud_configure_grid_x 10 "snap each X pixels"
 seta hud_configure_grid_y 10 "snap each Y pixels"
 

-seta hud_dock 1 "enable/disable a fullscreen background for the hud, useful for creating artificial docks"
+seta hud_dock "dock" "enable a fullscreen background for the hud, useful for creating artificial docks, \"\" = disable"

 seta hud_dock_color "0 0.6 0.9" "dock color"
 seta hud_dock_alpha 0.8 "alpha of the dock"
 
 seta hud_dock_color "0 0.6 0.9" "dock color"
 seta hud_dock_alpha 0.8 "alpha of the dock"
 

diff --git a/hud_old_nexuiz.cfg b/hud_old_nexuiz.cfg
index 6b5970fc72fda733eeabb274d4a497314346f934..2872634b363a1c7fcb36532081482cf4aaee9487 100644 (file)
--- a/hud_old_nexuiz.cfg
+++ b/hud_old_nexuiz.cfg
@@ -6,7 +6,7 @@ seta hud_bg_border "10"
 seta hud_bg_padding "0"
 seta hud_fg_alpha "1"
 
 seta hud_bg_padding "0"
 seta hud_fg_alpha "1"
 

-seta hud_dock "1"
+seta hud_dock "dock"

 seta hud_dock_color "0 0.6 0.9"
 seta hud_dock_alpha "0.800000"
 
 seta hud_dock_color "0 0.6 0.9"
 seta hud_dock_alpha "0.800000"
 

diff --git a/hud_wickedhud_default.cfg b/hud_wickedhud_default.cfg
index 56b1f41a6a3b32739e4cebf096f421c3466044ea..7cff696777090a187affdc0713326cc1eb951699 100644 (file)
--- a/hud_wickedhud_default.cfg
+++ b/hud_wickedhud_default.cfg
@@ -6,7 +6,7 @@ seta hud_bg_border "8"
 seta hud_bg_padding "2"
 seta hud_fg_alpha "1"
 
 seta hud_bg_padding "2"
 seta hud_fg_alpha "1"
 

-seta hud_dock "1"
+seta hud_dock "dock"

 seta hud_dock_color "0 0.1875 0.4375"
 seta hud_dock_alpha "1"
 
 seta hud_dock_color "0 0.1875 0.4375"
 seta hud_dock_alpha "1"
 

diff --git a/hud_wickedhud_small.cfg b/hud_wickedhud_small.cfg
index 1050efb08e07134bc3ea96e087dc0ae087ac6d72..998f78338c3582fb9e60832ed6974834e7415837 100644 (file)
--- a/hud_wickedhud_small.cfg
+++ b/hud_wickedhud_small.cfg
@@ -6,7 +6,7 @@ seta hud_bg_border "6"
 seta hud_bg_padding "2"
 seta hud_fg_alpha "1"
 
 seta hud_bg_padding "2"
 seta hud_fg_alpha "1"
 

-seta hud_dock "1"
+seta hud_dock "dock_small"

 seta hud_dock_color "0 0.1875 0.4375"
 seta hud_dock_alpha "1"
 
 seta hud_dock_color "0 0.1875 0.4375"
 seta hud_dock_alpha "1"
 

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index ec5e64f7f564f4114400d2a2e213a8fd34ad31d3..03a86ba8ec9df6a439bad54fa429658ddcbe66cb 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -3191,8 +3191,8 @@ void HUD_Main (void)
        hud_configure = cvar("_hud_configure");
 
        // Drawing stuff
        hud_configure = cvar("_hud_configure");
 
        // Drawing stuff

-       if(cvar("hud_dock"))
-               drawpic_skin('0 0 0', "dock", eX * vid_conwidth + eY * vid_conheight, stov(cvar_string("hud_dock_color")), cvar("hud_dock_alpha"), DRAWFLAG_NORMAL);
+       if(cvar_string("hud_dock") != "")
+               drawpic_skin('0 0 0', cvar_string("hud_dock"), eX * vid_conwidth + eY * vid_conheight, stov(cvar_string("hud_dock_color")), cvar("hud_dock_alpha"), DRAWFLAG_NORMAL);

 
        if(HUD_Panel_CheckActive(0))
                HUD_WeaponIcons();
 
        if(HUD_Panel_CheckActive(0))
                HUD_WeaponIcons();