From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sun, 23 May 2010 19:03:16 +0000 (+0300)
Subject: allow docks with different names than "dock", duh :P
X-Git-Tag: xonotic-v0.1.0preview~541^2~129
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=15546565d88196b7b2df59e8f34f4198b7ab51ad;p=xonotic%2Fxonotic-data.pk3dir.git

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 2c9cbc7d0..7d36cb042 100644
--- 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_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"
 
diff --git a/hud_old_nexuiz.cfg b/hud_old_nexuiz.cfg
index 6b5970fc7..2872634b3 100644
--- 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_dock "1"
+seta hud_dock "dock"
 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 56b1f41a6..7cff69677 100644
--- 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_dock "1"
+seta hud_dock "dock"
 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 1050efb08..998f78338 100644
--- 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_dock "1"
+seta hud_dock "dock_small"
 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 ec5e64f7f..03a86ba8e 100644
--- 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
-	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();