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 8f3739d4821b01512a2a769f08c4212cc61fc3ce..c06e9949189639ca79afd384a388e8cf9e8550c7 100644 (file)
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 4850763419258e81c8edb738f4f6178ef19e8868..eda3e46f268892be5d6019c40e5aa23e007a69af 100644 (file)
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 4a3a2d5563a733f4fd0895a5eda3636d8f33fc16..3f3a8918f07171a8018a7a1074127ae7e363d408 100644 (file)
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 9b34ea79389418aa3d65dc2a089bb3301a18a1ba..a7bf03e4162ac16055a1cd317d2cc678c093e86b 100644 (file)
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 f62c715625b7a3ca69e2c082fdf03c0f138503c8..5fe646987136016599a177e583825ebb4ab4b18f 100644 (file)
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 f9e47011aa7c1a5631bcadd1a2778e0aaeffe705..b52445d539903983f71711189d4cacfe33f9723c 100644 (file)
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 26e40865c992fd6acf42e027b4480b896b057485..d19db5095f66be5874d02c3800473a54a695f23a 100644 (file)
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 04ada8ce4cd72a320466216dd5c84793853e9dc8..2f993e01c590c35384bbfc70ac8983caa5379011 100644 (file)
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 99ed22b30fd3e88d6bf2f284f97b03928f102580..6bf5288d0638e7a2aed4d4ad1abdc6344eaefd8d 100644 (file)
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 819dcabc74fcdd146b0272be4ecf5df165178a57..30be665922f4a5e723b420acad77a0dd1f60bbec 100644 (file)
--- 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 d3a21c6bf650686a92e81915e5145e39ead70535..3f8bcebd778877e07fedf9e9653930225876b69e 100644 (file)
--- 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);