From: FruitieX Date: Sun, 9 May 2010 18:32:26 +0000 (+0300) Subject: s/marigin/border (because that's what it is!) X-Git-Tag: xonotic-v0.1.0preview~541^2~200 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=656f1c709dd47defd544c1968b64c778f66a733c;p=xonotic%2Fxonotic-data.pk3dir.git s/marigin/border (because that's what it is!) --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index a6d5d6bd1..971359eac 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1337,7 +1337,7 @@ seta hud_weaponicons 1 "enable/disable this panel" seta hud_weaponicons_pos "207.5 -74.5" "position of this panel" seta hud_weaponicons_size "230 30" "size of this panel" seta hud_weaponicons_bg 1 "enable/disable the background of this panel" -seta hud_weaponicons_marigin 30 "size of marigin from the background edges"" +seta hud_weaponicons_border 30 "size of border from the background edges"" seta hud_weaponicons_number 1 "show number of weapon" seta hud_weaponicons_accuracybar_height 3 "height of accuracy bar" seta hud_weaponicons_color "" "optional R G B vector of the weaponicons background color, otherwise use hud default" @@ -1346,21 +1346,21 @@ seta hud_inventory 1 "enable/disable this panel" seta hud_inventory_pos "0 -60" "position of this panel" seta hud_inventory_size "200 60" "size of this panel" seta hud_inventory_bg 1 "enable/disable the background of this panel" -seta hud_inventory_marigin 30 "size of marigin from the background edges" +seta hud_inventory_border 30 "size of border from the background edges" seta hud_inventory_color "" "optional R G B vector of the panel background color, otherwise use hud default" seta hud_powerups 0 "enable/disable this panel" seta hud_powerups_pos "0 -90" "position of this panel" seta hud_powerups_size "240 90" "size of this panel" seta hud_powerups_bg 1 "enable/disable the background of this panel" -seta hud_powerups_marigin 30 "size of marigin from the background edges" +seta hud_powerups_border 30 "size of border from the background edges" seta hud_powerups_color "" "optional R G B vector of the panel background color, otherwise use hud default" seta hud_healtharmor 1 "enable/disable this panel" seta hud_healtharmor_pos "207.5 -37" "position of this panel" seta hud_healtharmor_size "230 37" "size of this panel" seta hud_healtharmor_bg 1 "enable/disable the background of this panel" -seta hud_healtharmor_marigin 30 "size of marigin from the background edges" +seta hud_healtharmor_border 30 "size of border from the background edges" seta hud_healtharmor_color "" "optional R G B vector of the panel background color, otherwise use hud default" seta hud_progressbar_health_color "0.6 0 0" "R G B vector of the progress bar background color" seta hud_progressbar_armor_color "0 0.6 0" "R G B vector of the progress bar background color" @@ -1369,14 +1369,14 @@ seta hud_notify 0 "enable/disable this panel" seta hud_notify_pos "-300 -37.5" "position of this base of the panel" seta hud_notify_size "200 37.5" "size of this panel with all notifications on" seta hud_notify_bg 1 "enable/disable the background of this panel" -seta hud_notify_marigin 30 "size of marigin from the background edges" +seta hud_notify_border 30 "size of border from the background edges" seta hud_notify_color "" "optional R G B vector of the panel background color, otherwise use hud default" seta hud_timer 1 "enable/disable this panel" seta hud_timer_pos "-180 0" "position of this base of the panel" seta hud_timer_size "180 90" "size of this panel" seta hud_timer_bg 1 "enable/disable the background of this panel" -seta hud_timer_marigin 30 "size of marigin from the background edges" +seta hud_timer_border 30 "size of border from the background edges" seta hud_timer_color "" "optional R G B vector of the panel background color, otherwise use hud default" seta hud_timer_increment "show elapsed time instead of remaining time" @@ -1384,28 +1384,28 @@ seta hud_radar 1 "enable/disable this panel" seta hud_radar_pos "0 0" "position of this base of the panel" seta hud_radar_size "230 170" "size of this panel" seta hud_radar_bg 1 "enable/disable the background of this panel" -seta hud_radar_marigin 30 "size of marigin from the background edges" +seta hud_radar_border 30 "size of border from the background edges" seta hud_radar_color "" "optional R G B vector of the panel background color, otherwise use hud default" seta hud_score 0 "enable/disable this panel" seta hud_score_pos "-300 -37.5" "position of this base of the panel" seta hud_score_size "200 37.5" "size of this panel" seta hud_score_bg 1 "enable/disable the background of this panel" -seta hud_score_marigin 30 "size of marigin from the background edges" +seta hud_score_border 30 "size of border from the background edges" seta hud_score_color "" "optional R G B vector of the panel background color, otherwise use hud default" seta hud_racetimer 0 "enable/disable this panel" seta hud_racetimer_pos "-300 -37.5" "position of this base of the panel" seta hud_racetimer_size "200 37.5" "size of this panel" seta hud_racetimer_bg 0 "enable/disable the background of this panel" -seta hud_racetimer_marigin 30 "size of marigin from the background edges" +seta hud_racetimer_border 30 "size of border from the background edges" seta hud_racetimer_color "" "optional R G B vector of the panel background color, otherwise use hud default" seta hud_vote 0 "enable/disable this panel" seta hud_vote_pos "-300 -37.5" "position of this base of the panel" seta hud_vote_size "200 37.5" "size of this panel" seta hud_vote_bg 0 "enable/disable the background of this panel" -seta hud_vote_marigin 30 "size of marigin from the background edges" +seta hud_vote_border 30 "size of border from the background edges" seta hud_vote_color "" "optional R G B vector of the panel background color, otherwise use hud default" seta hud_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted" @@ -1413,7 +1413,7 @@ seta hud_pressedkeys 0 "enable/disable this panel" seta hud_pressedkeys_pos "-300 -37.5" "position of this base of the panel" seta hud_pressedkeys_size "200 37.5" "size of this panel" seta hud_pressedkeys_bg 0 "enable/disable the background of this panel" -seta hud_pressedkeys_marigin 30 "size of marigin from the background edges" +seta hud_pressedkeys_border 30 "size of border from the background edges" seta hud_pressedkeys_color "" "optional R G B vector of the panel background color, otherwise use hud default" // scoreboard diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index f401f18c2..be5e92ba4 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -613,7 +613,7 @@ vector HUD_Panel_GetPos(float id) float HUD_Panel_GetMarigin(float id) { - return bound(1, MARIGIN_MULTIPLIER * cvar_or(strcat("hud_", HUD_Panel_GetName(id), "_marigin"), 30), 200); + return bound(1, MARIGIN_MULTIPLIER * cvar_or(strcat("hud_", HUD_Panel_GetName(id), "_border"), 30), 200); } vector HUD_Panel_GetColor(float id) @@ -894,7 +894,7 @@ void HUD_Panel_Mouse() if(mouseClicked) { - float i, marigin; + float i, border; vector panelPos; vector panelSize; @@ -902,7 +902,7 @@ void HUD_Panel_Mouse() { panelPos = HUD_Panel_GetPos(i); panelSize = HUD_Panel_GetSize(i); - marigin = HUD_Panel_GetMarigin(i); + border = HUD_Panel_GetMarigin(i); if(prevMouseClicked == 0) { // move if(mousepos_x >= panelPos_x && mousepos_y >= panelPos_y && mousepos_x <= panelPos_x + panelSize_x && mousepos_y <= panelPos_y + panelSize_y) @@ -911,28 +911,28 @@ void HUD_Panel_Mouse() highlightedAction = 1; } // resize from topleft border - else if(mousepos_x >= panelPos_x - marigin && mousepos_y >= panelPos_y - marigin && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + 0.5 * panelSize_y) + else if(mousepos_x >= panelPos_x - border && mousepos_y >= panelPos_y - border && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + 0.5 * panelSize_y) { highlightedPanel = i; highlightedAction = 2; resizeCorner = 1; } // resize from topright border - else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y - marigin && mousepos_x <= panelPos_x + panelSize_x + marigin && mousepos_y <= panelPos_y + 0.5 * panelSize_y) + else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y - border && mousepos_x <= panelPos_x + panelSize_x + border && mousepos_y <= panelPos_y + 0.5 * panelSize_y) { highlightedPanel = i; highlightedAction = 2; resizeCorner = 2; } // resize from bottomleft border - else if(mousepos_x >= panelPos_x - marigin && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + panelSize_y + marigin) + else if(mousepos_x >= panelPos_x - border && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + panelSize_y + border) { highlightedPanel = i; highlightedAction = 2; resizeCorner = 3; } // resize from bottomright border - else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + panelSize_x + marigin && mousepos_y <= panelPos_y + panelSize_y + marigin) + else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + panelSize_x + border && mousepos_y <= panelPos_y + panelSize_y + border) { highlightedPanel = i; highlightedAction = 2; @@ -999,11 +999,11 @@ void HUD_WeaponIcons_Clear() void HUD_WeaponIcons() { - float alpha, height, marigin, accuracybar_height, stat_weapons; // "constants" + float alpha, height, border, accuracybar_height, stat_weapons; // "constants" vector pos, mySize, mysize, mypos, color, accuracy_color; float i, id, fade, weapon_stats, weapon_hit, weapon_damage, weapon_cnt; // variables - marigin = HUD_Panel_GetMarigin(0); + border = HUD_Panel_GetMarigin(0); pos = HUD_Panel_GetPos(0); mySize = HUD_Panel_GetSize(0); color = HUD_Panel_GetColor(0); @@ -1018,7 +1018,7 @@ void HUD_WeaponIcons() } if(HUD_Panel_GetBgActive(0) && weapon_cnt) - draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER)); + draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER)); // hits weapon_stats = getstati(STAT_DAMAGE_HITS); @@ -1158,16 +1158,16 @@ void HUD_Inventory() { float i; float stat_items; - float marigin; + float border; vector pos, mySize, mysize, mypos, color; - marigin = HUD_Panel_GetMarigin(1); + border = HUD_Panel_GetMarigin(1); pos = HUD_Panel_GetPos(1); mySize = HUD_Panel_GetSize(1); color = HUD_Panel_GetColor(1); if(HUD_Panel_GetBgActive(1)) - draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER)); + draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER)); // ammo stat_items = getstati(STAT_ITEMS); @@ -1179,7 +1179,7 @@ void HUD_Inventory() if(cvar("hud_ammo_onlycurrent")) { if (stat_items & GetAmmoItemCode(i)) { - drawpic(pos - '1 1 0' * marigin, "gfx/hud/sb_ammobg", mysize + '1 1 0' * marigin, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + drawpic(pos - '1 1 0' * border, "gfx/hud/sb_ammobg", mysize + '1 1 0' * border, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); drawpic(pos + eX * mysize_x * 1.7, GetAmmoPicture(i), '24 24 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); if(a < 10) HUD_DrawXNum(pos + '5 5 0', a, 3, 0, 24, '0.7 0 0', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL); @@ -1255,16 +1255,16 @@ void HUD_Inventory() // TODO! void HUD_Powerups() { float stat_items, dt; - float marigin; + float border; vector pos, mySize, color; - marigin = HUD_Panel_GetMarigin(2); + border = HUD_Panel_GetMarigin(2); pos = HUD_Panel_GetPos(2); mySize = HUD_Panel_GetSize(2); color = HUD_Panel_GetColor(2); if(HUD_Panel_GetBgActive(2)) - draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER)); + draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER)); stat_items = getstati(STAT_ITEMS); /* @@ -1332,16 +1332,16 @@ void HUD_Powerups() { // void HUD_HealthArmor(void) { - float marigin; + float border; vector pos, mySize, color; - marigin = HUD_Panel_GetMarigin(3); + border = HUD_Panel_GetMarigin(3); pos = HUD_Panel_GetPos(3); mySize = HUD_Panel_GetSize(3); color = HUD_Panel_GetColor(3); if(HUD_Panel_GetBgActive(3)) - draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER)); + draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER)); float armor, health, x; armor = getstati(STAT_ARMOR); @@ -1473,16 +1473,16 @@ void HUD_HealthArmor(void) // void HUD_Score() { - float marigin; + float border; vector pos, mySize, color; - marigin = HUD_Panel_GetMarigin(7); + border = HUD_Panel_GetMarigin(7); pos = HUD_Panel_GetPos(7); mySize = HUD_Panel_GetSize(7); color = HUD_Panel_GetColor(7); if(HUD_Panel_GetBgActive(7)) - draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER)); + draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER)); float score, distribution, leader; vector score_pos, secondary_score_pos, distribution_color; @@ -1545,16 +1545,16 @@ void HUD_Score() // Race timer (#8) // void HUD_RaceTimer (void) { - float marigin; + float border; vector pos, mySize, color; - marigin = HUD_Panel_GetMarigin(8); + border = HUD_Panel_GetMarigin(8); pos = HUD_Panel_GetPos(8); mySize = HUD_Panel_GetSize(8); color = HUD_Panel_GetColor(8); if(HUD_Panel_GetBgActive(8)) - draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER)); + draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER)); drawfont = hud_bigfont; float a, t; @@ -1673,16 +1673,16 @@ void HUD_RaceTimer (void) { // Notification area (#4) void HUD_Notify (void) { - float marigin; + float border; vector pos, mySize, color; - marigin = HUD_Panel_GetMarigin(4); + border = HUD_Panel_GetMarigin(4); pos = HUD_Panel_GetPos(4); mySize = HUD_Panel_GetSize(4); color = HUD_Panel_GetColor(4); if(HUD_Panel_GetBgActive(4)) - draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER)); + draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER)); string s; entity tm; @@ -1814,10 +1814,10 @@ float vote_change; // "time" when vote_active changed void HUD_VoteWindow(void) { - float marigin; + float border; vector pos, mySize, color; - marigin = HUD_Panel_GetMarigin(9); + border = HUD_Panel_GetMarigin(9); pos = HUD_Panel_GetPos(9); mySize = HUD_Panel_GetSize(9); color = HUD_Panel_GetColor(9); @@ -1843,7 +1843,7 @@ void HUD_VoteWindow(void) } if(HUD_Panel_GetBgActive(9)) - draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg * vote_alpha, '1 1 0' * (marigin/MARIGIN_MULTIPLIER)); + draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg * vote_alpha, '1 1 0' * (border/MARIGIN_MULTIPLIER)); if(vote_alpha) { a = vote_alpha * bound(cvar_or("hud_vote_alreadyvoted_alpha", 0.75), 1 - vote_highlighted, 1); @@ -2373,16 +2373,16 @@ void CSQC_race_hud(void) // void HUD_Timer() { - float marigin; + float border; vector pos, mySize, color; - marigin = HUD_Panel_GetMarigin(5); + border = HUD_Panel_GetMarigin(5); pos = HUD_Panel_GetPos(5); mySize = HUD_Panel_GetSize(5); color = HUD_Panel_GetColor(5); if(HUD_Panel_GetBgActive(5)) - draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER)); + draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER)); float timelimit, elapsedTime, minutes, seconds, timeleft, minutesLeft, secondsLeft; @@ -2450,16 +2450,16 @@ void HUD_Timer() void HUD_Radar(void) { - float marigin; + float border; vector pos, mySize, color; - marigin = HUD_Panel_GetMarigin(6); + border = HUD_Panel_GetMarigin(6); pos = HUD_Panel_GetPos(6); mySize = HUD_Panel_GetSize(6); color = HUD_Panel_GetColor(6); if(HUD_Panel_GetBgActive(6)) - draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER)); + draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER)); local float color1, color2; // color already declared as a global in hud.qc local vector rgb; @@ -2613,16 +2613,16 @@ Main HUD system void HUD_DrawPressedKeys(void) { - float marigin; + float border; vector pos, mySize, color; - marigin = HUD_Panel_GetMarigin(10); + border = HUD_Panel_GetMarigin(10); pos = HUD_Panel_GetPos(10); mySize = HUD_Panel_GetSize(10); color = HUD_Panel_GetColor(10); if(HUD_Panel_GetBgActive(10)) - draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER)); + draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER)); float pressedkeys;