X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qc;h=1b8b2366e0122f52b1b7d9e814970fff075acba7;hb=7be3219850b7925da8af19b747f007b2f33200ee;hp=f8c01ec986cc7ddc928e83e8718331f6639ce005;hpb=b814e760c2e00d2de46e9846f10d176b47cf514a;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index f8c01ec98..1b8b2366e 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -101,6 +101,7 @@ void drawpic_skin(vector pos, string pic, vector sz, vector color, float alpha, drawpic_aspect(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, color, alpha, drawflag); } +// TODO: aspect! void drawpic_skin_expanding(vector pos, string pic, vector sz, vector rgb, float alpha, float flag, float fadelerp) { drawpic_expanding(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, rgb, alpha, flag, fadelerp); } @@ -655,57 +656,6 @@ void HUD_Panel_ExportCfg(string cfgname) fclose(fh); } -vector HUD_Panel_GetMinSize(float id) -{ - vector mySize; - // note: please only set mySize_y on aspect ratio forced panels - switch(id) { - case 0: - mySize_x = 1/10; // at least 1/10 * height - mySize_y = 1/26; // at least 1/26 * width - break; - case 1: - if(cvar("hud_inventory_onlycurrent")) - mySize_y = 2/5; // 2/5 width - else - mySize_x = 0.7; // at least 0.7 * height - break; - case 3: - if(cvar("hud_healtharmor") == 2) - { - mySize_x = 4.35; // 4.35 * height, trial and error... - mySize_y = 0.01; // "unlimited" ;) - } - break; - case 4: - mySize_x = 1.1; // 4/5 * height, trial and error... - mySize_y = 1/3; // 1/3 * width, trial and error... - break; - case 5: - mySize_y = 1/4.1; // 1/4.1 * width, trial and error... - break; - case 7: - mySize_y = 1/4; // 1/4 * width - break; - case 8: - mySize_y = 1/4; // 1/4 * width - break; - case 9: - mySize_y = 1/4; // 1/4 * width - break; - case 10: - mySize_y = 1/2; // 1/2 * width - break; - case 11: - mySize_y = 0.5898; // 0.5898 * width, reason: bg has weird dimensions... - break; - case 13: - mySize_y = 0.2; // 0.25 * width, trial and error... - break; - } - return mySize; -} - // return active status of panel float HUD_Panel_CheckActive(float id) { @@ -1037,8 +987,8 @@ void HUD_Panel_SetPos(float id, vector pos) if(cvar("hud_configure_grid")) { - pos_x = floor((pos_x/vid_conwidth)/bound(0.005, cvar("hud_configure_grid_x"), 0.2) + 0.5) * cvar("hud_configure_grid_x") * vid_conwidth; - pos_y = floor((pos_y/vid_conheight)/bound(0.005, cvar("hud_configure_grid_y"), 0.2) + 0.5) * cvar("hud_configure_grid_y") * vid_conheight; + pos_x = floor((pos_x/vid_conwidth)/bound(0.005, cvar("hud_configure_grid_x"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_x"), 0.2) * vid_conwidth; + pos_y = floor((pos_y/vid_conheight)/bound(0.005, cvar("hud_configure_grid_y"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_y"), 0.2) * vid_conheight; } string s; @@ -1048,7 +998,7 @@ void HUD_Panel_SetPos(float id, vector pos) } // check if resize will result in panel being moved into another panel. If so, return snapped vector, otherwise return the given vector -vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin, float ratio) { +vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin) { float i; float targBorder; @@ -1090,7 +1040,7 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin, float // in this case resizeorigin (bottom-right point) and the bottom-right point of the panel dist_x = resizeorigin_x - targEndPos_x; dist_y = resizeorigin_y - targEndPos_y; - if (dist_y < 0 || dist_x / dist_y > ratio) + if (dist_y < 0) mySize_x = min(mySize_x, dist_x); else mySize_y = min(mySize_y, dist_y); @@ -1108,7 +1058,7 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin, float dist_x = targPos_x - resizeorigin_x; dist_y = resizeorigin_y - targEndPos_y; - if (dist_y < 0 || dist_x / dist_y > ratio) + if (dist_y < 0) mySize_x = min(mySize_x, dist_x); else mySize_y = min(mySize_y, dist_y); @@ -1126,7 +1076,7 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin, float dist_x = resizeorigin_x - targEndPos_x; dist_y = targPos_y - resizeorigin_y; - if (dist_y < 0 || dist_x / dist_y > ratio) + if (dist_y < 0) mySize_x = min(mySize_x, dist_x); else mySize_y = min(mySize_y, dist_y); @@ -1144,7 +1094,7 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin, float dist_x = targPos_x - resizeorigin_x; dist_y = targPos_y - resizeorigin_y; - if (dist_y < 0 || dist_x / dist_y > ratio) + if (dist_y < 0) mySize_x = min(mySize_x, dist_x); else mySize_y = min(mySize_y, dist_y); @@ -1186,30 +1136,6 @@ void HUD_Panel_SetPosSize(float id) mySize_y = max(2 * cvar("con_chatsize") + 2 * HUD_Panel_GetPadding(id), mySize_y); } - // cap against panel's own limits - vector minSize; - minSize = HUD_Panel_GetMinSize(id); // mySize_x at least minSize_x * mySize_y, and vice versa - float fixedRatio; - if(!minSize_x && minSize_y) // forced aspect ratio - { - minSize_x = 1/minSize_y; - fixedRatio = minSize_x; - mySize_x = max(minSize_x * mySize_y, mySize_x); - mySize_y = max(minSize_y * mySize_x, mySize_y); - } - else if(minSize_x && !minSize_y) // hybrid aspect ratio, currently supported only in one dimension - { - if (mySize_x/mySize_y < minSize_x) // resizing in x direction allows free aspect ratio - { - fixedRatio = minSize_x; - minSize_y = 1/minSize_x; - mySize_y = max(minSize_y * mySize_x, mySize_y); - mySize_x = max(minSize_x * mySize_y, mySize_x); - } - else - fixedRatio = -minSize_x; //negative so that it will be used ONLY after checkResize - } - // collision testing| // -----------------+ @@ -1246,55 +1172,13 @@ void HUD_Panel_SetPosSize(float id) // before checkresize, otherwise panel can be snapped partially inside another panel or panel aspect ratio can be broken if(cvar("hud_configure_grid")) { - mySize_x = floor((mySize_x/vid_conwidth)/bound(0.005, cvar("hud_configure_grid_x"), 0.2) + 0.5) * cvar("hud_configure_grid_x") * vid_conwidth; - mySize_y = floor((mySize_y/vid_conheight)/bound(0.005, cvar("hud_configure_grid_y"), 0.2) + 0.5) * cvar("hud_configure_grid_y") * vid_conheight; - } - - if (fixedRatio > 0) - { - // keep aspect ratio _MAXIMIZING_ the size - if (mySize_x / mySize_y > fixedRatio) - mySize_y = mySize_x / fixedRatio; - else - mySize_x = mySize_y * fixedRatio; + mySize_x = floor((mySize_x/vid_conwidth)/bound(0.005, cvar("hud_configure_grid_x"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_x"), 0.2) * vid_conwidth; + mySize_y = floor((mySize_y/vid_conheight)/bound(0.005, cvar("hud_configure_grid_y"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_y"), 0.2) * vid_conheight; } if(cvar("hud_configure_checkcollisions")) { - if (fixedRatio > 0) - { - mySize = HUD_Panel_CheckResize(id, mySize, resizeorigin, fixedRatio); - - // Make sure once more that we DON'T cross the screen edges - // left/top screen edges - if(myPos_x < 0) - mySize_x = mySize_x + myPos_x; - if(myPos_y < 0) - mySize_y = mySize_y + myPos_y; - - // bottom/right screen edges - if(myPos_x + mySize_x > vid_conwidth) - mySize_x = vid_conwidth - myPos_x; - if(myPos_y + mySize_y > vid_conheight) - mySize_y = vid_conheight - myPos_y; - - // restore again aspect ratio, _minimizing_ the size - if (mySize_x / mySize_y < fixedRatio) - mySize_y = mySize_x / fixedRatio; - else - mySize_x = mySize_y * fixedRatio; - } - else - { - mySize = HUD_Panel_CheckResize(id, mySize, resizeorigin, mySize_x / mySize_y); - if (fixedRatio < 0) - { - fixedRatio = -fixedRatio; - // restore again aspect ratio, _minimizing_ the size - if (mySize_x / mySize_y < fixedRatio) - mySize_y = mySize_x / fixedRatio; - } - } + mySize = HUD_Panel_CheckResize(id, mySize, resizeorigin); } // minimum panel size cap, do this once more so we NEVER EVER EVER have a panel smaller than this, JUST IN CASE above code still makes the panel eg negative (impossible to resize back without changing cvars manually then) @@ -1518,7 +1402,6 @@ void HUD_WeaponIcons_Clear() } entity weaponorder[WEP_MAXCOUNT]; - void weaponorder_swap(float i, float j, entity pass) { entity h; @@ -1527,6 +1410,7 @@ void weaponorder_swap(float i, float j, entity pass) weaponorder[j] = h; } +string weaponorder_cmp_str_save; string weaponorder_cmp_str; float weaponorder_cmp(float i, float j, entity pass) { @@ -1547,19 +1431,34 @@ void HUD_WeaponIcons(void) mySize = HUD_Panel_GetSize(id); stat_weapons = getstati(STAT_WEAPONS); + weapon_cnt = 0; for(i = WEP_FIRST; i <= WEP_LAST; ++i) { self = get_weaponinfo(i); if(self.impulse >= 0) - { - weaponorder[weapon_cnt] = self; ++weapon_cnt; - } } // TODO make this configurable weaponorder_cmp_str = strcat(" ", weaponorder_byimpulse, " "); - heapsort(weapon_cnt, weaponorder_swap, weaponorder_cmp, world); + + if(weaponorder_cmp_str != weaponorder_cmp_str_save) + { + if(weaponorder_cmp_str_save) + strunzone(weaponorder_cmp_str_save); + weaponorder_cmp_str_save = strzone(weaponorder_cmp_str); + weapon_cnt = 0; + for(i = WEP_FIRST; i <= WEP_LAST; ++i) + { + self = get_weaponinfo(i); + if(self.impulse >= 0) + { + weaponorder[weapon_cnt] = self; + ++weapon_cnt; + } + } + heapsort(weapon_cnt, weaponorder_swap, weaponorder_cmp, world); + } HUD_Panel_DrawBg(id, pos, mySize, 0); float padding; @@ -3139,6 +3038,19 @@ void HUD_Notify (void) // Timer (#5) // +string seconds_tostring(float sec) +{ + float minutes; + minutes = floor(sec / 60); + + sec -= minutes * 60; + + string s; + s = ftos(100 + sec); + + return strcat(ftos(minutes), ":", substring(s, 1, 3)); +} + void HUD_Timer(void) { float id = HUD_PANEL_TIMER; @@ -3155,14 +3067,15 @@ void HUD_Timer(void) mySize -= '2 2 0' * padding; } - float timelimit, elapsedTime, minutes, seconds, timeleft, minutesLeft, secondsLeft; + string timer; + float timelimit, elapsedTime, timeleft, minutesLeft; timelimit = getstatf(STAT_TIMELIMIT); timeleft = max(0, timelimit * 60 + getstatf(STAT_GAMESTARTTIME) - time); timeleft = ceil(timeleft); + minutesLeft = floor(timeleft / 60); - secondsLeft = timeleft - minutesLeft*60; vector timer_color; if(minutesLeft >= 5 || warmup_stage || timelimit == 0) //don't use red or yellow in warmup or when there is no timelimit @@ -3175,25 +3088,16 @@ void HUD_Timer(void) if (cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) { if (time < getstatf(STAT_GAMESTARTTIME)) { //while restart is still active, show 00:00 - minutes = seconds = 0; + timer = seconds_tostring(0); } else { elapsedTime = floor(time - getstatf(STAT_GAMESTARTTIME)); //127 - minutes = floor(elapsedTime / 60); - seconds = elapsedTime - minutes*60; + timer = seconds_tostring(elapsedTime); } } else { - minutes = minutesLeft; - seconds = secondsLeft; + timer = seconds_tostring(timeleft); } - if(minutes > 999) - seconds = 99; - minutes = min(minutes, 999); - if(minutesLeft >= 1 || cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) { - HUD_DrawXNum(pos + eX * mySize_x - eX * 5.1 * mySize_y, minutes, 3, 0, mySize_y, timer_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * mySize_x - eX * 2.57 * mySize_y, "num_colon", '1 1 0' * mySize_y, timer_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - } - HUD_DrawXNum(pos + eX * mySize_x - eX * 2 * mySize_y, seconds, -2, 0, mySize_y, timer_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawstring_aspect(pos, timer, mySize, mySize_y, timer_color, HUD_Panel_GetFgAlpha(HUD_PANEL_TIMER), DRAWFLAG_NORMAL); } // Radar (#6) @@ -3713,6 +3617,7 @@ void HUD_Mod_CTF_Reset(void) void HUD_Mod_CTF(vector pos, vector mySize) { vector redflag_pos, blueflag_pos; + vector flag_size; float f; // every function should have that float redflag, blueflag; // current status @@ -3817,25 +3722,37 @@ void HUD_Mod_CTF(vector pos, vector mySize) break; } - if (myteam == COLOR_TEAM1) { // always draw own flag on left - redflag_pos = pos; - blueflag_pos = pos + eX * mySize_y; + if(mySize_x > mySize_y) { + if (myteam == COLOR_TEAM1) { // always draw own flag on left + redflag_pos = pos; + blueflag_pos = pos + eX * 0.5 * mySize_x; + } else { + blueflag_pos = pos; + redflag_pos = pos + eX * 0.5 * mySize_x; + } + flag_size = eX * 0.5 * mySize_x + eY * mySize_y; } else { - blueflag_pos = pos; - redflag_pos = pos + eX * mySize_y; + if (myteam == COLOR_TEAM1) { // always draw own flag on left + redflag_pos = pos; + blueflag_pos = pos + eY * 0.5 * mySize_y; + } else { + blueflag_pos = pos; + redflag_pos = pos + eY * 0.5 * mySize_y; + } + flag_size = eY * 0.5 * mySize_y + eX * mySize_x; } f = bound(0, redflag_statuschange_elapsedtime*2, 1); if(red_icon_prevstatus && f < 1) - drawpic_skin_expanding(redflag_pos, red_icon_prevstatus, '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha_prevstatus, DRAWFLAG_NORMAL, f); + drawpic_skin_expanding(redflag_pos, red_icon_prevstatus, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha_prevstatus, DRAWFLAG_NORMAL, f); if(red_icon) - drawpic_skin(redflag_pos, red_icon, '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha * f, DRAWFLAG_NORMAL); + drawpic_skin(redflag_pos, red_icon, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha * f, DRAWFLAG_NORMAL); f = bound(0, blueflag_statuschange_elapsedtime*2, 1); if(blue_icon_prevstatus && f < 1) - drawpic_skin_expanding(blueflag_pos, blue_icon_prevstatus, '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha_prevstatus, DRAWFLAG_NORMAL, f); + drawpic_skin_expanding(blueflag_pos, blue_icon_prevstatus, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha_prevstatus, DRAWFLAG_NORMAL, f); if(blue_icon) - drawpic_skin(blueflag_pos, blue_icon, '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha * f, DRAWFLAG_NORMAL); + drawpic_skin(blueflag_pos, blue_icon, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha * f, DRAWFLAG_NORMAL); } // Keyhunt HUD modicon section @@ -3854,18 +3771,29 @@ void HUD_Mod_KH(vector pos, vector mySize) float a, aa; vector p, pa, kh_size, kh_asize; - p_x = pos_x; - p_y = pos_y + 0.25 * mySize_y; - kh_keys = getstati(STAT_KH_KEYS); - kh_size_x = mySize_x * 0.25; - kh_size_y = 0.75 * mySize_y; + p_x = pos_x; + if(mySize_x > mySize_y) + { + p_y = pos_y + 0.25 * mySize_y; + pa = p - eY * 0.25 * mySize_y; - pa = p - eY * 0.25 * mySize_y; + kh_size_x = mySize_x * 0.25; + kh_size_y = 0.75 * mySize_y; + kh_asize_x = mySize_x * 0.25; + kh_asize_y = mySize_y * 0.25; + } + else + { + p_y = pos_y + 0.125 * mySize_y; + pa = p - eY * 0.125 * mySize_y; - kh_asize_x = mySize_x * 0.25; - kh_asize_y = mySize_y * 0.25; + kh_size_x = mySize_x * 0.5; + kh_size_y = 0.375 * mySize_y; + kh_asize_x = mySize_x * 0.5; + kh_asize_y = mySize_y * 0.125; + } float i, key; @@ -3949,8 +3877,26 @@ void HUD_Mod_KH(vector pos, vector mySize) break; } } - p_x += 0.25 * mySize_x; - pa_x += 0.25 * mySize_x; + if(mySize_x > mySize_y) + { + p_x += 0.25 * mySize_x; + pa_x += 0.25 * mySize_x; + } + else + { + if(i == 1) + { + p_y = pos_y + 0.625 * mySize_y; + pa_y = pos_y + 0.5 * mySize_y; + p_x = pos_x; + pa_x = pos_x; + } + else + { + p_x += 0.5 * mySize_x; + pa_x += 0.5 * mySize_x; + } + } } } @@ -3977,13 +3923,23 @@ void HUD_Mod_NexBall(vector pos, vector mySize) p = 2 - p; //Draw the filling - HUD_Panel_DrawProgressBar(pos, 0, eX * p * mySize_x + eY * mySize_y, HUD_Panel_GetProgressBarColor("nexball"), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); + vector barsize; + float vertical; + if(mySize_x > mySize_y) + { + barsize = eX * p * mySize_x + eY * mySize_y; + vertical = 0; + } + else + { + barsize = eX * mySize_x + eY * p * mySize_y; + vertical = 1; + } + HUD_Panel_DrawProgressBar(pos, vertical, barsize, HUD_Panel_GetProgressBarColor("nexball"), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); } - pos_x += 0.5 * mySize_x - 0.5 * mySize_y; //horizontal margin to the picture - if (stat_items & IT_KEY1) - drawpic_skin(pos, "nexball_carrying", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); + drawpic_skin(pos, "nexball_carrying", eX * mySize_x + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); } // Race/CTS HUD mod icons @@ -4034,7 +3990,7 @@ void HUD_Mod_Race(vector pos, vector mySize) f = time - crecordtime_change_time; if (f > 1) { - drawstring(pos, "Personal best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); + drawstring_aspect(pos, "Personal best ", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); drawstring(pos + eY * 0.2 * mySize_y, TIME_ENCODED_TOSTRING(t), '1 1 0' * 0.2 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); } else { drawstring(pos, "Personal best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); @@ -4184,16 +4140,17 @@ void HUD_DrawPressedKeys(void) mySize -= '2 2 0' * padding; } + vector keysize; + keysize = eX * mySize_x * (1/3) + eY * mySize_y * 0.5; float pressedkeys; pressedkeys = getstatf(STAT_PRESSED_KEYS); - drawpic_skin(pos, "key_bg.tga", mySize, '1 1 1', 0.1 * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * mySize_x - eX * 0.22 * mySize_x + eY * 0.195 * mySize_y, ((pressedkeys & KEY_CROUCH) ? "key_crouch_inv.tga" : "key_crouch.tga"), '1 1 0' * (1/3) * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * 0.5 * mySize_x - eX * 0.23 * mySize_y + eY * 0.040 * mySize_y, ((pressedkeys & KEY_FORWARD) ? "key_forward_inv.tga" : "key_forward.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * 0.023 * mySize_x + eY * 0.195 * mySize_y, ((pressedkeys & KEY_JUMP) ? "key_jump_inv.tga" : "key_jump.tga"), '1 1 0' * (1/3) * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * 0.1 * mySize_x + eY * 0.486 * mySize_y, ((pressedkeys & KEY_LEFT) ? "key_left_inv.tga" : "key_left.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * 0.5 * mySize_x - eX * 0.23 * mySize_y + eY * 0.486 * mySize_y, ((pressedkeys & KEY_BACKWARD) ? "key_backward_inv.tga" : "key_backward.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(pos + eX * mySize_x - eX * 0.372 * mySize_x + eY * 0.486 * mySize_y, ((pressedkeys & KEY_RIGHT) ? "key_right_inv.tga" : "key_right.tga"), '1 1 0' * 0.46 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos, ((pressedkeys & KEY_CROUCH) ? "key_crouch_inv.tga" : "key_crouch.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x * (1/3), ((pressedkeys & KEY_FORWARD) ? "key_forward_inv.tga" : "key_forward.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos + eX * mySize_x * (2/3), ((pressedkeys & KEY_JUMP) ? "key_jump_inv.tga" : "key_jump.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos + eY * 0.5 * mySize_y, ((pressedkeys & KEY_LEFT) ? "key_left_inv.tga" : "key_left.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos + eY * 0.5 * mySize_y + eX * mySize_x * (1/3), ((pressedkeys & KEY_BACKWARD) ? "key_backward_inv.tga" : "key_backward.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos + eY * 0.5 * mySize_y + eX * mySize_x * (2/3), ((pressedkeys & KEY_RIGHT) ? "key_right_inv.tga" : "key_right.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } // Handle chat as a panel (#12) @@ -4292,7 +4249,7 @@ void HUD_EngineInfo(void) vector color; color = HUD_Get_Num_Color (prevfps, 100); - drawstring(pos, strcat("FPS: ", ftos_decimals(prevfps, cvar("hud_engineinfo_framecounter_decimals"))), '1 1 0' * mySize_y, color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawstring_aspect(pos, strcat("FPS: ", ftos_decimals(prevfps, cvar("hud_engineinfo_framecounter_decimals"))), mySize, mySize_y, color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); } /* ================== @@ -4429,19 +4386,19 @@ void HUD_Main (void) { float i; // x-axis - for(i = 0; i < 1/bound(0.005, bound(0.005, cvar("hud_configure_grid_x"), 0.2), 0.2); ++i) + for(i = 0; i < 1/bound(0.005, cvar("hud_configure_grid_x"), 0.2); ++i) { - drawfill(eX * i * vid_conwidth * bound(0.005, bound(0.005, cvar("hud_configure_grid_x"), 0.2), 0.2), eX + eY * vid_conheight, '0.5 0.5 0.5', cvar("hud_configure_grid_alpha"), DRAWFLAG_NORMAL); + drawfill(eX * i * vid_conwidth * bound(0.005, cvar("hud_configure_grid_x"), 0.2), eX + eY * vid_conheight, '0.5 0.5 0.5', cvar("hud_configure_grid_alpha"), DRAWFLAG_NORMAL); } // y-axis - for(i = 0; i < 1/bound(0.005, bound(0.005, cvar("hud_configure_grid_y"), 0.2), 0.2); ++i) + for(i = 0; i < 1/bound(0.005, cvar("hud_configure_grid_y"), 0.2); ++i) { - drawfill(eY * i * vid_conheight * bound(0.005, bound(0.005, cvar("hud_configure_grid_y"), 0.2), 0.2), eY + eX * vid_conwidth, '0.5 0.5 0.5', cvar("hud_configure_grid_alpha"), DRAWFLAG_NORMAL); + drawfill(eY * i * vid_conheight * bound(0.005, cvar("hud_configure_grid_y"), 0.2), eY + eX * vid_conwidth, '0.5 0.5 0.5', cvar("hud_configure_grid_alpha"), DRAWFLAG_NORMAL); } } if(cvar_string("hud_dock") != "") - drawpic_skin('0 0 0', cvar_string("hud_dock"), eX * vid_conwidth + eY * vid_conheight, HUD_Panel_Dock_GetColor(), cvar("hud_dock_alpha") * menu_fade_alpha, DRAWFLAG_NORMAL); + drawpic('0 0 0', strcat("gfx/hud/", cvar_string("hud_skin"), "/", cvar_string("hud_dock")), eX * vid_conwidth + eY * vid_conheight, HUD_Panel_Dock_GetColor(), cvar("hud_dock_alpha") * menu_fade_alpha, DRAWFLAG_NORMAL); // no aspect ratio forcing on dock... if(HUD_Panel_CheckActive(HUD_PANEL_RADAR) || hud_configure) if(cvar_string("hud_radar") != "0" && (cvar("hud_radar") == 2 || teamplay))