hey, fix the vote window coloring and add more useless TODO comments :)

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud.qc

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 03a86ba8ec9df6a439bad54fa429658ddcbe66cb..3b0f9594fbf575f7e118f411b54695f1e262921e 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -718,6 +718,7 @@ float HUD_Panel_GetBorder(float id)
 
 vector HUD_Panel_GetColor(float id)
 {
+       // TODO: idea: let user choose colors "pants", "shirt"
        string color;
        color = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_color"));
        if(color == "")
@@ -1311,7 +1312,7 @@ string GetAmmoPicture(float i)
        {
                case 0: return "ammo_shells";
                case 1: return "ammo_bullets";
-               case 2: return "ammo_rocket";
+               case 2: return "ammo_rockets";
                case 3: return "ammo_cells";
                case 4: return "ammo_fuel";
                default: return "";
@@ -2563,11 +2564,11 @@ void HUD_VoteWindow(void)
        if(vote_alpha) {
                a = vote_alpha * bound(cvar_or("hud_vote_alreadyvoted_alpha", 0.75), 1 - vote_highlighted, 1);
 
-               drawpic_skin(pos, "voteprogress_back", mySize, HUD_GetBgColor(), a * hud_alpha_bg, DRAWFLAG_NORMAL);
+               drawpic_skin(pos, "voteprogress_back", mySize, HUD_Panel_GetColor(id), a * hud_alpha_bg, DRAWFLAG_NORMAL);
 
                s = "A vote has been called for: ";
                drawstring(pos + '0.5 0 0' * mySize_x + '0 0.1 0' * mySize_y - eX * stringwidth(s, FALSE, '1 1 0' * 0.5 * mySize_y*(1/5)), s, '1 1 0' * mySize_y*(1/5), '1 1 1', a * hud_alpha_fg, DRAWFLAG_NORMAL);
-               s = textShortenToWidth(vote_called_vote, mySize_x * 0.96, '10 0 0', stringwidth_colors);
+               s = textShortenToWidth(vote_called_vote, mySize_x * 0.96, '10 0 0', stringwidth_colors); // TODO: broken?
                if(hud_configure)
                        s = "Configure the HUD";
                drawcolorcodedstring(pos + '0.52 0 0' * mySize_x + '0 0.3 0' * mySize_y - eX * stringwidth(s, FALSE, '1 1 0' * 0.5 * mySize_y*(1/6)), s, '1 1 0' * mySize_y*(1/6), a * hud_alpha_fg, DRAWFLAG_NORMAL);