From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sun, 15 Aug 2010 11:25:43 +0000 (+0300)
Subject: fix another dock related quirk, update the new luminos icons in default
X-Git-Tag: xonotic-v0.1.0preview~356
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=98f8da7bc16b8034bda40bc6b23efc99fed2db3e;p=xonotic%2Fxonotic-data.pk3dir.git

fix another dock related quirk, update the new luminos icons in default
---

diff --git a/gfx/hud/default/ammo_bullets.tga b/gfx/hud/default/ammo_bullets.tga
index 8f3739d48..c06e99491 100644
Binary files a/gfx/hud/default/ammo_bullets.tga and b/gfx/hud/default/ammo_bullets.tga differ
diff --git a/gfx/hud/default/ammo_cells.tga b/gfx/hud/default/ammo_cells.tga
index 485076341..eda3e46f2 100644
Binary files a/gfx/hud/default/ammo_cells.tga and b/gfx/hud/default/ammo_cells.tga differ
diff --git a/gfx/hud/default/ammo_fuel.tga b/gfx/hud/default/ammo_fuel.tga
index 4a3a2d556..3f3a8918f 100644
Binary files a/gfx/hud/default/ammo_fuel.tga and b/gfx/hud/default/ammo_fuel.tga differ
diff --git a/gfx/hud/default/ammo_rockets.tga b/gfx/hud/default/ammo_rockets.tga
index 9b34ea793..a7bf03e41 100644
Binary files a/gfx/hud/default/ammo_rockets.tga and b/gfx/hud/default/ammo_rockets.tga differ
diff --git a/gfx/hud/default/ammo_shells.tga b/gfx/hud/default/ammo_shells.tga
index f62c71562..5fe646987 100644
Binary files a/gfx/hud/default/ammo_shells.tga and b/gfx/hud/default/ammo_shells.tga differ
diff --git a/gfx/hud/default/armor.tga b/gfx/hud/default/armor.tga
index f9e47011a..b52445d53 100644
Binary files a/gfx/hud/default/armor.tga and b/gfx/hud/default/armor.tga differ
diff --git a/gfx/hud/default/health.tga b/gfx/hud/default/health.tga
index 26e40865c..d19db5095 100644
Binary files a/gfx/hud/default/health.tga and b/gfx/hud/default/health.tga differ
diff --git a/gfx/hud/default/nexball_carrying.tga b/gfx/hud/default/nexball_carrying.tga
index 04ada8ce4..2f993e01c 100644
Binary files a/gfx/hud/default/nexball_carrying.tga and b/gfx/hud/default/nexball_carrying.tga differ
diff --git a/gfx/hud/default/race_newrecordserver.tga b/gfx/hud/default/race_newrecordserver.tga
index 99ed22b30..6bf5288d0 100644
Binary files a/gfx/hud/default/race_newrecordserver.tga and b/gfx/hud/default/race_newrecordserver.tga differ
diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 819dcabc7..30be66592 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -4968,7 +4968,10 @@ void HUD_Main (void)
 		string pic;
 		pic = strcat(hud_skin_path, "/", autocvar_hud_dock);
 		if(precache_pic(pic) == "") {
-			pic = "gfx/hud/default/dock_medium";
+			pic = strcat(hud_skin_path, "/dock_medium");
+			if(precache_pic(pic) == "") {
+				pic = "gfx/hud/default/dock_medium";
+			}
 		}
 		drawpic('0 0 0', pic, eX * vid_conwidth + eY * vid_conheight, color, autocvar_hud_dock_alpha * hud_fade_alpha, DRAWFLAG_NORMAL); // no aspect ratio forcing on dock...
 	}
diff --git a/qcsrc/menu/xonotic/dialog_hudsetup_exit.c b/qcsrc/menu/xonotic/dialog_hudsetup_exit.c
index d3a21c6bf..3f8bcebd7 100644
--- a/qcsrc/menu/xonotic/dialog_hudsetup_exit.c
+++ b/qcsrc/menu/xonotic/dialog_hudsetup_exit.c
@@ -69,7 +69,7 @@ void XonoticHUDExitDialog_fill(entity me)
 			me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_dock"));
 				e.addValue(e, "Disable", "0");
 				e.addValue(e, "Small", "dock_small");
-				e.addValue(e, "Medium", "dock");
+				e.addValue(e, "Medium", "dock_medium");
 				e.addValue(e, "Large", "dock_large");
 				e.configureXonoticTextSliderValues(e);
 	me.TR(me);