From: Rudolf Polzer Date: Wed, 21 Jul 2010 18:27:07 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/terencehill/dom_points' X-Git-Tag: xonotic-v0.1.0preview~433 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=196c64ee787f27394d191b68b7a46e8b071e9a7d;hp=893785bc722de21e792f5dab43347c8f1b916495 Merge remote branch 'refs/remotes/origin/terencehill/dom_points' --- diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg new file mode 100644 index 0000000000..09860bbfa1 --- /dev/null +++ b/_hud_descriptions.cfg @@ -0,0 +1,203 @@ +// this is a dummy skin that contains only the cvar descriptions, so that we can leave them out from the real skin files themselves. +// please add any new cvars into this file, with null string values +seta hud_skin "" "skin folder where to look for images" +seta hud_panel_bg "" "default background for the panels, file must exist in gfx/hud/[skin name]/, 0 = disable background by default" +seta hud_panel_bg_color "" "default background color for the panels, accepts \"shirt\" and \"pants\"" +seta hud_panel_bg_color_team "" "default setting for overriding panel color with team color in team games, 0.5 = less saturated" +seta hud_panel_bg_alpha "" "default alpha of the background" +seta hud_panel_bg_border "" "default border size for the panels" +seta hud_panel_bg_padding "" "default padding of contents from the border" +seta hud_panel_fg_alpha "" "alpha of the foreground" + +seta hud_dock "" "enable a fullscreen background for the hud, useful for creating artificial docks, \"\" = disable" +seta hud_dock_color "" "dock color, accepts \"shirt\" and \"pants\"" +seta hud_dock_color_team "" "override dock color with team color in team games" +seta hud_dock_alpha "" "alpha of the dock" + +seta hud_progressbar_alpha "" "alpha of progressbars" +seta hud_progressbar_strength_color "" "R G B vector of the progress bar background color" +seta hud_progressbar_shield_color "" "R G B vector of the progress bar background color" +seta hud_progressbar_health_color "" "R G B vector of the progress bar background color" +seta hud_progressbar_armor_color "" "R G B vector of the progress bar background color" +seta hud_progressbar_fuel_color "" "R G B vector of the progress bar background color" +seta hud_progressbar_nexball_color "" "R G B vector of the progress bar background color" + +seta _hud_panelorder "" "contains order in which panels are to be drawn" + +seta hud_configure_grid "" "snap to grid when moving/resizing panels" +seta hud_configure_grid_xsize "" "snap to X * vid_conwidth" +seta hud_configure_grid_ysize "" "snap to Y * vid_conheight" + +seta hud_panel_weapons "" "enable/disable this panel" +seta hud_panel_weapons_pos "" "position of this panel" +seta hud_panel_weapons_size "" "size of this panel" +seta hud_panel_weapons_bg "" "if set to something else than \"\" = override default background" +seta hud_panel_weapons_bg_color "" "if set to something else than \"\" = override default panel background color" +seta hud_panel_weapons_bg_color_team "" "override panel color with team color in team based games" +seta hud_panel_weapons_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" +seta hud_panel_weapons_bg_border "" "if set to something else than \"\" = override default size of border around the background" +seta hud_panel_weapons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" +seta hud_panel_weapons_aspect "" "use this aspect on the items" +seta hud_panel_weapons_complainbubble "" "complain bubble (out of ammo, weapon not available etc)" +seta hud_panel_weapons_complainbubble_padding "" "padding for the complainbubble" +seta hud_panel_weapons_complainbubble_color_outofammo "" "color of the complainbubble when showing out of ammo message" +seta hud_panel_weapons_complainbubble_color_donthave "" "color of the complainbubble when showing don't have weapon message" +seta hud_panel_weapons_complainbubble_color_unavailable "" "color of the complainbubble when showing weapon unavailable message" +seta hud_panel_weapons_ammo_color "" "color of status bar" +seta hud_panel_weapons_ammo_alpha "" "alpha of status bar" + +seta hud_panel_ammo "" "enable/disable this panel" +seta hud_panel_ammo_pos "" "position of this panel" +seta hud_panel_ammo_size "" "size of this panel" +seta hud_panel_ammo_onlycurrent "" "1 = show only current ammo type" +seta hud_panel_ammo_iconalign "" "0 = align icons to the left, 1 = align icons to the right" +seta hud_panel_ammo_bg "" "if set to something else than \"\" = override default background" +seta hud_panel_ammo_bg_color "" "if set to something else than \"\" = override default panel background color" +seta hud_panel_ammo_bg_color_team "" "override panel color with team color in team based games" +seta hud_panel_ammo_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" +seta hud_panel_ammo_bg_border "" "if set to something else than \"\" = override default size of border around the background" +seta hud_panel_ammo_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" + +seta hud_panel_powerups "" "enable/disable this panel" +seta hud_panel_powerups_pos "" "position of this panel" +seta hud_panel_powerups_size "" "size of this panel" +seta hud_panel_powerups_flip "" "flip strength/shield positions" +seta hud_panel_powerups_baralign "" "0 = align bars to the left, 1 = align bars to the right, 2 = align right bar to the right, 3 = align left bar to the right" +seta hud_panel_powerups_iconalign "" "0 = align icons to the left, 1 = align icons to the right, 2 = align right icon to the right, 3 = align left icon to the right" +seta hud_panel_powerups_bg "" "if set to something else than \"\" = override default background" +seta hud_panel_powerups_bg_color "" "if set to something else than \"\" = override default panel background color" +seta hud_panel_powerups_bg_color_team "" "override panel color with team color in team based games" +seta hud_panel_powerups_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" +seta hud_panel_powerups_bg_border "" "if set to something else than \"\" = override default size of border around the background" +seta hud_panel_powerups_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" +seta hud_panel_powerups_progressbar "" "enable progressbar in panel" + +seta hud_panel_healtharmor "" "enable/disable this panel, 2 = combined health/armor display" +seta hud_panel_healtharmor_pos "" "position of this panel" +seta hud_panel_healtharmor_size "" "size of this panel" +seta hud_panel_healtharmor_flip "" "flip health/armor positions" +seta hud_panel_healtharmor_baralign "" "0 = align bars to the left, 1 = align bars to the right, 2 = align right bar to the right, 3 = align left bar to the right" +seta hud_panel_healtharmor_iconalign "" "0 = align icons to the left, 1 = align icons to the right, 2 = align right icon to the right, 3 = align left icon to the right" +seta hud_panel_healtharmor_bg "" "if set to something else than \"\" = override default background" +seta hud_panel_healtharmor_bg_color "" "if set to something else than \"\" = override default panel background color" +seta hud_panel_healtharmor_bg_color_team "" "override panel color with team color in team based games" +seta hud_panel_healtharmor_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" +seta hud_panel_healtharmor_bg_border "" "if set to something else than \"\" = override default size of border around the background" +seta hud_panel_healtharmor_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" +seta hud_panel_healtharmor_progressbar "" "enable progressbar in panel" + +seta hud_panel_notify "" "enable/disable this panel" +seta hud_panel_notify_pos "" "position of this base of the panel" +seta hud_panel_notify_size "" "size of this panel with all notifications on" +seta hud_panel_notify_bg "" "if set to something else than \"\" = override default background" +seta hud_panel_notify_bg_color "" "if set to something else than \"\" = override default panel background color" +seta hud_panel_notify_bg_color_team "" "override panel color with team color in team based games" +seta hud_panel_notify_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" +seta hud_panel_notify_bg_border "" "if set to something else than \"\" = override default size of border around the background" +seta hud_panel_notify_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" +seta hud_panel_notify_flip "" "order the list top to bottom instead of bottom to top" +seta hud_panel_notify_print "" "also con_notify print the messages that are shown on the notify panel" + +seta hud_panel_timer "" "enable/disable this panel" +seta hud_panel_timer_pos "" "position of this base of the panel" +seta hud_panel_timer_size "" "size of this panel" +seta hud_panel_timer_bg "" "if set to something else than \"\" = override default background" +seta hud_panel_timer_bg_color "" "if set to something else than \"\" = override default panel background color" +seta hud_panel_timer_bg_color_team "" "override panel color with team color in team based games" +seta hud_panel_timer_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" +seta hud_panel_timer_bg_border "" "if set to something else than \"\" = override default size of border around the background" +seta hud_panel_timer_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" + +seta hud_panel_radar "" "enable/disable this panel, 2 = also enable in non-teambased gamemodes" +seta hud_panel_radar_pos "" "position of this base of the panel" +seta hud_panel_radar_size "" "size of this panel" +seta hud_panel_radar_bg "" "if set to something else than \"\" = override default background" +seta hud_panel_radar_bg_color "" "if set to something else than \"\" = override default panel background color" +seta hud_panel_radar_bg_color_team "" "override panel color with team color in team based games" +seta hud_panel_radar_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" +seta hud_panel_radar_bg_border "" "if set to something else than \"\" = override default size of border around the background" +seta hud_panel_radar_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" +seta hud_panel_radar_foreground_alpha "" "alpha of the map" + +seta hud_panel_score "" "enable/disable this panel" +seta hud_panel_score_pos "" "position of this base of the panel" +seta hud_panel_score_size "" "size of this panel" +seta hud_panel_score_bg "" "if set to something else than \"\" = override default background" +seta hud_panel_score_bg_color "" "if set to something else than \"\" = override default panel background color" +seta hud_panel_score_bg_color_team "" "override panel color with team color in team based games" +seta hud_panel_score_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" +seta hud_panel_score_bg_border "" "if set to something else than \"\" = override default size of border around the background" +seta hud_panel_score_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" + +seta hud_panel_racetimer "" "enable/disable this panel" +seta hud_panel_racetimer_pos "" "position of this base of the panel" +seta hud_panel_racetimer_size "" "size of this panel" +seta hud_panel_racetimer_bg "" "if set to something else than \"\" = override default background" +seta hud_panel_racetimer_bg_color "" "if set to something else than \"\" = override default panel background color" +seta hud_panel_racetimer_bg_color_team "" "override panel color with team color in team based games" +seta hud_panel_racetimer_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" +seta hud_panel_racetimer_bg_border "" "if set to something else than \"\" = override default size of border around the background" +seta hud_panel_racetimer_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" + +seta hud_panel_vote "" "enable/disable this panel" +seta hud_panel_vote_pos "" "position of this base of the panel" +seta hud_panel_vote_size "" "size of this panel" +seta hud_panel_vote_alreadyvoted_alpha "" "alpha of the vote dialog after you have voted" +seta hud_panel_vote_bg "" "if set to something else than \"\" = override default background" +seta hud_panel_vote_bg_color "" "if set to something else than \"\" = override default panel background color" +seta hud_panel_vote_bg_color_team "" "override panel color with team color in team based games" +seta hud_panel_vote_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" +seta hud_panel_vote_bg_border "" "if set to something else than \"\" = override default size of border around the background" +seta hud_panel_vote_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" + +seta hud_panel_modicons "" "enable/disable this panel" +seta hud_panel_modicons_pos "" "position of this base of the panel" +seta hud_panel_modicons_size "" "size of this panel" +seta hud_panel_modicons_bg "" "if set to something else than \"\" = override default background" +seta hud_panel_modicons_bg_color "" "if set to something else than \"\" = override default panel background color" +seta hud_panel_modicons_bg_color_team "" "override panel color with team color in team based games" +seta hud_panel_modicons_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" +seta hud_panel_modicons_bg_border "" "if set to something else than \"\" = override default size of border around the background" +seta hud_panel_modicons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" + +seta hud_panel_pressedkeys "" "enable/disable this panel, 1 = show only when spectating other players, 2 = show always" +seta hud_panel_pressedkeys_pos "" "position of this base of the panel" +seta hud_panel_pressedkeys_size "" "size of this panel" +seta hud_panel_pressedkeys_bg "" "if set to something else than \"\" = override default background" +seta hud_panel_pressedkeys_bg_color "" "if set to something else than \"\" = override default panel background color" +seta hud_panel_pressedkeys_bg_color_team "" "override panel color with team color in team based games" +seta hud_panel_pressedkeys_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" +seta hud_panel_pressedkeys_bg_border "" "if set to something else than \"\" = override default size of border around the background" +seta hud_panel_pressedkeys_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" +seta hud_panel_pressedkeys_aspect "" "forced aspect on panel" + +seta hud_panel_chat "" "enable/disable this panel" +seta hud_panel_chat_pos "" "position of this base of the panel" +seta hud_panel_chat_size "" "size of this panel" +seta hud_panel_chat_bg "" "if set to something else than \"\" = override default background" +seta hud_panel_chat_bg_color "" "if set to something else than \"\" = override default panel background color" +seta hud_panel_chat_bg_color_team "" "override panel color with team color in team based games" +seta hud_panel_chat_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" +seta hud_panel_chat_bg_border "" "if set to something else than \"\" = override default size of border around the background" +seta hud_panel_chat_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" + +seta hud_panel_engineinfo "" "enable/disable this panel +seta hud_panel_engineinfo_pos "" "position of this base of the panel" +seta hud_panel_engineinfo_size "" "size of this panel" +seta hud_panel_engineinfo_bg "" "if set to something else than \"\" = override default background" +seta hud_panel_engineinfo_bg_color "" "if set to something else than \"\" = override default panel background color" +seta hud_panel_engineinfo_bg_color_team "" "override panel color with team color in team based games" +seta hud_panel_engineinfo_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" +seta hud_panel_engineinfo_bg_border "" "if set to something else than \"\" = override default size of border around the background" +seta hud_panel_engineinfo_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" + +seta hud_panel_infomessages "" "enable/disable this panel +seta hud_panel_infomessages_pos "" "position of this base of the panel" +seta hud_panel_infomessages_size "" "size of this panel" +seta hud_panel_infomessages_bg "" "if set to something else than \"\" = override default background" +seta hud_panel_infomessages_bg_color "" "if set to something else than \"\" = override default panel background color" +seta hud_panel_infomessages_bg_color_team "" "override panel color with team color in team based games" +seta hud_panel_infomessages_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" +seta hud_panel_infomessages_bg_border "" "if set to something else than \"\" = override default size of border around the background" +seta hud_panel_infomessages_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" +seta hud_panel_infomessages_flip "" "1 = align the items to the right" diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 19fe9fef50..5c76f7df8a 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -849,6 +849,8 @@ set g_bloodloss 0 "amount of health below which blood loss occurs" set g_footsteps 0 "serverside footstep sounds" +set g_deathglow 1.25 "when enabled, players stop glowing after they die (the value specifies glow fading speed)" + // effects r_picmipsprites 0 // Xonotic uses sprites that should never be picmipped (team mate, typing, waypoints) r_mipsprites 1 @@ -1324,16 +1326,49 @@ con_notifyalign 0 // hud variables set _hud_configure 0 "1 = configure the HUD" +seta hud_configure_teamcolorforced 1 "1 = force display of team colors in configure mode" seta hud_configure_checkcollisions 1 "check for collisions against other panels when in hud configure mode" seta hud_configure_bg_minalpha 0.25 "minimum panel background alpha when in hud configure mode" -seta hud_configure_grid 1 "snap to grid when moving/resizing panels" -seta hud_configure_grid_x 0.01 "snap to X * vid_conwidth" -seta hud_configure_grid_y 0.01 "snap to Y * vid_conheight" seta hud_configure_grid_alpha 0.15 "alpha for visible grid when in configure mode" seta sbar_info_pos 0 "Y-axis distance from lower right corner for engine info prints" -exec hud_wickedhud_default.cfg +// hud cvar descriptions +exec _hud_descriptions.cfg +// exec the default skin config. remember, NO menu_restart in the deafault cfg (dp segfaults at startup otherwise) +exec hud_default.cfg + +// user preference cvars (i.e. shouldn't be adjusted by a skin config) +seta hud_panel_weapons_label 1 "1 = show number of weapon, 2 = show bound key of weapon" +seta hud_panel_weapons_complainbubble_time 1 "time that a new entry stays until it fades out" +seta hud_panel_weapons_complainbubble_fadetime 0.25 "fade out time" +seta hud_panel_weapons_accuracy 1 "show accuracy color as the weapon icon background" +seta hud_panel_weapons_accuracy_color0 "1 0 0" +seta hud_panel_weapons_accuracy_color1 "1 1 0" +seta hud_panel_weapons_accuracy_color2 "0 1 0" +seta hud_panel_weapons_accuracy_color_levels "0 20 100" "accuracy values at which a specified color (hud_panel_weapons_accuracy_color) will be used. If your accuracy is between 2 of these values then a mix of the Xth and X+1th colors will be used. You can specify up to 10 values, in increasing order" +seta hud_panel_weapons_ammo 1 "show ammo as a status bar" +seta hud_panel_weapons_ammo_full_shells 40 "show 100% of the status bar at this ammo count" +seta hud_panel_weapons_ammo_full_nails 100 "show 100% of the status bar at this ammo count" +seta hud_panel_weapons_ammo_full_cells 60 "show 100% of the status bar at this ammo count" +seta hud_panel_weapons_ammo_full_rockets 60 "show 100% of the status bar at this ammo count" +seta hud_panel_weapons_ammo_full_fuel 100 "show 100% of the status bar at this ammo count" + +seta hud_panel_notify_time 10 "time that a new entry stays until it fades out" +seta hud_panel_notify_fadetime 3 "fade out time" + +seta hud_panel_timer_increment 0 "show elapsed time instead of remaining time" + +seta hud_panel_radar_scale 4096 "distance you can see on the team radar" +seta hud_panel_radar_rotation 0 "rotation mode: you set what points up. 0 = player, 1 = west, 2 = south, 3 = east, 4 = north" +seta hud_panel_radar_zoommode 0 "zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out" +alias hud_panel_radar_rotate "toggle hud_panel_radar_rotation 0 1 2 3 4" + +seta hud_panel_engineinfo_framecounter_time 1 "time between framerate display updates, smaller values yield less accuracy" +seta hud_panel_engineinfo_framecounter_decimals 0 "amount of decimals to show" +seta hud_panel_engineinfo_framecounter_exponentialmovingaverage 1 "use an averaging method for calculating fps instead of counting frametime like engine does" +seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_new_weight 0.1 "weight of latest data point" +seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold 0.5 "threshold for fps change when to update instantly, to make big fps changes update faster" // scoreboard seta scoreboard_columns default @@ -1380,15 +1415,27 @@ alias reducematchtime "sv_cmd rpn /timelimit timelimit timelimit_decrement sub t alias endmatch "timelimit -1" // useful keybind to maximize the chat area temporarily +// HUD code takes care of many of these now... +//set _backup_con_chatvars_set 0 +//alias _restore_con_chatvars_0 "" +//alias _restore_con_chatvars_1 "set _backup_con_chatvars_set 0; con_chatpos $_backup_con_chatpos; con_chat $_backup_con_chat; con_notify $_backup_con_notify; con_chattime $_backup_con_chattime; cl_deathscoreboard $_backup_cl_deathscoreboard; scr_centertime $_backup_scr_centertime;r_track_sprites $_backup_r_track_sprites" +//alias _restore_con_chatvars "_restore_con_chatvars_$_backup_con_chatvars_set" +//alias _backup_con_chatvars_0 "set _backup_con_chatvars_set 1; set _backup_con_chatpos $con_chatpos; set _backup_con_chat $con_chat; set _backup_con_notify $con_notify; set _backup_con_chattime $con_chattime; set _backup_cl_deathscoreboard $cl_deathscoreboard; set _backup_scr_centertime $scr_centertime;set _backup_r_track_sprites $r_track_sprites" +//alias _backup_con_chatvars_1 "" +//alias _backup_con_chatvars "_backup_con_chatvars_$_backup_con_chatvars_set" +//alias +con_chat_maximize "_backup_con_chatvars; con_chatpos -9; con_chat 100; con_notify 0; con_chattime 3600; cl_deathscoreboard 0; scr_centertime 0; r_track_sprites 0" +//alias -con_chat_maximize "_restore_con_chatvars" + +set _con_chat_maximized 0 set _backup_con_chatvars_set 0 alias _restore_con_chatvars_0 "" -alias _restore_con_chatvars_1 "set _backup_con_chatvars_set 0; con_chatpos $_backup_con_chatpos; con_chat $_backup_con_chat; con_notify $_backup_con_notify; con_chattime $_backup_con_chattime; cl_deathscoreboard $_backup_cl_deathscoreboard; scr_centertime $_backup_scr_centertime;r_track_sprites $_backup_r_track_sprites" +alias _restore_con_chatvars_1 "set _backup_con_chatvars_set 0; con_notify $_backup_con_notify; con_chattime $_backup_con_chattime; cl_deathscoreboard $_backup_cl_deathscoreboard; scr_centertime $_backup_scr_centertime;r_track_sprites $_backup_r_track_sprites" alias _restore_con_chatvars "_restore_con_chatvars_$_backup_con_chatvars_set" -alias _backup_con_chatvars_0 "set _backup_con_chatvars_set 1; set _backup_con_chatpos $con_chatpos; set _backup_con_chat $con_chat; set _backup_con_notify $con_notify; set _backup_con_chattime $con_chattime; set _backup_cl_deathscoreboard $cl_deathscoreboard; set _backup_scr_centertime $scr_centertime;set _backup_r_track_sprites $r_track_sprites" +alias _backup_con_chatvars_0 "set _backup_con_chatvars_set 1; set _backup_con_notify $con_notify; set _backup_con_chattime $con_chattime; set _backup_cl_deathscoreboard $cl_deathscoreboard; set _backup_scr_centertime $scr_centertime;set _backup_r_track_sprites $r_track_sprites" alias _backup_con_chatvars_1 "" alias _backup_con_chatvars "_backup_con_chatvars_$_backup_con_chatvars_set" -alias +con_chat_maximize "_backup_con_chatvars; con_chatpos -9; con_chat 100; con_notify 0; con_chattime 3600; cl_deathscoreboard 0; scr_centertime 0; r_track_sprites 0" -alias -con_chat_maximize "_restore_con_chatvars" +alias +con_chat_maximize "_con_chat_maximized 1; _backup_con_chatvars; con_notify 0; con_chattime 3600; cl_deathscoreboard 0; scr_centertime 0; r_track_sprites 0" +alias -con_chat_maximize "_con_chat_maximized 0; _restore_con_chatvars" // tab completion set con_completion_playdemo *.dem @@ -1473,8 +1520,6 @@ seta hud_width 560 // alias hud_font "loadfont user1 ${1},gfx/fallback ${2-}; loadfont user2 ${1}-big ${2-}; scoreboard_columns_set" alias sbar_font "set _requested_sbar_font \"${*}\"" sbar_font gfx/vera-sans 8 12 16 24 32 -seta hud_showbinds 1 "display actions / bound keys in the strings shown during the game. 0 displays only actions, 1 displays only bound keys, 2 displays both" -seta hud_showbinds_limit 2 "maximum number of bound keys to show for an action. 0 for unlimited" // these entities are not referenced by anything directly, they just represent // teams and are found by find() when needed @@ -1618,8 +1663,10 @@ set camera_look_attenuation 8 "Attenuation of \"looking\" movements, only if ca set camera_forward_follows 1 "0: Move the camera forwards without changing altitude. 1: Move towards what you are looking" // "Gentle mode": show no blood -seta sv_gentle 0 "force gentle mode for everyone, also remove references to acts of killing from the messages" -seta cl_gentle 0 "client side gentle mode (only replaces gibs); when set to 1, white smoke replaces gibs, when set to 2, colorful clouds replace gibs" +seta sv_gentle 0 "force gentle mode for everyone, also remove references to acts of killing from the messages" +seta cl_gentle 0 "client side gentle mode, master switch for removing both gibs and messages" +seta cl_gentle_gibs 0 "client side gentle mode (only replaces gibs); when set to 1, white smoke replaces gibs, when set to 2, colorful clouds replace gibs" +seta cl_gentle_messages 0 "client side gentle mode (only replaces frag messages/centerprints)" seta cl_racetimer_position 0.25 "Y-axis positioning of the race timer (from 0 to 1)" seta cl_showpressedkeys 0 "Show which movement keys someone is pressing: 1 for spectating, 2 for always" diff --git a/gfx/hud/default/ammo_bullets.tga b/gfx/hud/default/ammo_bullets.tga new file mode 100644 index 0000000000..e7cd01a252 Binary files /dev/null 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 new file mode 100644 index 0000000000..664eb232d2 Binary files /dev/null and b/gfx/hud/default/ammo_cells.tga differ diff --git a/gfx/hud/default/ammo_current_bg.tga b/gfx/hud/default/ammo_current_bg.tga new file mode 100644 index 0000000000..bd07205991 Binary files /dev/null and b/gfx/hud/default/ammo_current_bg.tga differ diff --git a/gfx/hud/default/ammo_fuel.tga b/gfx/hud/default/ammo_fuel.tga new file mode 100644 index 0000000000..8450a2fec4 Binary files /dev/null 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 new file mode 100644 index 0000000000..c37f077b28 Binary files /dev/null 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 new file mode 100644 index 0000000000..59bea4b3e1 Binary files /dev/null and b/gfx/hud/default/ammo_shells.tga differ diff --git a/gfx/hud/default/armor.tga b/gfx/hud/default/armor.tga new file mode 100644 index 0000000000..92046b4887 Binary files /dev/null and b/gfx/hud/default/armor.tga differ diff --git a/gfx/hud/default/border.tga b/gfx/hud/default/border.tga index 6535f36e89..8ceee44525 100644 Binary files a/gfx/hud/default/border.tga and b/gfx/hud/default/border.tga differ diff --git a/gfx/hud/default/border_chat.tga b/gfx/hud/default/border_chat.tga new file mode 100644 index 0000000000..1cd065effd Binary files /dev/null and b/gfx/hud/default/border_chat.tga differ diff --git a/gfx/hud/default/border_healtharmor.tga b/gfx/hud/default/border_healtharmor.tga new file mode 100644 index 0000000000..7109ab570c Binary files /dev/null and b/gfx/hud/default/border_healtharmor.tga differ diff --git a/gfx/hud/default/border_highlighted.tga b/gfx/hud/default/border_highlighted.tga new file mode 100644 index 0000000000..542f82a74c Binary files /dev/null and b/gfx/hud/default/border_highlighted.tga differ diff --git a/gfx/hud/default/border_highlighted2.tga b/gfx/hud/default/border_highlighted2.tga new file mode 100644 index 0000000000..7e460e5cbb Binary files /dev/null and b/gfx/hud/default/border_highlighted2.tga differ diff --git a/gfx/hud/default/border_inventory.tga b/gfx/hud/default/border_inventory.tga new file mode 100644 index 0000000000..20ae8f6044 Binary files /dev/null and b/gfx/hud/default/border_inventory.tga differ diff --git a/gfx/hud/default/border_modicons.tga b/gfx/hud/default/border_modicons.tga new file mode 100644 index 0000000000..5437b042e3 Binary files /dev/null and b/gfx/hud/default/border_modicons.tga differ diff --git a/gfx/hud/default/border_powerups.tga b/gfx/hud/default/border_powerups.tga new file mode 100644 index 0000000000..f8fbf4439e Binary files /dev/null and b/gfx/hud/default/border_powerups.tga differ diff --git a/gfx/hud/default/border_radar.tga b/gfx/hud/default/border_radar.tga new file mode 100644 index 0000000000..a300f5207d Binary files /dev/null and b/gfx/hud/default/border_radar.tga differ diff --git a/gfx/hud/default/border_score.tga b/gfx/hud/default/border_score.tga new file mode 100644 index 0000000000..a4d8b6c478 Binary files /dev/null and b/gfx/hud/default/border_score.tga differ diff --git a/gfx/hud/default/border_timer.tga b/gfx/hud/default/border_timer.tga new file mode 100644 index 0000000000..c657136fb0 Binary files /dev/null and b/gfx/hud/default/border_timer.tga differ diff --git a/gfx/hud/default/border_vote.tga b/gfx/hud/default/border_vote.tga new file mode 100644 index 0000000000..13b948e1ab Binary files /dev/null and b/gfx/hud/default/border_vote.tga differ diff --git a/gfx/hud/default/border_weaponicons.tga b/gfx/hud/default/border_weaponicons.tga new file mode 100644 index 0000000000..08e8dcd7d2 Binary files /dev/null and b/gfx/hud/default/border_weaponicons.tga differ diff --git a/gfx/hud/default/borderx.tga b/gfx/hud/default/borderx.tga deleted file mode 100644 index 8ef37d368e..0000000000 Binary files a/gfx/hud/default/borderx.tga and /dev/null differ diff --git a/gfx/hud/default/dock.tga b/gfx/hud/default/dock.tga new file mode 100644 index 0000000000..9dd4e2f0f6 Binary files /dev/null and b/gfx/hud/default/dock.tga differ diff --git a/gfx/hud/default/dock_small.tga b/gfx/hud/default/dock_small.tga new file mode 100644 index 0000000000..5135876d8a Binary files /dev/null and b/gfx/hud/default/dock_small.tga differ diff --git a/gfx/hud/default/flag_blue_carrying.tga b/gfx/hud/default/flag_blue_carrying.tga new file mode 100644 index 0000000000..ace6a5f2c3 Binary files /dev/null and b/gfx/hud/default/flag_blue_carrying.tga differ diff --git a/gfx/hud/default/flag_blue_lost.tga b/gfx/hud/default/flag_blue_lost.tga new file mode 100644 index 0000000000..67d894d82d Binary files /dev/null and b/gfx/hud/default/flag_blue_lost.tga differ diff --git a/gfx/hud/default/flag_blue_shielded.tga b/gfx/hud/default/flag_blue_shielded.tga new file mode 100644 index 0000000000..a8993f6b2c Binary files /dev/null and b/gfx/hud/default/flag_blue_shielded.tga differ diff --git a/gfx/hud/default/flag_blue_taken.tga b/gfx/hud/default/flag_blue_taken.tga new file mode 100644 index 0000000000..6847e7cc19 Binary files /dev/null and b/gfx/hud/default/flag_blue_taken.tga differ diff --git a/gfx/hud/default/flag_red_carrying.tga b/gfx/hud/default/flag_red_carrying.tga new file mode 100644 index 0000000000..3393083323 Binary files /dev/null and b/gfx/hud/default/flag_red_carrying.tga differ diff --git a/gfx/hud/default/flag_red_lost.tga b/gfx/hud/default/flag_red_lost.tga new file mode 100644 index 0000000000..f96e02147e Binary files /dev/null and b/gfx/hud/default/flag_red_lost.tga differ diff --git a/gfx/hud/default/flag_red_shielded.tga b/gfx/hud/default/flag_red_shielded.tga new file mode 100644 index 0000000000..e7ec491fd6 Binary files /dev/null and b/gfx/hud/default/flag_red_shielded.tga differ diff --git a/gfx/hud/default/flag_red_taken.tga b/gfx/hud/default/flag_red_taken.tga new file mode 100644 index 0000000000..bf71977e14 Binary files /dev/null and b/gfx/hud/default/flag_red_taken.tga differ diff --git a/gfx/hud/default/health.tga b/gfx/hud/default/health.tga new file mode 100644 index 0000000000..0ed8a9030f Binary files /dev/null and b/gfx/hud/default/health.tga differ diff --git a/gfx/hud/default/key_backward.tga b/gfx/hud/default/key_backward.tga new file mode 100644 index 0000000000..4de0f33221 Binary files /dev/null and b/gfx/hud/default/key_backward.tga differ diff --git a/gfx/hud/default/key_backward_inv.tga b/gfx/hud/default/key_backward_inv.tga new file mode 100644 index 0000000000..bef0d1ca3d Binary files /dev/null and b/gfx/hud/default/key_backward_inv.tga differ diff --git a/gfx/hud/default/key_crouch.tga b/gfx/hud/default/key_crouch.tga new file mode 100644 index 0000000000..00b2dfe449 Binary files /dev/null and b/gfx/hud/default/key_crouch.tga differ diff --git a/gfx/hud/default/key_crouch_inv.tga b/gfx/hud/default/key_crouch_inv.tga new file mode 100644 index 0000000000..2cdbda804d Binary files /dev/null and b/gfx/hud/default/key_crouch_inv.tga differ diff --git a/gfx/hud/default/key_forward.tga b/gfx/hud/default/key_forward.tga new file mode 100644 index 0000000000..dfe223381b Binary files /dev/null and b/gfx/hud/default/key_forward.tga differ diff --git a/gfx/hud/default/key_forward_inv.tga b/gfx/hud/default/key_forward_inv.tga new file mode 100644 index 0000000000..7bbea6070f Binary files /dev/null and b/gfx/hud/default/key_forward_inv.tga differ diff --git a/gfx/hud/default/key_jump.tga b/gfx/hud/default/key_jump.tga new file mode 100644 index 0000000000..d02b2dbc88 Binary files /dev/null and b/gfx/hud/default/key_jump.tga differ diff --git a/gfx/hud/default/key_jump_inv.tga b/gfx/hud/default/key_jump_inv.tga new file mode 100644 index 0000000000..c54bb3763c Binary files /dev/null and b/gfx/hud/default/key_jump_inv.tga differ diff --git a/gfx/hud/default/key_left.tga b/gfx/hud/default/key_left.tga new file mode 100644 index 0000000000..60fe71f17e Binary files /dev/null and b/gfx/hud/default/key_left.tga differ diff --git a/gfx/hud/default/key_left_inv.tga b/gfx/hud/default/key_left_inv.tga new file mode 100644 index 0000000000..92bc615e44 Binary files /dev/null and b/gfx/hud/default/key_left_inv.tga differ diff --git a/gfx/hud/default/key_right.tga b/gfx/hud/default/key_right.tga new file mode 100644 index 0000000000..308c03b1e5 Binary files /dev/null and b/gfx/hud/default/key_right.tga differ diff --git a/gfx/hud/default/key_right_inv.tga b/gfx/hud/default/key_right_inv.tga new file mode 100644 index 0000000000..8f04be424e Binary files /dev/null and b/gfx/hud/default/key_right_inv.tga differ diff --git a/gfx/hud/default/kh_blue.tga b/gfx/hud/default/kh_blue.tga new file mode 100644 index 0000000000..467b2294f7 Binary files /dev/null and b/gfx/hud/default/kh_blue.tga differ diff --git a/gfx/hud/default/kh_bluearrow.tga b/gfx/hud/default/kh_bluearrow.tga new file mode 100644 index 0000000000..b686d1b347 Binary files /dev/null and b/gfx/hud/default/kh_bluearrow.tga differ diff --git a/gfx/hud/default/kh_pink.tga b/gfx/hud/default/kh_pink.tga new file mode 100644 index 0000000000..b40967a752 Binary files /dev/null and b/gfx/hud/default/kh_pink.tga differ diff --git a/gfx/hud/default/kh_pinkarrow.tga b/gfx/hud/default/kh_pinkarrow.tga new file mode 100644 index 0000000000..17427e5d39 Binary files /dev/null and b/gfx/hud/default/kh_pinkarrow.tga differ diff --git a/gfx/hud/default/kh_red.tga b/gfx/hud/default/kh_red.tga new file mode 100644 index 0000000000..3201f8afe6 Binary files /dev/null and b/gfx/hud/default/kh_red.tga differ diff --git a/gfx/hud/default/kh_redarrow.tga b/gfx/hud/default/kh_redarrow.tga new file mode 100644 index 0000000000..edd1fab3cd Binary files /dev/null and b/gfx/hud/default/kh_redarrow.tga differ diff --git a/gfx/hud/default/kh_yellow.tga b/gfx/hud/default/kh_yellow.tga new file mode 100644 index 0000000000..bb8347563c Binary files /dev/null and b/gfx/hud/default/kh_yellow.tga differ diff --git a/gfx/hud/default/kh_yellowarrow.tga b/gfx/hud/default/kh_yellowarrow.tga new file mode 100644 index 0000000000..8e754cc9bb Binary files /dev/null and b/gfx/hud/default/kh_yellowarrow.tga differ diff --git a/gfx/hud/default/nexball_carrying.tga b/gfx/hud/default/nexball_carrying.tga new file mode 100644 index 0000000000..04ada8ce4c Binary files /dev/null and b/gfx/hud/default/nexball_carrying.tga differ diff --git a/gfx/hud/default/notify_blue_captured.tga b/gfx/hud/default/notify_blue_captured.tga new file mode 100644 index 0000000000..7cff17eed2 Binary files /dev/null and b/gfx/hud/default/notify_blue_captured.tga differ diff --git a/gfx/hud/default/notify_blue_lost.tga b/gfx/hud/default/notify_blue_lost.tga new file mode 100644 index 0000000000..67d894d82d Binary files /dev/null and b/gfx/hud/default/notify_blue_lost.tga differ diff --git a/gfx/hud/default/notify_blue_returned.tga b/gfx/hud/default/notify_blue_returned.tga new file mode 100644 index 0000000000..8e8b67ffda Binary files /dev/null and b/gfx/hud/default/notify_blue_returned.tga differ diff --git a/gfx/hud/default/notify_blue_shielded.tga b/gfx/hud/default/notify_blue_shielded.tga new file mode 100644 index 0000000000..a8993f6b2c Binary files /dev/null and b/gfx/hud/default/notify_blue_shielded.tga differ diff --git a/gfx/hud/default/notify_blue_taken.tga b/gfx/hud/default/notify_blue_taken.tga new file mode 100644 index 0000000000..6847e7cc19 Binary files /dev/null and b/gfx/hud/default/notify_blue_taken.tga differ diff --git a/gfx/hud/default/notify_camping.tga b/gfx/hud/default/notify_camping.tga new file mode 100644 index 0000000000..2766dd1ccf Binary files /dev/null and b/gfx/hud/default/notify_camping.tga differ diff --git a/gfx/hud/default/notify_death.tga b/gfx/hud/default/notify_death.tga new file mode 100644 index 0000000000..d5e8045a20 Binary files /dev/null and b/gfx/hud/default/notify_death.tga differ diff --git a/gfx/hud/default/notify_fall.tga b/gfx/hud/default/notify_fall.tga new file mode 100644 index 0000000000..febd1d03dc Binary files /dev/null and b/gfx/hud/default/notify_fall.tga differ diff --git a/gfx/hud/default/notify_headshot.tga b/gfx/hud/default/notify_headshot.tga new file mode 100644 index 0000000000..d9c3e5a911 Binary files /dev/null and b/gfx/hud/default/notify_headshot.tga differ diff --git a/gfx/hud/default/notify_lava.tga b/gfx/hud/default/notify_lava.tga new file mode 100644 index 0000000000..3976e8ba3f Binary files /dev/null and b/gfx/hud/default/notify_lava.tga differ diff --git a/gfx/hud/default/notify_melee.tga b/gfx/hud/default/notify_melee.tga new file mode 100644 index 0000000000..e4fa0c77cd Binary files /dev/null and b/gfx/hud/default/notify_melee.tga differ diff --git a/gfx/hud/default/notify_outofammo.tga b/gfx/hud/default/notify_outofammo.tga new file mode 100644 index 0000000000..82a11dd83d Binary files /dev/null and b/gfx/hud/default/notify_outofammo.tga differ diff --git a/gfx/hud/default/notify_red_captured.tga b/gfx/hud/default/notify_red_captured.tga new file mode 100644 index 0000000000..72814ecc69 Binary files /dev/null and b/gfx/hud/default/notify_red_captured.tga differ diff --git a/gfx/hud/default/notify_red_lost.tga b/gfx/hud/default/notify_red_lost.tga new file mode 100644 index 0000000000..f96e02147e Binary files /dev/null and b/gfx/hud/default/notify_red_lost.tga differ diff --git a/gfx/hud/default/notify_red_returned.tga b/gfx/hud/default/notify_red_returned.tga new file mode 100644 index 0000000000..deee4686d0 Binary files /dev/null and b/gfx/hud/default/notify_red_returned.tga differ diff --git a/gfx/hud/default/notify_red_shielded.tga b/gfx/hud/default/notify_red_shielded.tga new file mode 100644 index 0000000000..e7ec491fd6 Binary files /dev/null and b/gfx/hud/default/notify_red_shielded.tga differ diff --git a/gfx/hud/default/notify_red_taken.tga b/gfx/hud/default/notify_red_taken.tga new file mode 100644 index 0000000000..bf71977e14 Binary files /dev/null and b/gfx/hud/default/notify_red_taken.tga differ diff --git a/gfx/hud/default/notify_selfkill.tga b/gfx/hud/default/notify_selfkill.tga new file mode 100644 index 0000000000..646a1a2381 Binary files /dev/null and b/gfx/hud/default/notify_selfkill.tga differ diff --git a/gfx/hud/default/notify_shootingstar.tga b/gfx/hud/default/notify_shootingstar.tga new file mode 100644 index 0000000000..048e0151fc Binary files /dev/null and b/gfx/hud/default/notify_shootingstar.tga differ diff --git a/gfx/hud/default/notify_slime.tga b/gfx/hud/default/notify_slime.tga new file mode 100644 index 0000000000..c08a6a3d48 Binary files /dev/null and b/gfx/hud/default/notify_slime.tga differ diff --git a/gfx/hud/default/notify_teamkill_blue.tga b/gfx/hud/default/notify_teamkill_blue.tga new file mode 100644 index 0000000000..a40920b204 Binary files /dev/null and b/gfx/hud/default/notify_teamkill_blue.tga differ diff --git a/gfx/hud/default/notify_teamkill_red.tga b/gfx/hud/default/notify_teamkill_red.tga new file mode 100644 index 0000000000..a40920b204 Binary files /dev/null and b/gfx/hud/default/notify_teamkill_red.tga differ diff --git a/gfx/hud/default/notify_void.tga b/gfx/hud/default/notify_void.tga new file mode 100644 index 0000000000..1e2d280eb2 Binary files /dev/null and b/gfx/hud/default/notify_void.tga differ diff --git a/gfx/hud/default/notify_water.tga b/gfx/hud/default/notify_water.tga new file mode 100644 index 0000000000..8315f1266b Binary files /dev/null and b/gfx/hud/default/notify_water.tga differ diff --git a/gfx/hud/default/num_0.tga b/gfx/hud/default/num_0.tga new file mode 100644 index 0000000000..f0ab2f18e7 Binary files /dev/null and b/gfx/hud/default/num_0.tga differ diff --git a/gfx/hud/default/num_0_stroke.tga b/gfx/hud/default/num_0_stroke.tga new file mode 100644 index 0000000000..e9c6e5bdcb Binary files /dev/null and b/gfx/hud/default/num_0_stroke.tga differ diff --git a/gfx/hud/default/num_1.tga b/gfx/hud/default/num_1.tga new file mode 100644 index 0000000000..78f1f45a37 Binary files /dev/null and b/gfx/hud/default/num_1.tga differ diff --git a/gfx/hud/default/num_1_stroke.tga b/gfx/hud/default/num_1_stroke.tga new file mode 100644 index 0000000000..1ff552f535 Binary files /dev/null and b/gfx/hud/default/num_1_stroke.tga differ diff --git a/gfx/hud/default/num_2.tga b/gfx/hud/default/num_2.tga new file mode 100644 index 0000000000..205dd03512 Binary files /dev/null and b/gfx/hud/default/num_2.tga differ diff --git a/gfx/hud/default/num_2_stroke.tga b/gfx/hud/default/num_2_stroke.tga new file mode 100644 index 0000000000..08d26dfef2 Binary files /dev/null and b/gfx/hud/default/num_2_stroke.tga differ diff --git a/gfx/hud/default/num_3.tga b/gfx/hud/default/num_3.tga new file mode 100644 index 0000000000..335b5dab0a Binary files /dev/null and b/gfx/hud/default/num_3.tga differ diff --git a/gfx/hud/default/num_3_stroke.tga b/gfx/hud/default/num_3_stroke.tga new file mode 100644 index 0000000000..a5fdddaa6a Binary files /dev/null and b/gfx/hud/default/num_3_stroke.tga differ diff --git a/gfx/hud/default/num_4.tga b/gfx/hud/default/num_4.tga new file mode 100644 index 0000000000..2b9f46f53e Binary files /dev/null and b/gfx/hud/default/num_4.tga differ diff --git a/gfx/hud/default/num_4_stroke.tga b/gfx/hud/default/num_4_stroke.tga new file mode 100644 index 0000000000..fe879331fa Binary files /dev/null and b/gfx/hud/default/num_4_stroke.tga differ diff --git a/gfx/hud/default/num_5.tga b/gfx/hud/default/num_5.tga new file mode 100644 index 0000000000..8bb7043d43 Binary files /dev/null and b/gfx/hud/default/num_5.tga differ diff --git a/gfx/hud/default/num_5_stroke.tga b/gfx/hud/default/num_5_stroke.tga new file mode 100644 index 0000000000..3a6978a8c7 Binary files /dev/null and b/gfx/hud/default/num_5_stroke.tga differ diff --git a/gfx/hud/default/num_6.tga b/gfx/hud/default/num_6.tga new file mode 100644 index 0000000000..1db8c0e0b9 Binary files /dev/null and b/gfx/hud/default/num_6.tga differ diff --git a/gfx/hud/default/num_6_stroke.tga b/gfx/hud/default/num_6_stroke.tga new file mode 100644 index 0000000000..f64e178bf0 Binary files /dev/null and b/gfx/hud/default/num_6_stroke.tga differ diff --git a/gfx/hud/default/num_7.tga b/gfx/hud/default/num_7.tga new file mode 100644 index 0000000000..0099d684d5 Binary files /dev/null and b/gfx/hud/default/num_7.tga differ diff --git a/gfx/hud/default/num_7_stroke.tga b/gfx/hud/default/num_7_stroke.tga new file mode 100644 index 0000000000..252e796d8b Binary files /dev/null and b/gfx/hud/default/num_7_stroke.tga differ diff --git a/gfx/hud/default/num_8.tga b/gfx/hud/default/num_8.tga new file mode 100644 index 0000000000..aa20157a78 Binary files /dev/null and b/gfx/hud/default/num_8.tga differ diff --git a/gfx/hud/default/num_8_stroke.tga b/gfx/hud/default/num_8_stroke.tga new file mode 100644 index 0000000000..e2cd39decd Binary files /dev/null and b/gfx/hud/default/num_8_stroke.tga differ diff --git a/gfx/hud/default/num_9.tga b/gfx/hud/default/num_9.tga new file mode 100644 index 0000000000..87b9c21c11 Binary files /dev/null and b/gfx/hud/default/num_9.tga differ diff --git a/gfx/hud/default/num_9_stroke.tga b/gfx/hud/default/num_9_stroke.tga new file mode 100644 index 0000000000..5a8d6103c3 Binary files /dev/null and b/gfx/hud/default/num_9_stroke.tga differ diff --git a/gfx/hud/default/num_colon.tga b/gfx/hud/default/num_colon.tga new file mode 100644 index 0000000000..e22c09a696 Binary files /dev/null and b/gfx/hud/default/num_colon.tga differ diff --git a/gfx/hud/default/num_colon_stroke.tga b/gfx/hud/default/num_colon_stroke.tga new file mode 100644 index 0000000000..68ad28ad58 Binary files /dev/null and b/gfx/hud/default/num_colon_stroke.tga differ diff --git a/gfx/hud/default/num_dot.tga b/gfx/hud/default/num_dot.tga new file mode 100644 index 0000000000..7fbfdd0418 Binary files /dev/null and b/gfx/hud/default/num_dot.tga differ diff --git a/gfx/hud/default/num_dot_stroke.tga b/gfx/hud/default/num_dot_stroke.tga new file mode 100644 index 0000000000..29ad696ac5 Binary files /dev/null and b/gfx/hud/default/num_dot_stroke.tga differ diff --git a/gfx/hud/default/num_leading.tga b/gfx/hud/default/num_leading.tga new file mode 100644 index 0000000000..f2f59d3b02 Binary files /dev/null and b/gfx/hud/default/num_leading.tga differ diff --git a/gfx/hud/default/num_minus.tga b/gfx/hud/default/num_minus.tga new file mode 100644 index 0000000000..10721f2d8f Binary files /dev/null and b/gfx/hud/default/num_minus.tga differ diff --git a/gfx/hud/default/num_minus_stroke.tga b/gfx/hud/default/num_minus_stroke.tga new file mode 100644 index 0000000000..26455a0ad4 Binary files /dev/null and b/gfx/hud/default/num_minus_stroke.tga differ diff --git a/gfx/hud/default/num_plus.tga b/gfx/hud/default/num_plus.tga new file mode 100644 index 0000000000..3cb17b3e40 Binary files /dev/null and b/gfx/hud/default/num_plus.tga differ diff --git a/gfx/hud/default/num_plus_stroke.tga b/gfx/hud/default/num_plus_stroke.tga new file mode 100644 index 0000000000..7df2faaeba Binary files /dev/null and b/gfx/hud/default/num_plus_stroke.tga differ diff --git a/gfx/hud/default/race_newfail.tga b/gfx/hud/default/race_newfail.tga new file mode 100644 index 0000000000..cd1164bdf7 Binary files /dev/null and b/gfx/hud/default/race_newfail.tga differ diff --git a/gfx/hud/default/race_newrankgreen.tga b/gfx/hud/default/race_newrankgreen.tga new file mode 100644 index 0000000000..c8fa1577cb Binary files /dev/null and b/gfx/hud/default/race_newrankgreen.tga differ diff --git a/gfx/hud/default/race_newrankyellow.tga b/gfx/hud/default/race_newrankyellow.tga new file mode 100644 index 0000000000..0af3c593f5 Binary files /dev/null and b/gfx/hud/default/race_newrankyellow.tga differ diff --git a/gfx/hud/default/race_newrecordserver.tga b/gfx/hud/default/race_newrecordserver.tga new file mode 100644 index 0000000000..aa8bae1a81 Binary files /dev/null and b/gfx/hud/default/race_newrecordserver.tga differ diff --git a/gfx/hud/default/race_newtime.tga b/gfx/hud/default/race_newtime.tga new file mode 100644 index 0000000000..c9647b927b Binary files /dev/null and b/gfx/hud/default/race_newtime.tga differ diff --git a/gfx/hud/default/rifle_ring_1.tga b/gfx/hud/default/rifle_ring_1.tga new file mode 100644 index 0000000000..a90927cac2 Binary files /dev/null and b/gfx/hud/default/rifle_ring_1.tga differ diff --git a/gfx/hud/default/rifle_ring_2.tga b/gfx/hud/default/rifle_ring_2.tga new file mode 100644 index 0000000000..6f6ca4c9cf Binary files /dev/null and b/gfx/hud/default/rifle_ring_2.tga differ diff --git a/gfx/hud/default/rifle_ring_3.tga b/gfx/hud/default/rifle_ring_3.tga new file mode 100644 index 0000000000..68f6df7ffb Binary files /dev/null and b/gfx/hud/default/rifle_ring_3.tga differ diff --git a/gfx/hud/default/rifle_ring_4.tga b/gfx/hud/default/rifle_ring_4.tga new file mode 100644 index 0000000000..0a5db15dca Binary files /dev/null and b/gfx/hud/default/rifle_ring_4.tga differ diff --git a/gfx/hud/default/rifle_ring_5.tga b/gfx/hud/default/rifle_ring_5.tga new file mode 100644 index 0000000000..d5cc95b930 Binary files /dev/null and b/gfx/hud/default/rifle_ring_5.tga differ diff --git a/gfx/hud/default/rifle_ring_6.tga b/gfx/hud/default/rifle_ring_6.tga new file mode 100644 index 0000000000..4a126e7fec Binary files /dev/null and b/gfx/hud/default/rifle_ring_6.tga differ diff --git a/gfx/hud/default/rifle_ring_7.tga b/gfx/hud/default/rifle_ring_7.tga new file mode 100644 index 0000000000..846212b061 Binary files /dev/null and b/gfx/hud/default/rifle_ring_7.tga differ diff --git a/gfx/hud/default/rifle_ring_8.tga b/gfx/hud/default/rifle_ring_8.tga new file mode 100644 index 0000000000..137e24d1da Binary files /dev/null and b/gfx/hud/default/rifle_ring_8.tga differ diff --git a/gfx/hud/default/shield.tga b/gfx/hud/default/shield.tga new file mode 100644 index 0000000000..f13f0b4d84 Binary files /dev/null and b/gfx/hud/default/shield.tga differ diff --git a/gfx/hud/default/statusbar.tga b/gfx/hud/default/statusbar.tga new file mode 100644 index 0000000000..987c8f544e Binary files /dev/null and b/gfx/hud/default/statusbar.tga differ diff --git a/gfx/hud/default/statusbar_vertical.tga b/gfx/hud/default/statusbar_vertical.tga new file mode 100644 index 0000000000..e271438e35 Binary files /dev/null and b/gfx/hud/default/statusbar_vertical.tga differ diff --git a/gfx/hud/default/strength.tga b/gfx/hud/default/strength.tga new file mode 100644 index 0000000000..b19019d5d7 Binary files /dev/null and b/gfx/hud/default/strength.tga differ diff --git a/gfx/hud/default/voteprogress_back.tga b/gfx/hud/default/voteprogress_back.tga new file mode 100644 index 0000000000..2348be8251 Binary files /dev/null and b/gfx/hud/default/voteprogress_back.tga differ diff --git a/gfx/hud/default/voteprogress_prog.tga b/gfx/hud/default/voteprogress_prog.tga new file mode 100644 index 0000000000..574d5d70a6 Binary files /dev/null and b/gfx/hud/default/voteprogress_prog.tga differ diff --git a/gfx/hud/default/voteprogress_voted.tga b/gfx/hud/default/voteprogress_voted.tga new file mode 100644 index 0000000000..ffc90a255c Binary files /dev/null and b/gfx/hud/default/voteprogress_voted.tga differ diff --git a/gfx/hud/default/weapon_accuracy.tga b/gfx/hud/default/weapon_accuracy.tga new file mode 100644 index 0000000000..4a451b1bcf Binary files /dev/null and b/gfx/hud/default/weapon_accuracy.tga differ diff --git a/gfx/hud/default/weapon_ammo.tga b/gfx/hud/default/weapon_ammo.tga new file mode 100644 index 0000000000..cb1d306362 Binary files /dev/null and b/gfx/hud/default/weapon_ammo.tga differ diff --git a/gfx/hud/default/weapon_complainbubble.tga b/gfx/hud/default/weapon_complainbubble.tga new file mode 100644 index 0000000000..a3c53a39d1 Binary files /dev/null and b/gfx/hud/default/weapon_complainbubble.tga differ diff --git a/gfx/hud/default/weapon_current_bg.tga b/gfx/hud/default/weapon_current_bg.tga new file mode 100644 index 0000000000..5a8f936715 Binary files /dev/null and b/gfx/hud/default/weapon_current_bg.tga differ diff --git a/gfx/hud/default/weapon_hlacmod_renameit.tga b/gfx/hud/default/weapon_hlacmod_renameit.tga new file mode 100644 index 0000000000..f11c173ba8 Binary files /dev/null and b/gfx/hud/default/weapon_hlacmod_renameit.tga differ diff --git a/gfx/hud/default/weaponcampingrifle.tga b/gfx/hud/default/weaponcampingrifle.tga new file mode 100644 index 0000000000..fb6413b14f Binary files /dev/null and b/gfx/hud/default/weaponcampingrifle.tga differ diff --git a/gfx/hud/default/weaponcrylink.tga b/gfx/hud/default/weaponcrylink.tga new file mode 100644 index 0000000000..e48ad4d246 Binary files /dev/null and b/gfx/hud/default/weaponcrylink.tga differ diff --git a/gfx/hud/default/weaponelectro.tga b/gfx/hud/default/weaponelectro.tga new file mode 100644 index 0000000000..73c791b393 Binary files /dev/null and b/gfx/hud/default/weaponelectro.tga differ diff --git a/gfx/hud/default/weaponfireball.tga b/gfx/hud/default/weaponfireball.tga new file mode 100644 index 0000000000..d7ea1fb049 Binary files /dev/null and b/gfx/hud/default/weaponfireball.tga differ diff --git a/gfx/hud/default/weapongrenadelauncher.tga b/gfx/hud/default/weapongrenadelauncher.tga new file mode 100644 index 0000000000..c09081b004 Binary files /dev/null and b/gfx/hud/default/weapongrenadelauncher.tga differ diff --git a/gfx/hud/default/weaponhagar.tga b/gfx/hud/default/weaponhagar.tga new file mode 100644 index 0000000000..69a7b729cf Binary files /dev/null and b/gfx/hud/default/weaponhagar.tga differ diff --git a/gfx/hud/default/weaponhlac.tga b/gfx/hud/default/weaponhlac.tga new file mode 100644 index 0000000000..2ba3853455 Binary files /dev/null and b/gfx/hud/default/weaponhlac.tga differ diff --git a/gfx/hud/default/weaponhook.tga b/gfx/hud/default/weaponhook.tga new file mode 100644 index 0000000000..0c7fd40b6b Binary files /dev/null and b/gfx/hud/default/weaponhook.tga differ diff --git a/gfx/hud/default/weaponlaser.tga b/gfx/hud/default/weaponlaser.tga new file mode 100644 index 0000000000..1f016e16d9 Binary files /dev/null and b/gfx/hud/default/weaponlaser.tga differ diff --git a/gfx/hud/default/weaponminstanex.tga b/gfx/hud/default/weaponminstanex.tga new file mode 100644 index 0000000000..26877c2672 Binary files /dev/null and b/gfx/hud/default/weaponminstanex.tga differ diff --git a/gfx/hud/default/weaponnex.tga b/gfx/hud/default/weaponnex.tga new file mode 100644 index 0000000000..4ed91bc391 Binary files /dev/null and b/gfx/hud/default/weaponnex.tga differ diff --git a/gfx/hud/default/weaponporto.tga b/gfx/hud/default/weaponporto.tga new file mode 100644 index 0000000000..46dd107d61 Binary files /dev/null and b/gfx/hud/default/weaponporto.tga differ diff --git a/gfx/hud/default/weaponrocketlauncher.tga b/gfx/hud/default/weaponrocketlauncher.tga new file mode 100644 index 0000000000..f5449b32c7 Binary files /dev/null and b/gfx/hud/default/weaponrocketlauncher.tga differ diff --git a/gfx/hud/default/weaponseeker.tga b/gfx/hud/default/weaponseeker.tga new file mode 100644 index 0000000000..566ee86edd Binary files /dev/null and b/gfx/hud/default/weaponseeker.tga differ diff --git a/gfx/hud/default/weaponshotgun.tga b/gfx/hud/default/weaponshotgun.tga new file mode 100644 index 0000000000..055841c052 Binary files /dev/null and b/gfx/hud/default/weaponshotgun.tga differ diff --git a/gfx/hud/default/weapontuba.tga b/gfx/hud/default/weapontuba.tga new file mode 100644 index 0000000000..8b8001594b Binary files /dev/null and b/gfx/hud/default/weapontuba.tga differ diff --git a/gfx/hud/default/weaponuzi.tga b/gfx/hud/default/weaponuzi.tga new file mode 100644 index 0000000000..c0e75d1133 Binary files /dev/null and b/gfx/hud/default/weaponuzi.tga differ diff --git a/gfx/hud/luminos/ammo_bullets.tga b/gfx/hud/luminos/ammo_bullets.tga new file mode 100644 index 0000000000..8f3739d482 Binary files /dev/null and b/gfx/hud/luminos/ammo_bullets.tga differ diff --git a/gfx/hud/luminos/ammo_cells.tga b/gfx/hud/luminos/ammo_cells.tga new file mode 100644 index 0000000000..4850763419 Binary files /dev/null and b/gfx/hud/luminos/ammo_cells.tga differ diff --git a/gfx/hud/luminos/ammo_current_bg.tga b/gfx/hud/luminos/ammo_current_bg.tga new file mode 100644 index 0000000000..703627956c Binary files /dev/null and b/gfx/hud/luminos/ammo_current_bg.tga differ diff --git a/gfx/hud/luminos/ammo_fuel.tga b/gfx/hud/luminos/ammo_fuel.tga new file mode 100644 index 0000000000..4a3a2d5563 Binary files /dev/null and b/gfx/hud/luminos/ammo_fuel.tga differ diff --git a/gfx/hud/luminos/ammo_rockets.tga b/gfx/hud/luminos/ammo_rockets.tga new file mode 100644 index 0000000000..9b34ea7938 Binary files /dev/null and b/gfx/hud/luminos/ammo_rockets.tga differ diff --git a/gfx/hud/luminos/ammo_shells.tga b/gfx/hud/luminos/ammo_shells.tga new file mode 100644 index 0000000000..f62c715625 Binary files /dev/null and b/gfx/hud/luminos/ammo_shells.tga differ diff --git a/gfx/hud/luminos/armor.tga b/gfx/hud/luminos/armor.tga new file mode 100644 index 0000000000..f9e47011aa Binary files /dev/null and b/gfx/hud/luminos/armor.tga differ diff --git a/gfx/hud/luminos/border_highlighted.tga b/gfx/hud/luminos/border_highlighted.tga new file mode 100644 index 0000000000..542f82a74c Binary files /dev/null and b/gfx/hud/luminos/border_highlighted.tga differ diff --git a/gfx/hud/luminos/border_highlighted2.tga b/gfx/hud/luminos/border_highlighted2.tga new file mode 100644 index 0000000000..7e460e5cbb Binary files /dev/null and b/gfx/hud/luminos/border_highlighted2.tga differ diff --git a/gfx/hud/luminos/border_horizontal.tga b/gfx/hud/luminos/border_horizontal.tga new file mode 100644 index 0000000000..b628060b9f Binary files /dev/null and b/gfx/hud/luminos/border_horizontal.tga differ diff --git a/gfx/hud/luminos/border_vertical.tga b/gfx/hud/luminos/border_vertical.tga new file mode 100644 index 0000000000..3b76811ee6 Binary files /dev/null and b/gfx/hud/luminos/border_vertical.tga differ diff --git a/gfx/hud/luminos/dock.tga b/gfx/hud/luminos/dock.tga new file mode 100644 index 0000000000..3163382bc5 Binary files /dev/null and b/gfx/hud/luminos/dock.tga differ diff --git a/gfx/hud/luminos/flag_blue_carrying.tga b/gfx/hud/luminos/flag_blue_carrying.tga new file mode 100644 index 0000000000..1ddcbfab74 Binary files /dev/null and b/gfx/hud/luminos/flag_blue_carrying.tga differ diff --git a/gfx/hud/luminos/flag_blue_lost.tga b/gfx/hud/luminos/flag_blue_lost.tga new file mode 100644 index 0000000000..b37ccd0515 Binary files /dev/null and b/gfx/hud/luminos/flag_blue_lost.tga differ diff --git a/gfx/hud/luminos/flag_blue_shielded.tga b/gfx/hud/luminos/flag_blue_shielded.tga new file mode 100644 index 0000000000..c1e89c57a9 Binary files /dev/null and b/gfx/hud/luminos/flag_blue_shielded.tga differ diff --git a/gfx/hud/luminos/flag_blue_taken.tga b/gfx/hud/luminos/flag_blue_taken.tga new file mode 100644 index 0000000000..70079cafe3 Binary files /dev/null and b/gfx/hud/luminos/flag_blue_taken.tga differ diff --git a/gfx/hud/luminos/flag_red_carrying.tga b/gfx/hud/luminos/flag_red_carrying.tga new file mode 100644 index 0000000000..8fda6e1140 Binary files /dev/null and b/gfx/hud/luminos/flag_red_carrying.tga differ diff --git a/gfx/hud/luminos/flag_red_lost.tga b/gfx/hud/luminos/flag_red_lost.tga new file mode 100644 index 0000000000..083ac4668f Binary files /dev/null and b/gfx/hud/luminos/flag_red_lost.tga differ diff --git a/gfx/hud/luminos/flag_red_shielded.tga b/gfx/hud/luminos/flag_red_shielded.tga new file mode 100644 index 0000000000..550d0b7c6c Binary files /dev/null and b/gfx/hud/luminos/flag_red_shielded.tga differ diff --git a/gfx/hud/luminos/flag_red_taken.tga b/gfx/hud/luminos/flag_red_taken.tga new file mode 100644 index 0000000000..a21a5ee62b Binary files /dev/null and b/gfx/hud/luminos/flag_red_taken.tga differ diff --git a/gfx/hud/luminos/health.tga b/gfx/hud/luminos/health.tga new file mode 100644 index 0000000000..26e40865c9 Binary files /dev/null and b/gfx/hud/luminos/health.tga differ diff --git a/gfx/hud/luminos/key_backward.tga b/gfx/hud/luminos/key_backward.tga new file mode 100644 index 0000000000..2a2cbabe2c Binary files /dev/null and b/gfx/hud/luminos/key_backward.tga differ diff --git a/gfx/hud/luminos/key_backward_inv.tga b/gfx/hud/luminos/key_backward_inv.tga new file mode 100644 index 0000000000..1b6b97300f Binary files /dev/null and b/gfx/hud/luminos/key_backward_inv.tga differ diff --git a/gfx/hud/luminos/key_crouch.tga b/gfx/hud/luminos/key_crouch.tga new file mode 100644 index 0000000000..7016441010 Binary files /dev/null and b/gfx/hud/luminos/key_crouch.tga differ diff --git a/gfx/hud/luminos/key_crouch_inv.tga b/gfx/hud/luminos/key_crouch_inv.tga new file mode 100644 index 0000000000..0f47c09884 Binary files /dev/null and b/gfx/hud/luminos/key_crouch_inv.tga differ diff --git a/gfx/hud/luminos/key_forward.tga b/gfx/hud/luminos/key_forward.tga new file mode 100644 index 0000000000..0354b18a1d Binary files /dev/null and b/gfx/hud/luminos/key_forward.tga differ diff --git a/gfx/hud/luminos/key_forward_inv.tga b/gfx/hud/luminos/key_forward_inv.tga new file mode 100644 index 0000000000..47c6154bee Binary files /dev/null and b/gfx/hud/luminos/key_forward_inv.tga differ diff --git a/gfx/hud/luminos/key_jump.tga b/gfx/hud/luminos/key_jump.tga new file mode 100644 index 0000000000..70a92fabfb Binary files /dev/null and b/gfx/hud/luminos/key_jump.tga differ diff --git a/gfx/hud/luminos/key_jump_inv.tga b/gfx/hud/luminos/key_jump_inv.tga new file mode 100644 index 0000000000..a62bcf247b Binary files /dev/null and b/gfx/hud/luminos/key_jump_inv.tga differ diff --git a/gfx/hud/luminos/key_left.tga b/gfx/hud/luminos/key_left.tga new file mode 100644 index 0000000000..4bcf85f097 Binary files /dev/null and b/gfx/hud/luminos/key_left.tga differ diff --git a/gfx/hud/luminos/key_left_inv.tga b/gfx/hud/luminos/key_left_inv.tga new file mode 100644 index 0000000000..b6d6a2d3c0 Binary files /dev/null and b/gfx/hud/luminos/key_left_inv.tga differ diff --git a/gfx/hud/luminos/key_right.tga b/gfx/hud/luminos/key_right.tga new file mode 100644 index 0000000000..4d4ee213dd Binary files /dev/null and b/gfx/hud/luminos/key_right.tga differ diff --git a/gfx/hud/luminos/key_right_inv.tga b/gfx/hud/luminos/key_right_inv.tga new file mode 100644 index 0000000000..f6fe631fc2 Binary files /dev/null and b/gfx/hud/luminos/key_right_inv.tga differ diff --git a/gfx/hud/luminos/notify_blue_captured.tga b/gfx/hud/luminos/notify_blue_captured.tga new file mode 100644 index 0000000000..04e923074c Binary files /dev/null and b/gfx/hud/luminos/notify_blue_captured.tga differ diff --git a/gfx/hud/luminos/notify_blue_carrying.tga b/gfx/hud/luminos/notify_blue_carrying.tga new file mode 100644 index 0000000000..109ba09106 Binary files /dev/null and b/gfx/hud/luminos/notify_blue_carrying.tga differ diff --git a/gfx/hud/luminos/notify_blue_lost.tga b/gfx/hud/luminos/notify_blue_lost.tga new file mode 100644 index 0000000000..435928d644 Binary files /dev/null and b/gfx/hud/luminos/notify_blue_lost.tga differ diff --git a/gfx/hud/luminos/notify_blue_returned.tga b/gfx/hud/luminos/notify_blue_returned.tga new file mode 100644 index 0000000000..c75de3b213 Binary files /dev/null and b/gfx/hud/luminos/notify_blue_returned.tga differ diff --git a/gfx/hud/luminos/notify_blue_shielded.tga b/gfx/hud/luminos/notify_blue_shielded.tga new file mode 100644 index 0000000000..977fe9ae22 Binary files /dev/null and b/gfx/hud/luminos/notify_blue_shielded.tga differ diff --git a/gfx/hud/luminos/notify_blue_taken.tga b/gfx/hud/luminos/notify_blue_taken.tga new file mode 100644 index 0000000000..43f73aa44d Binary files /dev/null and b/gfx/hud/luminos/notify_blue_taken.tga differ diff --git a/gfx/hud/luminos/notify_camping.tga b/gfx/hud/luminos/notify_camping.tga new file mode 100644 index 0000000000..a11e324a6d Binary files /dev/null and b/gfx/hud/luminos/notify_camping.tga differ diff --git a/gfx/hud/luminos/notify_death.tga b/gfx/hud/luminos/notify_death.tga new file mode 100644 index 0000000000..3a32ae3f2b Binary files /dev/null and b/gfx/hud/luminos/notify_death.tga differ diff --git a/gfx/hud/luminos/notify_fall.tga b/gfx/hud/luminos/notify_fall.tga new file mode 100644 index 0000000000..98a7f49745 Binary files /dev/null and b/gfx/hud/luminos/notify_fall.tga differ diff --git a/gfx/hud/luminos/notify_lava.tga b/gfx/hud/luminos/notify_lava.tga new file mode 100644 index 0000000000..1c777580f5 Binary files /dev/null and b/gfx/hud/luminos/notify_lava.tga differ diff --git a/gfx/hud/luminos/notify_outofammo.tga b/gfx/hud/luminos/notify_outofammo.tga new file mode 100644 index 0000000000..ecacf50a9b Binary files /dev/null and b/gfx/hud/luminos/notify_outofammo.tga differ diff --git a/gfx/hud/luminos/notify_red_captured.tga b/gfx/hud/luminos/notify_red_captured.tga new file mode 100644 index 0000000000..052be1339b Binary files /dev/null and b/gfx/hud/luminos/notify_red_captured.tga differ diff --git a/gfx/hud/luminos/notify_red_carrying.tga b/gfx/hud/luminos/notify_red_carrying.tga new file mode 100644 index 0000000000..0e17a56a64 Binary files /dev/null and b/gfx/hud/luminos/notify_red_carrying.tga differ diff --git a/gfx/hud/luminos/notify_red_lost.tga b/gfx/hud/luminos/notify_red_lost.tga new file mode 100644 index 0000000000..ffc7dc09cf Binary files /dev/null and b/gfx/hud/luminos/notify_red_lost.tga differ diff --git a/gfx/hud/luminos/notify_red_returned.tga b/gfx/hud/luminos/notify_red_returned.tga new file mode 100644 index 0000000000..c5c23de601 Binary files /dev/null and b/gfx/hud/luminos/notify_red_returned.tga differ diff --git a/gfx/hud/luminos/notify_red_shielded.tga b/gfx/hud/luminos/notify_red_shielded.tga new file mode 100644 index 0000000000..d3cef48570 Binary files /dev/null and b/gfx/hud/luminos/notify_red_shielded.tga differ diff --git a/gfx/hud/luminos/notify_red_taken.tga b/gfx/hud/luminos/notify_red_taken.tga new file mode 100644 index 0000000000..9fa31f145c Binary files /dev/null and b/gfx/hud/luminos/notify_red_taken.tga differ diff --git a/gfx/hud/luminos/notify_selfkill.tga b/gfx/hud/luminos/notify_selfkill.tga new file mode 100644 index 0000000000..98e62cfee7 Binary files /dev/null and b/gfx/hud/luminos/notify_selfkill.tga differ diff --git a/gfx/hud/luminos/notify_shootingstar.tga b/gfx/hud/luminos/notify_shootingstar.tga new file mode 100644 index 0000000000..c8077a2ffc Binary files /dev/null and b/gfx/hud/luminos/notify_shootingstar.tga differ diff --git a/gfx/hud/luminos/notify_slime.tga b/gfx/hud/luminos/notify_slime.tga new file mode 100644 index 0000000000..11ae58baec Binary files /dev/null and b/gfx/hud/luminos/notify_slime.tga differ diff --git a/gfx/hud/luminos/notify_teamkill.tga b/gfx/hud/luminos/notify_teamkill.tga new file mode 100644 index 0000000000..a2dc308c4f Binary files /dev/null and b/gfx/hud/luminos/notify_teamkill.tga differ diff --git a/gfx/hud/luminos/notify_teamkill_blue.tga b/gfx/hud/luminos/notify_teamkill_blue.tga new file mode 100644 index 0000000000..885b929d00 Binary files /dev/null and b/gfx/hud/luminos/notify_teamkill_blue.tga differ diff --git a/gfx/hud/luminos/notify_teamkill_red.tga b/gfx/hud/luminos/notify_teamkill_red.tga new file mode 100644 index 0000000000..96f007a0df Binary files /dev/null and b/gfx/hud/luminos/notify_teamkill_red.tga differ diff --git a/gfx/hud/luminos/notify_void.tga b/gfx/hud/luminos/notify_void.tga new file mode 100644 index 0000000000..2a613b6ec9 Binary files /dev/null and b/gfx/hud/luminos/notify_void.tga differ diff --git a/gfx/hud/luminos/notify_water.tga b/gfx/hud/luminos/notify_water.tga new file mode 100644 index 0000000000..f04b3e5d0c Binary files /dev/null and b/gfx/hud/luminos/notify_water.tga differ diff --git a/gfx/hud/luminos/num_leading.tga b/gfx/hud/luminos/num_leading.tga new file mode 100644 index 0000000000..668fbc6539 Binary files /dev/null and b/gfx/hud/luminos/num_leading.tga differ diff --git a/gfx/hud/luminos/race_newfail.tga b/gfx/hud/luminos/race_newfail.tga new file mode 100644 index 0000000000..360d68a7e4 Binary files /dev/null and b/gfx/hud/luminos/race_newfail.tga differ diff --git a/gfx/hud/luminos/race_newrankgreen.tga b/gfx/hud/luminos/race_newrankgreen.tga new file mode 100644 index 0000000000..ec3e2254ca Binary files /dev/null and b/gfx/hud/luminos/race_newrankgreen.tga differ diff --git a/gfx/hud/luminos/race_newrankyellow.tga b/gfx/hud/luminos/race_newrankyellow.tga new file mode 100644 index 0000000000..ec3e2254ca Binary files /dev/null and b/gfx/hud/luminos/race_newrankyellow.tga differ diff --git a/gfx/hud/luminos/race_newrecordserver.tga b/gfx/hud/luminos/race_newrecordserver.tga new file mode 100644 index 0000000000..99ed22b30f Binary files /dev/null and b/gfx/hud/luminos/race_newrecordserver.tga differ diff --git a/gfx/hud/luminos/race_newtime.tga b/gfx/hud/luminos/race_newtime.tga new file mode 100644 index 0000000000..ab2f905482 Binary files /dev/null and b/gfx/hud/luminos/race_newtime.tga differ diff --git a/gfx/hud/luminos/statusbar.tga b/gfx/hud/luminos/statusbar.tga new file mode 100644 index 0000000000..987c8f544e Binary files /dev/null and b/gfx/hud/luminos/statusbar.tga differ diff --git a/gfx/hud/luminos/statusbar_vertical.tga b/gfx/hud/luminos/statusbar_vertical.tga new file mode 100644 index 0000000000..3c2d1a8e09 Binary files /dev/null and b/gfx/hud/luminos/statusbar_vertical.tga differ diff --git a/gfx/hud/luminos/voteprogress_back.tga b/gfx/hud/luminos/voteprogress_back.tga new file mode 100644 index 0000000000..0ba103ed26 Binary files /dev/null and b/gfx/hud/luminos/voteprogress_back.tga differ diff --git a/gfx/hud/luminos/voteprogress_prog.tga b/gfx/hud/luminos/voteprogress_prog.tga new file mode 100644 index 0000000000..f24f524158 Binary files /dev/null and b/gfx/hud/luminos/voteprogress_prog.tga differ diff --git a/gfx/hud/luminos/voteprogress_voted.tga b/gfx/hud/luminos/voteprogress_voted.tga new file mode 100644 index 0000000000..ee06048fcd Binary files /dev/null and b/gfx/hud/luminos/voteprogress_voted.tga differ diff --git a/gfx/hud/luminos/weapon_accuracy.tga b/gfx/hud/luminos/weapon_accuracy.tga new file mode 100644 index 0000000000..8dcf3aab73 Binary files /dev/null and b/gfx/hud/luminos/weapon_accuracy.tga differ diff --git a/gfx/hud/luminos/weapon_ammo.tga b/gfx/hud/luminos/weapon_ammo.tga new file mode 100644 index 0000000000..de4148cebc Binary files /dev/null and b/gfx/hud/luminos/weapon_ammo.tga differ diff --git a/gfx/hud/luminos/weapon_current_bg.tga b/gfx/hud/luminos/weapon_current_bg.tga new file mode 100644 index 0000000000..688d8054dc Binary files /dev/null and b/gfx/hud/luminos/weapon_current_bg.tga differ diff --git a/gfx/hud/luminos/weapon_hlacmod_renameit.tga b/gfx/hud/luminos/weapon_hlacmod_renameit.tga new file mode 100644 index 0000000000..601f3d7aa1 Binary files /dev/null and b/gfx/hud/luminos/weapon_hlacmod_renameit.tga differ diff --git a/gfx/hud/luminos/weaponcampingrifle.tga b/gfx/hud/luminos/weaponcampingrifle.tga new file mode 100644 index 0000000000..f5c2e55927 Binary files /dev/null and b/gfx/hud/luminos/weaponcampingrifle.tga differ diff --git a/gfx/hud/luminos/weaponcrylink.tga b/gfx/hud/luminos/weaponcrylink.tga new file mode 100644 index 0000000000..e7e283f3cc Binary files /dev/null and b/gfx/hud/luminos/weaponcrylink.tga differ diff --git a/gfx/hud/luminos/weaponelectro.tga b/gfx/hud/luminos/weaponelectro.tga new file mode 100644 index 0000000000..75cdf02490 Binary files /dev/null and b/gfx/hud/luminos/weaponelectro.tga differ diff --git a/gfx/hud/luminos/weaponfireball.tga b/gfx/hud/luminos/weaponfireball.tga new file mode 100644 index 0000000000..05fc4feed8 Binary files /dev/null and b/gfx/hud/luminos/weaponfireball.tga differ diff --git a/gfx/hud/luminos/weapongrenadelauncher.tga b/gfx/hud/luminos/weapongrenadelauncher.tga new file mode 100644 index 0000000000..24135f3cc2 Binary files /dev/null and b/gfx/hud/luminos/weapongrenadelauncher.tga differ diff --git a/gfx/hud/luminos/weaponhagar.tga b/gfx/hud/luminos/weaponhagar.tga new file mode 100644 index 0000000000..5c04c8f92e Binary files /dev/null and b/gfx/hud/luminos/weaponhagar.tga differ diff --git a/gfx/hud/luminos/weaponhlac.tga b/gfx/hud/luminos/weaponhlac.tga new file mode 100644 index 0000000000..5375ab477d Binary files /dev/null and b/gfx/hud/luminos/weaponhlac.tga differ diff --git a/gfx/hud/luminos/weaponhook.tga b/gfx/hud/luminos/weaponhook.tga new file mode 100644 index 0000000000..eaee8388f9 Binary files /dev/null and b/gfx/hud/luminos/weaponhook.tga differ diff --git a/gfx/hud/luminos/weaponlaser.tga b/gfx/hud/luminos/weaponlaser.tga new file mode 100644 index 0000000000..0afbb37d48 Binary files /dev/null and b/gfx/hud/luminos/weaponlaser.tga differ diff --git a/gfx/hud/luminos/weaponminstanex.tga b/gfx/hud/luminos/weaponminstanex.tga new file mode 100644 index 0000000000..3618778729 Binary files /dev/null and b/gfx/hud/luminos/weaponminstanex.tga differ diff --git a/gfx/hud/luminos/weaponnex.tga b/gfx/hud/luminos/weaponnex.tga new file mode 100644 index 0000000000..b4e29495af Binary files /dev/null and b/gfx/hud/luminos/weaponnex.tga differ diff --git a/gfx/hud/luminos/weaponporto.tga b/gfx/hud/luminos/weaponporto.tga new file mode 100644 index 0000000000..3fbccf9dee Binary files /dev/null and b/gfx/hud/luminos/weaponporto.tga differ diff --git a/gfx/hud/luminos/weaponrocketlauncher.tga b/gfx/hud/luminos/weaponrocketlauncher.tga new file mode 100644 index 0000000000..0fea76673c Binary files /dev/null and b/gfx/hud/luminos/weaponrocketlauncher.tga differ diff --git a/gfx/hud/luminos/weaponseeker.tga b/gfx/hud/luminos/weaponseeker.tga new file mode 100644 index 0000000000..5630d524b3 Binary files /dev/null and b/gfx/hud/luminos/weaponseeker.tga differ diff --git a/gfx/hud/luminos/weaponshotgun.tga b/gfx/hud/luminos/weaponshotgun.tga new file mode 100644 index 0000000000..438b1217dc Binary files /dev/null and b/gfx/hud/luminos/weaponshotgun.tga differ diff --git a/gfx/hud/luminos/weapontuba.tga b/gfx/hud/luminos/weapontuba.tga new file mode 100644 index 0000000000..1617b7fac6 Binary files /dev/null and b/gfx/hud/luminos/weapontuba.tga differ diff --git a/gfx/hud/luminos/weaponuzi.tga b/gfx/hud/luminos/weaponuzi.tga new file mode 100644 index 0000000000..4c037325d9 Binary files /dev/null and b/gfx/hud/luminos/weaponuzi.tga differ diff --git a/gfx/hud/old/num_leading.tga b/gfx/hud/old/num_leading.tga new file mode 100644 index 0000000000..0e5233ca36 Binary files /dev/null and b/gfx/hud/old/num_leading.tga differ diff --git a/gfx/hud/old/num_leading_1.tga b/gfx/hud/old/num_leading_1.tga deleted file mode 100644 index 0e5233ca36..0000000000 Binary files a/gfx/hud/old/num_leading_1.tga and /dev/null differ diff --git a/gfx/hud/old/num_leading_2.tga b/gfx/hud/old/num_leading_2.tga deleted file mode 100644 index 0629e499e4..0000000000 Binary files a/gfx/hud/old/num_leading_2.tga and /dev/null differ diff --git a/gfx/hud/old/num_leading_3.tga b/gfx/hud/old/num_leading_3.tga deleted file mode 100644 index a6fb924a6e..0000000000 Binary files a/gfx/hud/old/num_leading_3.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/ammo_bullets.tga b/gfx/hud/wickedhud/ammo_bullets.tga deleted file mode 100644 index e7cd01a252..0000000000 Binary files a/gfx/hud/wickedhud/ammo_bullets.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/ammo_cells.tga b/gfx/hud/wickedhud/ammo_cells.tga deleted file mode 100644 index 664eb232d2..0000000000 Binary files a/gfx/hud/wickedhud/ammo_cells.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/ammo_current_bg.tga b/gfx/hud/wickedhud/ammo_current_bg.tga deleted file mode 100644 index bd07205991..0000000000 Binary files a/gfx/hud/wickedhud/ammo_current_bg.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/ammo_fuel.tga b/gfx/hud/wickedhud/ammo_fuel.tga deleted file mode 100644 index 8450a2fec4..0000000000 Binary files a/gfx/hud/wickedhud/ammo_fuel.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/ammo_rockets.tga b/gfx/hud/wickedhud/ammo_rockets.tga deleted file mode 100644 index c37f077b28..0000000000 Binary files a/gfx/hud/wickedhud/ammo_rockets.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/ammo_shells.tga b/gfx/hud/wickedhud/ammo_shells.tga deleted file mode 100644 index 59bea4b3e1..0000000000 Binary files a/gfx/hud/wickedhud/ammo_shells.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/armor.tga b/gfx/hud/wickedhud/armor.tga deleted file mode 100644 index 92046b4887..0000000000 Binary files a/gfx/hud/wickedhud/armor.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/border.tga b/gfx/hud/wickedhud/border.tga deleted file mode 100644 index 8ceee44525..0000000000 Binary files a/gfx/hud/wickedhud/border.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/border_chat.tga b/gfx/hud/wickedhud/border_chat.tga deleted file mode 100644 index 1cd065effd..0000000000 Binary files a/gfx/hud/wickedhud/border_chat.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/border_healtharmor.tga b/gfx/hud/wickedhud/border_healtharmor.tga deleted file mode 100644 index 7109ab570c..0000000000 Binary files a/gfx/hud/wickedhud/border_healtharmor.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/border_inventory.tga b/gfx/hud/wickedhud/border_inventory.tga deleted file mode 100644 index 20ae8f6044..0000000000 Binary files a/gfx/hud/wickedhud/border_inventory.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/border_modicons.tga b/gfx/hud/wickedhud/border_modicons.tga deleted file mode 100644 index 5437b042e3..0000000000 Binary files a/gfx/hud/wickedhud/border_modicons.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/border_powerups.tga b/gfx/hud/wickedhud/border_powerups.tga deleted file mode 100644 index f8fbf4439e..0000000000 Binary files a/gfx/hud/wickedhud/border_powerups.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/border_radar.tga b/gfx/hud/wickedhud/border_radar.tga deleted file mode 100644 index a300f5207d..0000000000 Binary files a/gfx/hud/wickedhud/border_radar.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/border_score.tga b/gfx/hud/wickedhud/border_score.tga deleted file mode 100644 index a4d8b6c478..0000000000 Binary files a/gfx/hud/wickedhud/border_score.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/border_timer.tga b/gfx/hud/wickedhud/border_timer.tga deleted file mode 100644 index c657136fb0..0000000000 Binary files a/gfx/hud/wickedhud/border_timer.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/border_vote.tga b/gfx/hud/wickedhud/border_vote.tga deleted file mode 100644 index 13b948e1ab..0000000000 Binary files a/gfx/hud/wickedhud/border_vote.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/border_weaponicons.tga b/gfx/hud/wickedhud/border_weaponicons.tga deleted file mode 100644 index 08e8dcd7d2..0000000000 Binary files a/gfx/hud/wickedhud/border_weaponicons.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/dock.tga b/gfx/hud/wickedhud/dock.tga deleted file mode 100644 index 9dd4e2f0f6..0000000000 Binary files a/gfx/hud/wickedhud/dock.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/dock_small.tga b/gfx/hud/wickedhud/dock_small.tga deleted file mode 100644 index 5135876d8a..0000000000 Binary files a/gfx/hud/wickedhud/dock_small.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/flag_blue_carrying.tga b/gfx/hud/wickedhud/flag_blue_carrying.tga deleted file mode 100644 index 0700cd5bc7..0000000000 Binary files a/gfx/hud/wickedhud/flag_blue_carrying.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/flag_blue_lost.tga b/gfx/hud/wickedhud/flag_blue_lost.tga deleted file mode 100644 index f0bb89d2ee..0000000000 Binary files a/gfx/hud/wickedhud/flag_blue_lost.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/flag_blue_shielded.tga b/gfx/hud/wickedhud/flag_blue_shielded.tga deleted file mode 100644 index e385437f1c..0000000000 Binary files a/gfx/hud/wickedhud/flag_blue_shielded.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/flag_blue_taken.tga b/gfx/hud/wickedhud/flag_blue_taken.tga deleted file mode 100644 index e51e297bab..0000000000 Binary files a/gfx/hud/wickedhud/flag_blue_taken.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/flag_red_carrying.tga b/gfx/hud/wickedhud/flag_red_carrying.tga deleted file mode 100644 index c28cea877c..0000000000 Binary files a/gfx/hud/wickedhud/flag_red_carrying.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/flag_red_lost.tga b/gfx/hud/wickedhud/flag_red_lost.tga deleted file mode 100644 index 93d55793e9..0000000000 Binary files a/gfx/hud/wickedhud/flag_red_lost.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/flag_red_shielded.tga b/gfx/hud/wickedhud/flag_red_shielded.tga deleted file mode 100644 index ed9994ac40..0000000000 Binary files a/gfx/hud/wickedhud/flag_red_shielded.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/flag_red_taken.tga b/gfx/hud/wickedhud/flag_red_taken.tga deleted file mode 100644 index f999476d23..0000000000 Binary files a/gfx/hud/wickedhud/flag_red_taken.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/health.tga b/gfx/hud/wickedhud/health.tga deleted file mode 100644 index 0ed8a9030f..0000000000 Binary files a/gfx/hud/wickedhud/health.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/key_backward.tga b/gfx/hud/wickedhud/key_backward.tga deleted file mode 100644 index 4de0f33221..0000000000 Binary files a/gfx/hud/wickedhud/key_backward.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/key_backward_inv.tga b/gfx/hud/wickedhud/key_backward_inv.tga deleted file mode 100644 index bef0d1ca3d..0000000000 Binary files a/gfx/hud/wickedhud/key_backward_inv.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/key_crouch.tga b/gfx/hud/wickedhud/key_crouch.tga deleted file mode 100644 index 00b2dfe449..0000000000 Binary files a/gfx/hud/wickedhud/key_crouch.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/key_crouch_inv.tga b/gfx/hud/wickedhud/key_crouch_inv.tga deleted file mode 100644 index 2cdbda804d..0000000000 Binary files a/gfx/hud/wickedhud/key_crouch_inv.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/key_forward.tga b/gfx/hud/wickedhud/key_forward.tga deleted file mode 100644 index dfe223381b..0000000000 Binary files a/gfx/hud/wickedhud/key_forward.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/key_forward_inv.tga b/gfx/hud/wickedhud/key_forward_inv.tga deleted file mode 100644 index 7bbea6070f..0000000000 Binary files a/gfx/hud/wickedhud/key_forward_inv.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/key_jump.tga b/gfx/hud/wickedhud/key_jump.tga deleted file mode 100644 index d02b2dbc88..0000000000 Binary files a/gfx/hud/wickedhud/key_jump.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/key_jump_inv.tga b/gfx/hud/wickedhud/key_jump_inv.tga deleted file mode 100644 index c54bb3763c..0000000000 Binary files a/gfx/hud/wickedhud/key_jump_inv.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/key_left.tga b/gfx/hud/wickedhud/key_left.tga deleted file mode 100644 index 60fe71f17e..0000000000 Binary files a/gfx/hud/wickedhud/key_left.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/key_left_inv.tga b/gfx/hud/wickedhud/key_left_inv.tga deleted file mode 100644 index 92bc615e44..0000000000 Binary files a/gfx/hud/wickedhud/key_left_inv.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/key_right.tga b/gfx/hud/wickedhud/key_right.tga deleted file mode 100644 index 308c03b1e5..0000000000 Binary files a/gfx/hud/wickedhud/key_right.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/key_right_inv.tga b/gfx/hud/wickedhud/key_right_inv.tga deleted file mode 100644 index 8f04be424e..0000000000 Binary files a/gfx/hud/wickedhud/key_right_inv.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/kh_blue.tga b/gfx/hud/wickedhud/kh_blue.tga deleted file mode 100644 index 467b2294f7..0000000000 Binary files a/gfx/hud/wickedhud/kh_blue.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/kh_bluearrow.tga b/gfx/hud/wickedhud/kh_bluearrow.tga deleted file mode 100644 index b686d1b347..0000000000 Binary files a/gfx/hud/wickedhud/kh_bluearrow.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/kh_pink.tga b/gfx/hud/wickedhud/kh_pink.tga deleted file mode 100644 index b40967a752..0000000000 Binary files a/gfx/hud/wickedhud/kh_pink.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/kh_pinkarrow.tga b/gfx/hud/wickedhud/kh_pinkarrow.tga deleted file mode 100644 index 17427e5d39..0000000000 Binary files a/gfx/hud/wickedhud/kh_pinkarrow.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/kh_red.tga b/gfx/hud/wickedhud/kh_red.tga deleted file mode 100644 index 3201f8afe6..0000000000 Binary files a/gfx/hud/wickedhud/kh_red.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/kh_redarrow.tga b/gfx/hud/wickedhud/kh_redarrow.tga deleted file mode 100644 index edd1fab3cd..0000000000 Binary files a/gfx/hud/wickedhud/kh_redarrow.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/kh_yellow.tga b/gfx/hud/wickedhud/kh_yellow.tga deleted file mode 100644 index bb8347563c..0000000000 Binary files a/gfx/hud/wickedhud/kh_yellow.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/kh_yellowarrow.tga b/gfx/hud/wickedhud/kh_yellowarrow.tga deleted file mode 100644 index 8e754cc9bb..0000000000 Binary files a/gfx/hud/wickedhud/kh_yellowarrow.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/nexball_carrying.tga b/gfx/hud/wickedhud/nexball_carrying.tga deleted file mode 100644 index 04ada8ce4c..0000000000 Binary files a/gfx/hud/wickedhud/nexball_carrying.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/notify_camping.tga b/gfx/hud/wickedhud/notify_camping.tga deleted file mode 100644 index 2766dd1ccf..0000000000 Binary files a/gfx/hud/wickedhud/notify_camping.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/notify_death.tga b/gfx/hud/wickedhud/notify_death.tga deleted file mode 100644 index d5e8045a20..0000000000 Binary files a/gfx/hud/wickedhud/notify_death.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/notify_fall.tga b/gfx/hud/wickedhud/notify_fall.tga deleted file mode 100644 index febd1d03dc..0000000000 Binary files a/gfx/hud/wickedhud/notify_fall.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/notify_lava.tga b/gfx/hud/wickedhud/notify_lava.tga deleted file mode 100644 index 3976e8ba3f..0000000000 Binary files a/gfx/hud/wickedhud/notify_lava.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/notify_outofammo.tga b/gfx/hud/wickedhud/notify_outofammo.tga deleted file mode 100644 index 82a11dd83d..0000000000 Binary files a/gfx/hud/wickedhud/notify_outofammo.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/notify_selfkill.tga b/gfx/hud/wickedhud/notify_selfkill.tga deleted file mode 100644 index 646a1a2381..0000000000 Binary files a/gfx/hud/wickedhud/notify_selfkill.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/notify_shootingstar.tga b/gfx/hud/wickedhud/notify_shootingstar.tga deleted file mode 100644 index 048e0151fc..0000000000 Binary files a/gfx/hud/wickedhud/notify_shootingstar.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/notify_slime.tga b/gfx/hud/wickedhud/notify_slime.tga deleted file mode 100644 index c08a6a3d48..0000000000 Binary files a/gfx/hud/wickedhud/notify_slime.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/notify_teamkill.tga b/gfx/hud/wickedhud/notify_teamkill.tga deleted file mode 100644 index 0f28ebb36e..0000000000 Binary files a/gfx/hud/wickedhud/notify_teamkill.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/notify_void.tga b/gfx/hud/wickedhud/notify_void.tga deleted file mode 100644 index 1e2d280eb2..0000000000 Binary files a/gfx/hud/wickedhud/notify_void.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/notify_water.tga b/gfx/hud/wickedhud/notify_water.tga deleted file mode 100644 index 8315f1266b..0000000000 Binary files a/gfx/hud/wickedhud/notify_water.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_0.tga b/gfx/hud/wickedhud/num_0.tga deleted file mode 100644 index f0ab2f18e7..0000000000 Binary files a/gfx/hud/wickedhud/num_0.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_0_stroke.tga b/gfx/hud/wickedhud/num_0_stroke.tga deleted file mode 100644 index e9c6e5bdcb..0000000000 Binary files a/gfx/hud/wickedhud/num_0_stroke.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_1.tga b/gfx/hud/wickedhud/num_1.tga deleted file mode 100644 index 78f1f45a37..0000000000 Binary files a/gfx/hud/wickedhud/num_1.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_1_stroke.tga b/gfx/hud/wickedhud/num_1_stroke.tga deleted file mode 100644 index 1ff552f535..0000000000 Binary files a/gfx/hud/wickedhud/num_1_stroke.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_2.tga b/gfx/hud/wickedhud/num_2.tga deleted file mode 100644 index 205dd03512..0000000000 Binary files a/gfx/hud/wickedhud/num_2.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_2_stroke.tga b/gfx/hud/wickedhud/num_2_stroke.tga deleted file mode 100644 index 08d26dfef2..0000000000 Binary files a/gfx/hud/wickedhud/num_2_stroke.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_3.tga b/gfx/hud/wickedhud/num_3.tga deleted file mode 100644 index 335b5dab0a..0000000000 Binary files a/gfx/hud/wickedhud/num_3.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_3_stroke.tga b/gfx/hud/wickedhud/num_3_stroke.tga deleted file mode 100644 index a5fdddaa6a..0000000000 Binary files a/gfx/hud/wickedhud/num_3_stroke.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_4.tga b/gfx/hud/wickedhud/num_4.tga deleted file mode 100644 index 2b9f46f53e..0000000000 Binary files a/gfx/hud/wickedhud/num_4.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_4_stroke.tga b/gfx/hud/wickedhud/num_4_stroke.tga deleted file mode 100644 index fe879331fa..0000000000 Binary files a/gfx/hud/wickedhud/num_4_stroke.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_5.tga b/gfx/hud/wickedhud/num_5.tga deleted file mode 100644 index 8bb7043d43..0000000000 Binary files a/gfx/hud/wickedhud/num_5.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_5_stroke.tga b/gfx/hud/wickedhud/num_5_stroke.tga deleted file mode 100644 index 3a6978a8c7..0000000000 Binary files a/gfx/hud/wickedhud/num_5_stroke.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_6.tga b/gfx/hud/wickedhud/num_6.tga deleted file mode 100644 index 1db8c0e0b9..0000000000 Binary files a/gfx/hud/wickedhud/num_6.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_6_stroke.tga b/gfx/hud/wickedhud/num_6_stroke.tga deleted file mode 100644 index f64e178bf0..0000000000 Binary files a/gfx/hud/wickedhud/num_6_stroke.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_7.tga b/gfx/hud/wickedhud/num_7.tga deleted file mode 100644 index 0099d684d5..0000000000 Binary files a/gfx/hud/wickedhud/num_7.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_7_stroke.tga b/gfx/hud/wickedhud/num_7_stroke.tga deleted file mode 100644 index 252e796d8b..0000000000 Binary files a/gfx/hud/wickedhud/num_7_stroke.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_8.tga b/gfx/hud/wickedhud/num_8.tga deleted file mode 100644 index aa20157a78..0000000000 Binary files a/gfx/hud/wickedhud/num_8.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_8_stroke.tga b/gfx/hud/wickedhud/num_8_stroke.tga deleted file mode 100644 index e2cd39decd..0000000000 Binary files a/gfx/hud/wickedhud/num_8_stroke.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_9.tga b/gfx/hud/wickedhud/num_9.tga deleted file mode 100644 index 87b9c21c11..0000000000 Binary files a/gfx/hud/wickedhud/num_9.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_9_stroke.tga b/gfx/hud/wickedhud/num_9_stroke.tga deleted file mode 100644 index 5a8d6103c3..0000000000 Binary files a/gfx/hud/wickedhud/num_9_stroke.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_colon.tga b/gfx/hud/wickedhud/num_colon.tga deleted file mode 100644 index e22c09a696..0000000000 Binary files a/gfx/hud/wickedhud/num_colon.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_colon_stroke.tga b/gfx/hud/wickedhud/num_colon_stroke.tga deleted file mode 100644 index 68ad28ad58..0000000000 Binary files a/gfx/hud/wickedhud/num_colon_stroke.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_dot.tga b/gfx/hud/wickedhud/num_dot.tga deleted file mode 100644 index 7fbfdd0418..0000000000 Binary files a/gfx/hud/wickedhud/num_dot.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_dot_stroke.tga b/gfx/hud/wickedhud/num_dot_stroke.tga deleted file mode 100644 index 29ad696ac5..0000000000 Binary files a/gfx/hud/wickedhud/num_dot_stroke.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_leading_1.tga b/gfx/hud/wickedhud/num_leading_1.tga deleted file mode 100644 index f2f59d3b02..0000000000 Binary files a/gfx/hud/wickedhud/num_leading_1.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_leading_2.tga b/gfx/hud/wickedhud/num_leading_2.tga deleted file mode 100644 index a9be88c6ef..0000000000 Binary files a/gfx/hud/wickedhud/num_leading_2.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_leading_3.tga b/gfx/hud/wickedhud/num_leading_3.tga deleted file mode 100644 index ebd35a4e83..0000000000 Binary files a/gfx/hud/wickedhud/num_leading_3.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_minus.tga b/gfx/hud/wickedhud/num_minus.tga deleted file mode 100644 index 10721f2d8f..0000000000 Binary files a/gfx/hud/wickedhud/num_minus.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_minus_stroke.tga b/gfx/hud/wickedhud/num_minus_stroke.tga deleted file mode 100644 index 26455a0ad4..0000000000 Binary files a/gfx/hud/wickedhud/num_minus_stroke.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_plus.tga b/gfx/hud/wickedhud/num_plus.tga deleted file mode 100644 index 3cb17b3e40..0000000000 Binary files a/gfx/hud/wickedhud/num_plus.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/num_plus_stroke.tga b/gfx/hud/wickedhud/num_plus_stroke.tga deleted file mode 100644 index 7df2faaeba..0000000000 Binary files a/gfx/hud/wickedhud/num_plus_stroke.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/race_newfail.tga b/gfx/hud/wickedhud/race_newfail.tga deleted file mode 100644 index cd1164bdf7..0000000000 Binary files a/gfx/hud/wickedhud/race_newfail.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/race_newrankgreen.tga b/gfx/hud/wickedhud/race_newrankgreen.tga deleted file mode 100644 index c8fa1577cb..0000000000 Binary files a/gfx/hud/wickedhud/race_newrankgreen.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/race_newrankyellow.tga b/gfx/hud/wickedhud/race_newrankyellow.tga deleted file mode 100644 index 0af3c593f5..0000000000 Binary files a/gfx/hud/wickedhud/race_newrankyellow.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/race_newrecordserver.tga b/gfx/hud/wickedhud/race_newrecordserver.tga deleted file mode 100644 index aa8bae1a81..0000000000 Binary files a/gfx/hud/wickedhud/race_newrecordserver.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/race_newtime.tga b/gfx/hud/wickedhud/race_newtime.tga deleted file mode 100644 index c9647b927b..0000000000 Binary files a/gfx/hud/wickedhud/race_newtime.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/rifle_ring_1.tga b/gfx/hud/wickedhud/rifle_ring_1.tga deleted file mode 100644 index a90927cac2..0000000000 Binary files a/gfx/hud/wickedhud/rifle_ring_1.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/rifle_ring_2.tga b/gfx/hud/wickedhud/rifle_ring_2.tga deleted file mode 100644 index 6f6ca4c9cf..0000000000 Binary files a/gfx/hud/wickedhud/rifle_ring_2.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/rifle_ring_3.tga b/gfx/hud/wickedhud/rifle_ring_3.tga deleted file mode 100644 index 68f6df7ffb..0000000000 Binary files a/gfx/hud/wickedhud/rifle_ring_3.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/rifle_ring_4.tga b/gfx/hud/wickedhud/rifle_ring_4.tga deleted file mode 100644 index 0a5db15dca..0000000000 Binary files a/gfx/hud/wickedhud/rifle_ring_4.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/rifle_ring_5.tga b/gfx/hud/wickedhud/rifle_ring_5.tga deleted file mode 100644 index d5cc95b930..0000000000 Binary files a/gfx/hud/wickedhud/rifle_ring_5.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/rifle_ring_6.tga b/gfx/hud/wickedhud/rifle_ring_6.tga deleted file mode 100644 index 4a126e7fec..0000000000 Binary files a/gfx/hud/wickedhud/rifle_ring_6.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/rifle_ring_7.tga b/gfx/hud/wickedhud/rifle_ring_7.tga deleted file mode 100644 index 846212b061..0000000000 Binary files a/gfx/hud/wickedhud/rifle_ring_7.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/rifle_ring_8.tga b/gfx/hud/wickedhud/rifle_ring_8.tga deleted file mode 100644 index 137e24d1da..0000000000 Binary files a/gfx/hud/wickedhud/rifle_ring_8.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/shield.tga b/gfx/hud/wickedhud/shield.tga deleted file mode 100644 index f13f0b4d84..0000000000 Binary files a/gfx/hud/wickedhud/shield.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/statusbar.tga b/gfx/hud/wickedhud/statusbar.tga deleted file mode 100644 index 987c8f544e..0000000000 Binary files a/gfx/hud/wickedhud/statusbar.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/statusbar_vertical.tga b/gfx/hud/wickedhud/statusbar_vertical.tga deleted file mode 100644 index e271438e35..0000000000 Binary files a/gfx/hud/wickedhud/statusbar_vertical.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/strength.tga b/gfx/hud/wickedhud/strength.tga deleted file mode 100644 index b19019d5d7..0000000000 Binary files a/gfx/hud/wickedhud/strength.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/voteprogress_back.tga b/gfx/hud/wickedhud/voteprogress_back.tga deleted file mode 100644 index fc031ce0b2..0000000000 Binary files a/gfx/hud/wickedhud/voteprogress_back.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/voteprogress_prog.tga b/gfx/hud/wickedhud/voteprogress_prog.tga deleted file mode 100644 index 9f3f614870..0000000000 Binary files a/gfx/hud/wickedhud/voteprogress_prog.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/voteprogress_voted.tga b/gfx/hud/wickedhud/voteprogress_voted.tga deleted file mode 100644 index a21fe6a4b8..0000000000 Binary files a/gfx/hud/wickedhud/voteprogress_voted.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/weapon_accuracy.tga b/gfx/hud/wickedhud/weapon_accuracy.tga deleted file mode 100644 index 4a451b1bcf..0000000000 Binary files a/gfx/hud/wickedhud/weapon_accuracy.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/weapon_current_bg.tga b/gfx/hud/wickedhud/weapon_current_bg.tga deleted file mode 100644 index 5a8f936715..0000000000 Binary files a/gfx/hud/wickedhud/weapon_current_bg.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/weapon_hlacmod_renameit.tga b/gfx/hud/wickedhud/weapon_hlacmod_renameit.tga deleted file mode 100644 index f11c173ba8..0000000000 Binary files a/gfx/hud/wickedhud/weapon_hlacmod_renameit.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/weaponcampingrifle.tga b/gfx/hud/wickedhud/weaponcampingrifle.tga deleted file mode 100644 index fb6413b14f..0000000000 Binary files a/gfx/hud/wickedhud/weaponcampingrifle.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/weaponcrylink.tga b/gfx/hud/wickedhud/weaponcrylink.tga deleted file mode 100644 index e48ad4d246..0000000000 Binary files a/gfx/hud/wickedhud/weaponcrylink.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/weaponelectro.tga b/gfx/hud/wickedhud/weaponelectro.tga deleted file mode 100644 index 73c791b393..0000000000 Binary files a/gfx/hud/wickedhud/weaponelectro.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/weaponfireball.tga b/gfx/hud/wickedhud/weaponfireball.tga deleted file mode 100644 index d7ea1fb049..0000000000 Binary files a/gfx/hud/wickedhud/weaponfireball.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/weapongrenadelauncher.tga b/gfx/hud/wickedhud/weapongrenadelauncher.tga deleted file mode 100644 index c09081b004..0000000000 Binary files a/gfx/hud/wickedhud/weapongrenadelauncher.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/weaponhagar.tga b/gfx/hud/wickedhud/weaponhagar.tga deleted file mode 100644 index 69a7b729cf..0000000000 Binary files a/gfx/hud/wickedhud/weaponhagar.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/weaponhlac.tga b/gfx/hud/wickedhud/weaponhlac.tga deleted file mode 100644 index 2ba3853455..0000000000 Binary files a/gfx/hud/wickedhud/weaponhlac.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/weaponhook.tga b/gfx/hud/wickedhud/weaponhook.tga deleted file mode 100644 index 0c7fd40b6b..0000000000 Binary files a/gfx/hud/wickedhud/weaponhook.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/weaponlaser.tga b/gfx/hud/wickedhud/weaponlaser.tga deleted file mode 100644 index 1f016e16d9..0000000000 Binary files a/gfx/hud/wickedhud/weaponlaser.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/weaponminstanex.tga b/gfx/hud/wickedhud/weaponminstanex.tga deleted file mode 100644 index 26877c2672..0000000000 Binary files a/gfx/hud/wickedhud/weaponminstanex.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/weaponnex.tga b/gfx/hud/wickedhud/weaponnex.tga deleted file mode 100644 index 4ed91bc391..0000000000 Binary files a/gfx/hud/wickedhud/weaponnex.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/weaponporto.tga b/gfx/hud/wickedhud/weaponporto.tga deleted file mode 100644 index 46dd107d61..0000000000 Binary files a/gfx/hud/wickedhud/weaponporto.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/weaponrocketlauncher.tga b/gfx/hud/wickedhud/weaponrocketlauncher.tga deleted file mode 100644 index f5449b32c7..0000000000 Binary files a/gfx/hud/wickedhud/weaponrocketlauncher.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/weaponseeker.tga b/gfx/hud/wickedhud/weaponseeker.tga deleted file mode 100644 index 566ee86edd..0000000000 Binary files a/gfx/hud/wickedhud/weaponseeker.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/weaponshotgun.tga b/gfx/hud/wickedhud/weaponshotgun.tga deleted file mode 100644 index 055841c052..0000000000 Binary files a/gfx/hud/wickedhud/weaponshotgun.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/weapontuba.tga b/gfx/hud/wickedhud/weapontuba.tga deleted file mode 100644 index 8b8001594b..0000000000 Binary files a/gfx/hud/wickedhud/weapontuba.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/weaponuzi.tga b/gfx/hud/wickedhud/weaponuzi.tga deleted file mode 100644 index c0e75d1133..0000000000 Binary files a/gfx/hud/wickedhud/weaponuzi.tga and /dev/null differ diff --git a/gfx/menu/default/cursor_move.tga b/gfx/menu/default/cursor_move.tga new file mode 100644 index 0000000000..02643169b2 Binary files /dev/null and b/gfx/menu/default/cursor_move.tga differ diff --git a/gfx/menu/default/cursor_resize.tga b/gfx/menu/default/cursor_resize.tga new file mode 100644 index 0000000000..475e2244ff Binary files /dev/null and b/gfx/menu/default/cursor_resize.tga differ diff --git a/gfx/menu/default/cursor_resize2.tga b/gfx/menu/default/cursor_resize2.tga new file mode 100644 index 0000000000..6c97fb8d14 Binary files /dev/null and b/gfx/menu/default/cursor_resize2.tga differ diff --git a/gfx/menu/wickedx/colorpicker_m.tga b/gfx/menu/wickedx/colorpicker_m.tga index 6775942eec..79b0e83b7d 100755 Binary files a/gfx/menu/wickedx/colorpicker_m.tga and b/gfx/menu/wickedx/colorpicker_m.tga differ diff --git a/gfx/menu/wickedx/colorpicker_selected.tga b/gfx/menu/wickedx/colorpicker_selected.tga new file mode 100644 index 0000000000..605e932017 Binary files /dev/null and b/gfx/menu/wickedx/colorpicker_selected.tga differ diff --git a/gfx/menu/wickedx/cursor_move.tga b/gfx/menu/wickedx/cursor_move.tga new file mode 100644 index 0000000000..02643169b2 Binary files /dev/null and b/gfx/menu/wickedx/cursor_move.tga differ diff --git a/gfx/menu/wickedx/cursor_resize.tga b/gfx/menu/wickedx/cursor_resize.tga new file mode 100644 index 0000000000..475e2244ff Binary files /dev/null and b/gfx/menu/wickedx/cursor_resize.tga differ diff --git a/gfx/menu/wickedx/cursor_resize2.tga b/gfx/menu/wickedx/cursor_resize2.tga new file mode 100644 index 0000000000..6c97fb8d14 Binary files /dev/null and b/gfx/menu/wickedx/cursor_resize2.tga differ diff --git a/hud_default.cfg b/hud_default.cfg new file mode 100644 index 0000000000..8c7abe4134 --- /dev/null +++ b/hud_default.cfg @@ -0,0 +1,200 @@ +seta hud_skin "luminos" +seta hud_panel_bg "border_horizontal" +seta hud_panel_bg_color "0.875 0.375 0" +seta hud_panel_bg_color_team "0" +seta hud_panel_bg_alpha "1" +seta hud_panel_bg_border "6" +seta hud_panel_bg_padding "2" +seta hud_panel_fg_alpha "1" + +seta hud_dock "dock" +seta hud_dock_color "0 0.1875 0.4375" +seta hud_dock_color_team "0.700000" +seta hud_dock_alpha "1" + +seta hud_progressbar_alpha "0.500000" +seta hud_progressbar_strength_color "0 0 0.6" +seta hud_progressbar_shield_color "0.6 0 0.6" +seta hud_progressbar_health_color "0.6 0 0" +seta hud_progressbar_armor_color "0 0.6 0" +seta hud_progressbar_fuel_color "0.6 0.6 0" +seta hud_progressbar_nexball_color "0.7 0.1 0" + +seta _hud_panelorder "4 6 5 9 3 1 7 12 0 10 2 11 14 8 13 " + +seta hud_configure_grid "1" +seta hud_configure_grid_xsize "0.01" +seta hud_configure_grid_ysize "0.01" + +seta hud_panel_weapons 1 +seta hud_panel_weapons_pos "0.908906 0.088047" +seta hud_panel_weapons_size "0.066564 0.641367" +seta hud_panel_weapons_bg "border_vertical" +seta hud_panel_weapons_bg_color "" +seta hud_panel_weapons_bg_color_team "" +seta hud_panel_weapons_bg_alpha "" +seta hud_panel_weapons_bg_border "" +seta hud_panel_weapons_bg_padding "" +seta hud_panel_weapons_complainbubble "1" +seta hud_panel_weapons_complainbubble_padding "-10" +seta hud_panel_weapons_complainbubble_color_outofammo "0.8 0 0" +seta hud_panel_weapons_complainbubble_color_donthave "0.8 0.5 0" +seta hud_panel_weapons_complainbubble_color_unavailable "0 0.3 0.8" +seta hud_panel_weapons_ammo_color "0 1 0" +seta hud_panel_weapons_ammo_alpha "1" +seta hud_panel_weapons_aspect "1" + +seta hud_panel_ammo 1 +seta hud_panel_ammo_pos "0.193516 0.925605" +seta hud_panel_ammo_size "0.093750 0.061719" +seta hud_panel_ammo_bg "" +seta hud_panel_ammo_bg_color "" +seta hud_panel_ammo_bg_color_team "" +seta hud_panel_ammo_bg_alpha "" +seta hud_panel_ammo_bg_border "" +seta hud_panel_ammo_bg_padding "" +seta hud_panel_ammo_onlycurrent "1" +seta hud_panel_ammo_iconalign "0" + +seta hud_panel_powerups 1 +seta hud_panel_powerups_pos "0.363282 0.015742" +seta hud_panel_powerups_size "0.262500 0.048047" +seta hud_panel_powerups_bg "" +seta hud_panel_powerups_bg_color "" +seta hud_panel_powerups_bg_color_team "" +seta hud_panel_powerups_bg_alpha "0" +seta hud_panel_powerups_bg_border "" +seta hud_panel_powerups_bg_padding "" +seta hud_panel_powerups_flip "1" +seta hud_panel_powerups_iconalign "0" +seta hud_panel_powerups_baralign "0" +seta hud_panel_powerups_progressbar "1" + +seta hud_panel_healtharmor 1 +seta hud_panel_healtharmor_pos "0.305859 0.925606" +seta hud_panel_healtharmor_size "0.311485 0.061230" +seta hud_panel_healtharmor_bg "" +seta hud_panel_healtharmor_bg_color "" +seta hud_panel_healtharmor_bg_color_team "0" +seta hud_panel_healtharmor_bg_alpha "1" +seta hud_panel_healtharmor_bg_border "" +seta hud_panel_healtharmor_bg_padding "" +seta hud_panel_healtharmor_flip "0 +seta hud_panel_healtharmor_iconalign "0" +seta hud_panel_healtharmor_baralign "0" +seta hud_panel_healtharmor_progressbar "1" + +seta hud_panel_notify 1 +seta hud_panel_notify_pos "0.663125 0.748536" +seta hud_panel_notify_size "0.320000 0.180000" +seta hud_panel_notify_bg "" +seta hud_panel_notify_bg_color "" +seta hud_panel_notify_bg_color_team "" +seta hud_panel_notify_bg_alpha "0" +seta hud_panel_notify_bg_border "" +seta hud_panel_notify_bg_padding "" +seta hud_panel_notify_flip "0" +seta hud_panel_notify_print "0" + +seta hud_panel_timer 1 +seta hud_panel_timer_pos "0.880000 0.012070" +seta hud_panel_timer_size "0.100000 0.032520" +seta hud_panel_timer_bg "" +seta hud_panel_timer_bg_color "" +seta hud_panel_timer_bg_color_team "" +seta hud_panel_timer_bg_alpha "" +seta hud_panel_timer_bg_border "" +seta hud_panel_timer_bg_padding "0" + +seta hud_panel_radar 1 +seta hud_panel_radar_pos "0.023750 0.024395" +seta hud_panel_radar_size "0.182969 0.224140" +seta hud_panel_radar_bg "border_vertical" +seta hud_panel_radar_bg_color "" +seta hud_panel_radar_bg_color_team "" +seta hud_panel_radar_bg_alpha "" +seta hud_panel_radar_bg_border "" +seta hud_panel_radar_bg_padding "-3" +seta hud_panel_radar_foreground_alpha "0.800000" + +seta hud_panel_score 1 +seta hud_panel_score_pos "0.023516 0.925605" +seta hud_panel_score_size "0.152344 0.060254" +seta hud_panel_score_bg "" +seta hud_panel_score_bg_color "" +seta hud_panel_score_bg_color_team "" +seta hud_panel_score_bg_alpha "" +seta hud_panel_score_bg_border "" +seta hud_panel_score_bg_padding "" + +seta hud_panel_racetimer 1 +seta hud_panel_racetimer_pos "0.354531 0.206289" +seta hud_panel_racetimer_size "0.280000 0.093333" +seta hud_panel_racetimer_bg "" +seta hud_panel_racetimer_bg_color "" +seta hud_panel_racetimer_bg_color_team "" +seta hud_panel_racetimer_bg_alpha "0" +seta hud_panel_racetimer_bg_border "" +seta hud_panel_racetimer_bg_padding "" + +seta hud_panel_vote 1 +seta hud_panel_vote_pos "0.021094 0.650586" +seta hud_panel_vote_size "0.264218 0.102462" +seta hud_panel_vote_bg "" +seta hud_panel_vote_bg_color "" +seta hud_panel_vote_bg_color_team "" +seta hud_panel_vote_bg_alpha "" +seta hud_panel_vote_bg_border "" +seta hud_panel_vote_bg_padding "" +seta hud_panel_vote_alreadyvoted_alpha "0.750000" + +seta hud_panel_modicons 1 +seta hud_panel_modicons_pos "0.036563 0.271796" +seta hud_panel_modicons_size "0.084766 0.199903" +seta hud_panel_modicons_bg "" +seta hud_panel_modicons_bg_color "" +seta hud_panel_modicons_bg_color_team "" +seta hud_panel_modicons_bg_alpha "" +seta hud_panel_modicons_bg_border "" +seta hud_panel_modicons_bg_padding "" + +seta hud_panel_pressedkeys 1 +seta hud_panel_pressedkeys_pos "0.411562 0.545429" +seta hud_panel_pressedkeys_size "0.177656 0.120531" +seta hud_panel_pressedkeys_bg "" +seta hud_panel_pressedkeys_bg_color "" +seta hud_panel_pressedkeys_bg_color_team "0" +seta hud_panel_pressedkeys_bg_alpha "0" +seta hud_panel_pressedkeys_bg_border "" +seta hud_panel_pressedkeys_bg_padding "" +seta hud_panel_pressedkeys_aspect "1.600000" + +seta hud_panel_chat 1 +seta hud_panel_chat_pos "0.020000 0.774374" +seta hud_panel_chat_size "0.627968 0.112696" +seta hud_panel_chat_bg "" +seta hud_panel_chat_bg_color "" +seta hud_panel_chat_bg_color_team "" +seta hud_panel_chat_bg_alpha "0" +seta hud_panel_chat_bg_border "" +seta hud_panel_chat_bg_padding "" + +seta hud_panel_engineinfo 1 +seta hud_panel_engineinfo_pos "0.860000 0.950000" +seta hud_panel_engineinfo_size "0.130000 0.034667" +seta hud_panel_engineinfo_bg "" +seta hud_panel_engineinfo_bg_color "" +seta hud_panel_engineinfo_bg_color_team "" +seta hud_panel_engineinfo_bg_alpha "0" +seta hud_panel_engineinfo_bg_border "" +seta hud_panel_engineinfo_bg_padding "" + +seta hud_panel_infomessages 1 +seta hud_panel_infomessages_pos "0.388751 0.378243" +seta hud_panel_infomessages_size "0.233282 0.061679" +seta hud_panel_infomessages_bg "" +seta hud_panel_infomessages_bg_color "" +seta hud_panel_infomessages_bg_color_team "" +seta hud_panel_infomessages_bg_alpha "0" +seta hud_panel_infomessages_bg_border "" +seta hud_panel_infomessages_bg_padding "" diff --git a/hud_luminos_default.cfg b/hud_luminos_default.cfg new file mode 100644 index 0000000000..731a187416 --- /dev/null +++ b/hud_luminos_default.cfg @@ -0,0 +1,202 @@ +seta hud_skin "luminos" +seta hud_panel_bg "border_horizontal" +seta hud_panel_bg_color "0.875 0.375 0" +seta hud_panel_bg_color_team "0" +seta hud_panel_bg_alpha "1" +seta hud_panel_bg_border "6" +seta hud_panel_bg_padding "2" +seta hud_panel_fg_alpha "1" + +seta hud_dock "dock" +seta hud_dock_color "0 0.1875 0.4375" +seta hud_dock_color_team "0.700000" +seta hud_dock_alpha "1" + +seta hud_progressbar_alpha "0.500000" +seta hud_progressbar_strength_color "0 0 0.6" +seta hud_progressbar_shield_color "0.6 0 0.6" +seta hud_progressbar_health_color "0.6 0 0" +seta hud_progressbar_armor_color "0 0.6 0" +seta hud_progressbar_fuel_color "0.6 0.6 0" +seta hud_progressbar_nexball_color "0.7 0.1 0" + +seta _hud_panelorder "4 6 5 9 3 1 7 12 0 10 2 11 14 8 13 " + +seta hud_configure_grid "1" +seta hud_configure_grid_xsize "0.01" +seta hud_configure_grid_ysize "0.01" + +seta hud_panel_weapons 1 +seta hud_panel_weapons_pos "0.908906 0.088047" +seta hud_panel_weapons_size "0.066564 0.641367" +seta hud_panel_weapons_bg "border_vertical" +seta hud_panel_weapons_bg_color "" +seta hud_panel_weapons_bg_color_team "" +seta hud_panel_weapons_bg_alpha "" +seta hud_panel_weapons_bg_border "" +seta hud_panel_weapons_bg_padding "" +seta hud_panel_weapons_complainbubble "1" +seta hud_panel_weapons_complainbubble_padding "-10" +seta hud_panel_weapons_complainbubble_color_outofammo "0.8 0 0" +seta hud_panel_weapons_complainbubble_color_donthave "0.8 0.5 0" +seta hud_panel_weapons_complainbubble_color_unavailable "0 0.3 0.8" +seta hud_panel_weapons_ammo_color "0 1 0" +seta hud_panel_weapons_ammo_alpha "1" +seta hud_panel_weapons_aspect "1" + +seta hud_panel_ammo 1 +seta hud_panel_ammo_pos "0.193516 0.925605" +seta hud_panel_ammo_size "0.093750 0.061719" +seta hud_panel_ammo_bg "" +seta hud_panel_ammo_bg_color "" +seta hud_panel_ammo_bg_color_team "" +seta hud_panel_ammo_bg_alpha "" +seta hud_panel_ammo_bg_border "" +seta hud_panel_ammo_bg_padding "" +seta hud_panel_ammo_onlycurrent "1" +seta hud_panel_ammo_iconalign "0" + +seta hud_panel_powerups 1 +seta hud_panel_powerups_pos "0.363282 0.015742" +seta hud_panel_powerups_size "0.262500 0.048047" +seta hud_panel_powerups_bg "" +seta hud_panel_powerups_bg_color "" +seta hud_panel_powerups_bg_color_team "" +seta hud_panel_powerups_bg_alpha "0" +seta hud_panel_powerups_bg_border "" +seta hud_panel_powerups_bg_padding "" +seta hud_panel_powerups_flip "1" +seta hud_panel_powerups_iconalign "0" +seta hud_panel_powerups_baralign "0" +seta hud_panel_powerups_progressbar "1" + +seta hud_panel_healtharmor 1 +seta hud_panel_healtharmor_pos "0.305859 0.925606" +seta hud_panel_healtharmor_size "0.311485 0.061230" +seta hud_panel_healtharmor_bg "" +seta hud_panel_healtharmor_bg_color "" +seta hud_panel_healtharmor_bg_color_team "0" +seta hud_panel_healtharmor_bg_alpha "1" +seta hud_panel_healtharmor_bg_border "" +seta hud_panel_healtharmor_bg_padding "" +seta hud_panel_healtharmor_flip "0 +seta hud_panel_healtharmor_iconalign "0" +seta hud_panel_healtharmor_baralign "0" +seta hud_panel_healtharmor_progressbar "1" + +seta hud_panel_notify 1 +seta hud_panel_notify_pos "0.663125 0.748536" +seta hud_panel_notify_size "0.320000 0.180000" +seta hud_panel_notify_bg "" +seta hud_panel_notify_bg_color "" +seta hud_panel_notify_bg_color_team "" +seta hud_panel_notify_bg_alpha "0" +seta hud_panel_notify_bg_border "" +seta hud_panel_notify_bg_padding "" +seta hud_panel_notify_flip "0" +seta hud_panel_notify_print "0" + +seta hud_panel_timer 1 +seta hud_panel_timer_pos "0.880000 0.012070" +seta hud_panel_timer_size "0.100000 0.032520" +seta hud_panel_timer_bg "" +seta hud_panel_timer_bg_color "" +seta hud_panel_timer_bg_color_team "" +seta hud_panel_timer_bg_alpha "" +seta hud_panel_timer_bg_border "" +seta hud_panel_timer_bg_padding "0" + +seta hud_panel_radar 1 +seta hud_panel_radar_pos "0.023750 0.024395" +seta hud_panel_radar_size "0.182969 0.224140" +seta hud_panel_radar_bg "border_vertical" +seta hud_panel_radar_bg_color "" +seta hud_panel_radar_bg_color_team "" +seta hud_panel_radar_bg_alpha "" +seta hud_panel_radar_bg_border "" +seta hud_panel_radar_bg_padding "-3" +seta hud_panel_radar_foreground_alpha "0.800000" + +seta hud_panel_score 1 +seta hud_panel_score_pos "0.023516 0.925605" +seta hud_panel_score_size "0.152344 0.060254" +seta hud_panel_score_bg "" +seta hud_panel_score_bg_color "" +seta hud_panel_score_bg_color_team "" +seta hud_panel_score_bg_alpha "" +seta hud_panel_score_bg_border "" +seta hud_panel_score_bg_padding "" + +seta hud_panel_racetimer 1 +seta hud_panel_racetimer_pos "0.354531 0.206289" +seta hud_panel_racetimer_size "0.280000 0.093333" +seta hud_panel_racetimer_bg "" +seta hud_panel_racetimer_bg_color "" +seta hud_panel_racetimer_bg_color_team "" +seta hud_panel_racetimer_bg_alpha "0" +seta hud_panel_racetimer_bg_border "" +seta hud_panel_racetimer_bg_padding "" + +seta hud_panel_vote 1 +seta hud_panel_vote_pos "0.021094 0.650586" +seta hud_panel_vote_size "0.264218 0.102462" +seta hud_panel_vote_bg "" +seta hud_panel_vote_bg_color "" +seta hud_panel_vote_bg_color_team "" +seta hud_panel_vote_bg_alpha "" +seta hud_panel_vote_bg_border "" +seta hud_panel_vote_bg_padding "" +seta hud_panel_vote_alreadyvoted_alpha "0.750000" + +seta hud_panel_modicons 1 +seta hud_panel_modicons_pos "0.036563 0.271796" +seta hud_panel_modicons_size "0.084766 0.199903" +seta hud_panel_modicons_bg "" +seta hud_panel_modicons_bg_color "" +seta hud_panel_modicons_bg_color_team "" +seta hud_panel_modicons_bg_alpha "" +seta hud_panel_modicons_bg_border "" +seta hud_panel_modicons_bg_padding "" + +seta hud_panel_pressedkeys 1 +seta hud_panel_pressedkeys_pos "0.411562 0.545429" +seta hud_panel_pressedkeys_size "0.177656 0.120531" +seta hud_panel_pressedkeys_bg "" +seta hud_panel_pressedkeys_bg_color "" +seta hud_panel_pressedkeys_bg_color_team "0" +seta hud_panel_pressedkeys_bg_alpha "0" +seta hud_panel_pressedkeys_bg_border "" +seta hud_panel_pressedkeys_bg_padding "" +seta hud_panel_pressedkeys_aspect "1.600000" + +seta hud_panel_chat 1 +seta hud_panel_chat_pos "0.020000 0.774374" +seta hud_panel_chat_size "0.627968 0.112696" +seta hud_panel_chat_bg "" +seta hud_panel_chat_bg_color "" +seta hud_panel_chat_bg_color_team "" +seta hud_panel_chat_bg_alpha "0" +seta hud_panel_chat_bg_border "" +seta hud_panel_chat_bg_padding "" + +seta hud_panel_engineinfo 1 +seta hud_panel_engineinfo_pos "0.860000 0.950000" +seta hud_panel_engineinfo_size "0.130000 0.034667" +seta hud_panel_engineinfo_bg "" +seta hud_panel_engineinfo_bg_color "" +seta hud_panel_engineinfo_bg_color_team "" +seta hud_panel_engineinfo_bg_alpha "0" +seta hud_panel_engineinfo_bg_border "" +seta hud_panel_engineinfo_bg_padding "" + +seta hud_panel_infomessages 1 +seta hud_panel_infomessages_pos "0.388751 0.378243" +seta hud_panel_infomessages_size "0.233282 0.061679" +seta hud_panel_infomessages_bg "" +seta hud_panel_infomessages_bg_color "" +seta hud_panel_infomessages_bg_color_team "" +seta hud_panel_infomessages_bg_alpha "0" +seta hud_panel_infomessages_bg_border "" +seta hud_panel_infomessages_bg_padding "" + +menu_restart diff --git a/hud_old_nexuiz.cfg b/hud_old_nexuiz.cfg index cc9baef5cf..e803ed9d34 100644 --- a/hud_old_nexuiz.cfg +++ b/hud_old_nexuiz.cfg @@ -1,5 +1,5 @@ seta hud_skin "old" -seta hud_bg "0" +seta hud_bg "border" seta hud_bg_color "1 1 1" seta hud_bg_color_team "0" seta hud_bg_alpha "0.500000" @@ -12,7 +12,7 @@ seta hud_dock_color "0 0.5 0.35" seta hud_dock_color_team "0.700000" seta hud_dock_alpha "1" -seta hud_progressbar_alpha 0 +seta hud_progressbar_alpha "0.5" seta hud_progressbar_strength_color "0 0 0.6" seta hud_progressbar_shield_color "0.6 0 0.6" seta hud_progressbar_health_color "0.6 0 0" @@ -20,154 +20,183 @@ seta hud_progressbar_armor_color "0 0.6 0" seta hud_progressbar_fuel_color "0.6 0.6 0" seta hud_progressbar_nexball_color "0.7 0.1 0" -seta hud_weaponicons 1 -seta hud_weaponicons_pos "0.370000 0.870000" -seta hud_weaponicons_size "0.330000 0.050000" -seta hud_weaponicons_bg "" -seta hud_weaponicons_bg_color "" -seta hud_weaponicons_bg_color_team "" -seta hud_weaponicons_bg_alpha "" -seta hud_weaponicons_bg_border "" -seta hud_weaponicons_bg_padding "-5" -seta hud_weaponicons_accuracy_yellow 40 - -seta hud_inventory 1 -seta hud_inventory_pos "0.160000 0.910000" -seta hud_inventory_size "0.190000 0.090000" -seta hud_inventory_bg "" -seta hud_inventory_bg_color "" -seta hud_inventory_bg_color_team "" -seta hud_inventory_bg_alpha "" -seta hud_inventory_bg_border "" -seta hud_inventory_bg_padding "" -seta hud_inventory_onlycurrent 0 - -seta hud_powerups 1 -seta hud_powerups_pos "0.670000 0.910000" -seta hud_powerups_size "0.100000 0.080000" -seta hud_powerups_bg "" -seta hud_powerups_bg_color "" -seta hud_powerups_bg_color_team "" -seta hud_powerups_bg_alpha "" -seta hud_powerups_bg_border "" -seta hud_powerups_bg_padding "" -seta hud_powerups_flip 1 -seta hud_powerups_mirror 0 - -seta hud_healtharmor 1 -seta hud_healtharmor_pos "0.370000 0.930000" -seta hud_healtharmor_size "0.300000 0.070000" -seta hud_healtharmor_bg "" -seta hud_healtharmor_bg_color "" -seta hud_healtharmor_bg_color_team "" -seta hud_healtharmor_bg_alpha "" -seta hud_healtharmor_bg_border "" -seta hud_healtharmor_bg_padding "" -seta hud_healtharmor_flip 0 -seta hud_healtharmor_mirror 0 - -seta hud_notify 1 -seta hud_notify_pos "0.690000 0.660000" -seta hud_notify_size "0.300000 0.070000" -seta hud_notify_bg "" -seta hud_notify_bg_color "" -seta hud_notify_bg_color_team "" -seta hud_notify_bg_alpha "0" -seta hud_notify_bg_border "" -seta hud_notify_bg_padding "" -seta hud_notify_flip 0 -seta hud_notify_info_top 0 - -seta hud_timer 1 -seta hud_timer_pos "0.860000 0" -seta hud_timer_size "0.140000 0.045528" -seta hud_timer_bg "border" -seta hud_timer_bg_color "0 0.5 0.35" -seta hud_timer_bg_color_team "" -seta hud_timer_bg_alpha "0.800000" -seta hud_timer_bg_border "" -seta hud_timer_bg_padding "0" - -seta hud_radar 2 -seta hud_radar_pos "0.800000 0" -seta hud_radar_size "0.200000 0.260000" -seta hud_radar_bg "border_radar" -seta hud_radar_bg_color "" -seta hud_radar_bg_color_team "" -seta hud_radar_bg_alpha "" -seta hud_radar_bg_border "" -seta hud_radar_bg_padding "-10" -seta hud_radar_foreground_alpha 0.800000 -seta hud_radar_alreadyvoted_alpha 0 - -seta hud_score 1 -seta hud_score_pos "0.760000 0.913333" -seta hud_score_size "0.240000 0.080000" -seta hud_score_bg "" -seta hud_score_bg_color "" -seta hud_score_bg_color_team "" -seta hud_score_bg_alpha "" -seta hud_score_bg_border "" -seta hud_score_bg_padding "" - -seta hud_racetimer 1 -seta hud_racetimer_pos "0.360000 0.140000" -seta hud_racetimer_size "0.280000 0.093333" -seta hud_racetimer_bg "" -seta hud_racetimer_bg_color "" -seta hud_racetimer_bg_color_team "" -seta hud_racetimer_bg_alpha "0" -seta hud_racetimer_bg_border "" -seta hud_racetimer_bg_padding "" - -seta hud_vote 1 -seta hud_vote_pos "0.690000 0.750000" -seta hud_vote_size "0.300000 0.100000" -seta hud_vote_bg "" -seta hud_vote_bg_color "0 0.5 0.35" -seta hud_vote_bg_color_team "" -seta hud_vote_bg_alpha "0.800000" -seta hud_vote_bg_border "" -seta hud_vote_bg_padding "-3" -seta hud_vote_alreadyvoted_alpha 0.750000 - -seta hud_modicons 1 -seta hud_modicons_pos "0.010000 0.910000" -seta hud_modicons_size "0.135000 0.090000" -seta hud_modicons_bg "" -seta hud_modicons_bg_color "" -seta hud_modicons_bg_color_team "" -seta hud_modicons_bg_alpha "" -seta hud_modicons_bg_border "" -seta hud_modicons_bg_padding "" - -seta hud_pressedkeys 1 -seta hud_pressedkeys_pos "0.440000 0.740000" -seta hud_pressedkeys_size "0.120000 0.094368" -seta hud_pressedkeys_bg "" -seta hud_pressedkeys_bg_color "" -seta hud_pressedkeys_bg_color_team "" -seta hud_pressedkeys_bg_alpha "0" -seta hud_pressedkeys_bg_border "" -seta hud_pressedkeys_bg_padding "" - -seta hud_chat 1 -seta hud_chat_pos "0 0.760000" -seta hud_chat_size "0.420000 0.130000" -seta hud_chat_bg "" -seta hud_chat_bg_color "" -seta hud_chat_bg_color_team "" -seta hud_chat_bg_alpha "0" -seta hud_chat_bg_border "" -seta hud_chat_bg_padding "" - -seta hud_engineinfo 1 -seta hud_engineinfo_pos "0.020000 0.820000" -seta hud_engineinfo_size "0.112500 0.030000" -seta hud_engineinfo_bg "" -seta hud_engineinfo_bg_color "" -seta hud_engineinfo_bg_color_team "" -seta hud_engineinfo_bg_alpha "0" -seta hud_engineinfo_bg_border "" -seta hud_engineinfo_bg_padding "" - +seta _hud_panelorder "3 7 5 6 0 2 14 4 12 11 13 9 1 10 8 " + +seta hud_configure_grid "1" +seta hud_configure_grid_xsize "0.01" +seta hud_configure_grid_ysize "0.01" + +seta hud_panel_weapons 1 +seta hud_panel_weapons_pos "0.370000 0.870000" +seta hud_panel_weapons_size "0.330000 0.060000" +seta hud_panel_weapons_bg "0" +seta hud_panel_weapons_bg_color "" +seta hud_panel_weapons_bg_color_team "" +seta hud_panel_weapons_bg_alpha "" +seta hud_panel_weapons_bg_border "" +seta hud_panel_weapons_bg_padding "-5" +seta hud_panel_weapons_complainbubble "1" +seta hud_panel_weapons_complainbubble_padding "-10" +seta hud_panel_weapons_complainbubble_color_outofammo "0.8 0 0" +seta hud_panel_weapons_complainbubble_color_donthave "0.8 0.5 0" +seta hud_panel_weapons_complainbubble_color_unavailable "0 0.3 0.8" +seta hud_panel_weapons_ammo_color "0 1 0" +seta hud_panel_weapons_ammo_alpha "1" +seta hud_panel_weapons_aspect "1" + +seta hud_panel_ammo 1 +seta hud_panel_ammo_pos "0.160000 0.910000" +seta hud_panel_ammo_size "0.190000 0.090000" +seta hud_panel_ammo_bg "0" +seta hud_panel_ammo_bg_color "" +seta hud_panel_ammo_bg_color_team "" +seta hud_panel_ammo_bg_alpha "" +seta hud_panel_ammo_bg_border "" +seta hud_panel_ammo_bg_padding "" +seta hud_panel_ammo_onlycurrent "0" +seta hud_panel_ammo_iconalign "0" + +seta hud_panel_powerups 1 +seta hud_panel_powerups_pos "0.670000 0.910000" +seta hud_panel_powerups_size "0.110000 0.080000" +seta hud_panel_powerups_bg "" +seta hud_panel_powerups_bg_color "" +seta hud_panel_powerups_bg_color_team "" +seta hud_panel_powerups_bg_alpha "" +seta hud_panel_powerups_bg_border "" +seta hud_panel_powerups_bg_padding "" +seta hud_panel_powerups_flip "1" +seta hud_panel_powerups_iconalign "0" +seta hud_panel_powerups_baralign "0" +seta hud_panel_powerups_progressbar "0" + +seta hud_panel_healtharmor 1 +seta hud_panel_healtharmor_pos "0.370000 0.930000" +seta hud_panel_healtharmor_size "0.300000 0.070000" +seta hud_panel_healtharmor_bg "0" +seta hud_panel_healtharmor_bg_color "" +seta hud_panel_healtharmor_bg_color_team "" +seta hud_panel_healtharmor_bg_alpha "" +seta hud_panel_healtharmor_bg_border "" +seta hud_panel_healtharmor_bg_padding "" +seta hud_panel_healtharmor_flip "0 +seta hud_panel_healtharmor_iconalign "0" +seta hud_panel_healtharmor_baralign "0" +seta hud_panel_healtharmor_progressbar "0" + +seta hud_panel_notify 0 +seta hud_panel_notify_pos "0 0.650000" +seta hud_panel_notify_size "0.300000 0.070000" +seta hud_panel_notify_bg "" +seta hud_panel_notify_bg_color "" +seta hud_panel_notify_bg_color_team "" +seta hud_panel_notify_bg_alpha "0" +seta hud_panel_notify_bg_border "" +seta hud_panel_notify_bg_padding "" +seta hud_panel_notify_flip "0" +seta hud_panel_notify_print "0" + +seta hud_panel_timer 1 +seta hud_panel_timer_pos "0.860000 0" +seta hud_panel_timer_size "0.140000 0.045528" +seta hud_panel_timer_bg "border" +seta hud_panel_timer_bg_color "0 0.5 0.35" +seta hud_panel_timer_bg_color_team "" +seta hud_panel_timer_bg_alpha "0.800000" +seta hud_panel_timer_bg_border "" +seta hud_panel_timer_bg_padding "0" + +seta hud_panel_radar 2 +seta hud_panel_radar_pos "0.800000 0" +seta hud_panel_radar_size "0.200000 0.260000" +seta hud_panel_radar_bg "border_radar" +seta hud_panel_radar_bg_color "" +seta hud_panel_radar_bg_color_team "" +seta hud_panel_radar_bg_alpha "0.3" +seta hud_panel_radar_bg_border "" +seta hud_panel_radar_bg_padding "-10" +seta hud_panel_radar_foreground_alpha "0.800000" + +seta hud_panel_score 1 +seta hud_panel_score_pos "0.760000 0.920000" +seta hud_panel_score_size "0.240000 0.080000" +seta hud_panel_score_bg "0" +seta hud_panel_score_bg_color "" +seta hud_panel_score_bg_color_team "" +seta hud_panel_score_bg_alpha "" +seta hud_panel_score_bg_border "" +seta hud_panel_score_bg_padding "" + +seta hud_panel_racetimer 1 +seta hud_panel_racetimer_pos "0.360000 0.140000" +seta hud_panel_racetimer_size "0.280000 0.093333" +seta hud_panel_racetimer_bg "" +seta hud_panel_racetimer_bg_color "" +seta hud_panel_racetimer_bg_color_team "" +seta hud_panel_racetimer_bg_alpha "0" +seta hud_panel_racetimer_bg_border "" +seta hud_panel_racetimer_bg_padding "" + +seta hud_panel_vote 1 +seta hud_panel_vote_pos "0.690000 0.750000" +seta hud_panel_vote_size "0.300000 0.100000" +seta hud_panel_vote_bg "" +seta hud_panel_vote_bg_color "0 0.5 0.35" +seta hud_panel_vote_bg_color_team "" +seta hud_panel_vote_bg_alpha "0.800000" +seta hud_panel_vote_bg_border "" +seta hud_panel_vote_bg_padding "-3" +seta hud_panel_vote_alreadyvoted_alpha "0.750000" + +seta hud_panel_modicons 1 +seta hud_panel_modicons_pos "0.010000 0.910000" +seta hud_panel_modicons_size "0.135000 0.090000" +seta hud_panel_modicons_bg "" +seta hud_panel_modicons_bg_color "" +seta hud_panel_modicons_bg_color_team "" +seta hud_panel_modicons_bg_alpha "" +seta hud_panel_modicons_bg_border "" +seta hud_panel_modicons_bg_padding "" + +seta hud_panel_pressedkeys 1 +seta hud_panel_pressedkeys_pos "0.440000 0.740000" +seta hud_panel_pressedkeys_size "0.120000 0.094368" +seta hud_panel_pressedkeys_bg "" +seta hud_panel_pressedkeys_bg_color "" +seta hud_panel_pressedkeys_bg_color_team "" +seta hud_panel_pressedkeys_bg_alpha "0" +seta hud_panel_pressedkeys_bg_border "" +seta hud_panel_pressedkeys_bg_padding "" +seta hud_panel_pressedkeys_aspect "1.600000" + +seta hud_panel_chat 1 +seta hud_panel_chat_pos "0 0.760000" +seta hud_panel_chat_size "0.420000 0.130000" +seta hud_panel_chat_bg "" +seta hud_panel_chat_bg_color "" +seta hud_panel_chat_bg_color_team "" +seta hud_panel_chat_bg_alpha "0" +seta hud_panel_chat_bg_border "" +seta hud_panel_chat_bg_padding "" + +seta hud_panel_engineinfo 1 +seta hud_panel_engineinfo_pos "0.887500 0.870000" +seta hud_panel_engineinfo_size "0.112500 0.030000" +seta hud_panel_engineinfo_bg "" +seta hud_panel_engineinfo_bg_color "" +seta hud_panel_engineinfo_bg_color_team "" +seta hud_panel_engineinfo_bg_alpha "0" +seta hud_panel_engineinfo_bg_border "" +seta hud_panel_engineinfo_bg_padding "" + +seta hud_panel_infomessages 1 +seta hud_panel_infomessages_pos "0.700000 0.620000" +seta hud_panel_infomessages_size "0.300000 0.090000" +seta hud_panel_infomessages_bg "" +seta hud_panel_infomessages_bg_color "" +seta hud_panel_infomessages_bg_color_team "" +seta hud_panel_infomessages_bg_alpha "0" +seta hud_panel_infomessages_bg_border "" +seta hud_panel_infomessages_bg_padding "" + +menu_restart diff --git a/hud_wickedhud_big.cfg b/hud_wickedhud_big.cfg deleted file mode 100644 index f41dcb5dcd..0000000000 --- a/hud_wickedhud_big.cfg +++ /dev/null @@ -1,173 +0,0 @@ -seta hud_skin "wickedhud" -seta hud_bg "border" -seta hud_bg_color "0.875 0.375 0" -seta hud_bg_color_team "0" -seta hud_bg_alpha "1" -seta hud_bg_border "6" -seta hud_bg_padding "2" -seta hud_fg_alpha) "1" - -seta hud_dock "dock" -seta hud_dock_color "0 0.1875 0.4375" -seta hud_dock_color_team "0.700000" -seta hud_dock_alpha "1" - -seta hud_progressbar_alpha 0.500000 -seta hud_progressbar_strength_color "0 0 0.6" -seta hud_progressbar_shield_color "0.6 0 0.6" -seta hud_progressbar_health_color "0.6 0 0" -seta hud_progressbar_armor_color "0 0.6 0" -seta hud_progressbar_fuel_color "0.6 0.6 0" -seta hud_progressbar_nexball_color "0.7 0.1 0" - -seta hud_weaponicons 1 -seta hud_weaponicons_pos "0.940000 0.110000" -seta hud_weaponicons_size "0.040000 0.440000" -seta hud_weaponicons_bg "border_weaponicons" -seta hud_weaponicons_bg_color "" -seta hud_weaponicons_bg_color_team "" -seta hud_weaponicons_bg_alpha "" -seta hud_weaponicons_bg_border "" -seta hud_weaponicons_bg_padding "" -seta hud_weaponicons_accuracy_yellow 40 - -seta hud_inventory 1 -seta hud_inventory_pos "0.710000 0.900000" -seta hud_inventory_size "0.150000 0.080000" -seta hud_inventory_bg "border_inventory" -seta hud_inventory_bg_color "" -seta hud_inventory_bg_color_team "" -seta hud_inventory_bg_alpha "" -seta hud_inventory_bg_border "" -seta hud_inventory_bg_padding "" -seta hud_inventory_onlycurrent 0 - -seta hud_powerups 1 -seta hud_powerups_pos "0.400000 0.130000" -seta hud_powerups_size "0.200000 0.050000" -seta hud_powerups_bg "border_powerups" -seta hud_powerups_bg_color "" -seta hud_powerups_bg_color_team "" -seta hud_powerups_bg_alpha "" -seta hud_powerups_bg_border "" -seta hud_powerups_bg_padding "" -seta hud_powerups_flip 1 -seta hud_powerups_mirror 0 - -seta hud_healtharmor 1 -seta hud_healtharmor_pos "0.330000 0.850000" -seta hud_healtharmor_size "0.340000 0.090000" -seta hud_healtharmor_bg "border_healtharmor" -seta hud_healtharmor_bg_color "" -seta hud_healtharmor_bg_color_team "" -seta hud_healtharmor_bg_alpha "" -seta hud_healtharmor_bg_border "" -seta hud_healtharmor_bg_padding "" -seta hud_healtharmor_flip 0 -seta hud_healtharmor_mirror 0 - -seta hud_notify 1 -seta hud_notify_pos "0.710000 0.570000" -seta hud_notify_size "0.270000 0.280000" -seta hud_notify_bg "border_modicons" -seta hud_notify_bg_color "" -seta hud_notify_bg_color_team "" -seta hud_notify_bg_alpha "0" -seta hud_notify_bg_border "" -seta hud_notify_bg_padding "" -seta hud_notify_flip 0 -seta hud_notify_info_top 1 - -seta hud_timer 1 -seta hud_timer_pos "0.820000 0.017967" -seta hud_timer_size "0.160000 0.052033" -seta hud_timer_bg "border_timer" -seta hud_timer_bg_color "" -seta hud_timer_bg_color_team "" -seta hud_timer_bg_alpha "" -seta hud_timer_bg_border "" -seta hud_timer_bg_padding "0" - -seta hud_radar 2 -seta hud_radar_pos "0.030000 0.080000" -seta hud_radar_size "0.210000 0.250000" -seta hud_radar_bg "border_radar" -seta hud_radar_bg_color "" -seta hud_radar_bg_color_team "" -seta hud_radar_bg_alpha "" -seta hud_radar_bg_border "" -seta hud_radar_bg_padding "-3" -seta hud_radar_foreground_alpha 0.800000 -seta hud_radar_alreadyvoted_alpha 0 - -seta hud_score 1 -seta hud_score_pos "0.050000 0.900000" -seta hud_score_size "0.240000 0.080000" -seta hud_score_bg "border_score" -seta hud_score_bg_color "" -seta hud_score_bg_color_team "" -seta hud_score_bg_alpha "" -seta hud_score_bg_border "" -seta hud_score_bg_padding "" - -seta hud_racetimer 1 -seta hud_racetimer_pos "0.360000 0.010000" -seta hud_racetimer_size "0.280000 0.093333" -seta hud_racetimer_bg "border_timer" -seta hud_racetimer_bg_color "" -seta hud_racetimer_bg_color_team "" -seta hud_racetimer_bg_alpha 0 -seta hud_racetimer_bg_border "" -seta hud_racetimer_bg_padding "" - -seta hud_vote 1 -seta hud_vote_pos "0.020000 0.600000" -seta hud_vote_size "0.240000 0.080000" -seta hud_vote_bg "border_vote" -seta hud_vote_bg_color "" -seta hud_vote_bg_color_team "" -seta hud_vote_bg_alpha "" -seta hud_vote_bg_border "" -seta hud_vote_bg_padding "" -seta hud_vote_alreadyvoted_alpha 0.750000 - -seta hud_modicons 1 -seta hud_modicons_pos "0.880000 0.900000" -seta hud_modicons_size "0.105000 0.070000" -seta hud_modicons_bg "border_modicons" -seta hud_modicons_bg_color "" -seta hud_modicons_bg_color_team "" -seta hud_modicons_bg_alpha "" -seta hud_modicons_bg_border "" -seta hud_modicons_bg_padding "" - -seta hud_pressedkeys 1 -seta hud_pressedkeys_pos "0.460000 0.740000" -seta hud_pressedkeys_size "0.080000 0.062912" -seta hud_pressedkeys_bg "border_modicons" -seta hud_pressedkeys_bg_color "" -seta hud_pressedkeys_bg_color_team "" -seta hud_pressedkeys_bg_alpha "0" -seta hud_pressedkeys_bg_border "" -seta hud_pressedkeys_bg_padding "" - -seta hud_chat 1 -seta hud_chat_pos "0.020000 0.710000" -seta hud_chat_size "0.360000 0.100000" -seta hud_chat_bg "border_chat" -seta hud_chat_bg_color "" -seta hud_chat_bg_color_team "" -seta hud_chat_bg_alpha "0" -seta hud_chat_bg_border "" -seta hud_chat_bg_padding "" - -seta hud_engineinfo 1 -seta hud_engineinfo_pos "0.020000 0.820000" -seta hud_engineinfo_size "0.112500 0.030000" -seta hud_engineinfo_bg "border_modicons" -seta hud_engineinfo_bg_color "" -seta hud_engineinfo_bg_color_team "" -seta hud_engineinfo_bg_alpha "0" -seta hud_engineinfo_bg_border "" -seta hud_engineinfo_bg_padding "" - diff --git a/hud_wickedhud_default.cfg b/hud_wickedhud_default.cfg deleted file mode 100644 index 62d9d11b31..0000000000 --- a/hud_wickedhud_default.cfg +++ /dev/null @@ -1,185 +0,0 @@ -seta hud_skin "wickedhud" "skin folder where to look for images" -seta hud_bg "border" "default background for the panels, file must exist in gfx/hud/[skin name]/, 0 = disable background by default" -seta hud_bg_color "0.875 0.375 0" "default background color for the panels, accepts \"shirt\" and \"pants\"" -seta hud_bg_color_team 0 "default setting for overriding panel color with team color in team games, 0.5 = less saturated" -seta hud_bg_alpha 1 "default alpha of the background" -seta hud_bg_border 6 "default border size for the panels" -seta hud_bg_padding 2 "default padding of contents from the border" -seta hud_fg_alpha 1 "alpha of the foreground" - -seta hud_dock "dock_small" "enable a fullscreen background for the hud, useful for creating artificial docks, \"\" = disable" -seta hud_dock_color "0 0.1875 0.4375" "dock color, accepts \"shirt\" and \"pants\"" -seta hud_dock_color_team 0.7 "override dock color with team color in team games" -seta hud_dock_alpha 1 "alpha of the dock" - -seta hud_progressbar_alpha "0.5" "alpha of progressbars" -seta hud_progressbar_strength_color "0 0 0.6" "R G B vector of the progress bar background color" -seta hud_progressbar_shield_color "0.6 0 0.6" "R G B vector of the progress bar background color" -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" -seta hud_progressbar_fuel_color "0.6 0.6 0" "R G B vector of the progress bar background color" -seta hud_progressbar_nexball_color "0.7 0.1 0" "R G B vector of the progress bar background color" - -seta hud_weaponicons 1 "enable/disable this panel" -seta hud_weaponicons_pos "0.930000 0.090000" "position of this panel" -seta hud_weaponicons_size "0.040000 0.490000" "size of this panel" -seta hud_weaponicons_number 1 "show number of weapon" -seta hud_weaponicons_accuracy_yellow 40 "percentage at which the accuracy color is yellow" -seta hud_weaponicons_bg "border_weaponicons" "if set to something else than \"\" = override default background" -seta hud_weaponicons_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_weaponicons_bg_color_team "" "override panel color with team color in team based games" -seta hud_weaponicons_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" -seta hud_weaponicons_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_weaponicons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" - -seta hud_inventory 1 "enable/disable this panel" -seta hud_inventory_pos "0.190000 0.930000" "position of this panel" -seta hud_inventory_size "0.093750 0.050000" "size of this panel" -seta hud_inventory_onlycurrent 1 "1 = show only current ammo type" -seta hud_inventory_bg "border_inventory" "if set to something else than \"\" = override default background" -seta hud_inventory_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_inventory_bg_color_team "" "override panel color with team color in team based games" -seta hud_inventory_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" -seta hud_inventory_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_inventory_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" - -seta hud_powerups 1 "enable/disable this panel" -seta hud_powerups_pos "0.400000 0.130000" "position of this panel" -seta hud_powerups_size "0.200000 0.050000" "size of this panel" -seta hud_powerups_flip 1 "flip strength/shield positions" -seta hud_powerups_mirror 0 "mirror alignment of panel items" -seta hud_powerups_bg "border_powerups" "if set to something else than \"\" = override default background" -seta hud_powerups_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_powerups_bg_color_team "" "override panel color with team color in team based games" -seta hud_powerups_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" -seta hud_powerups_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_powerups_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" - -seta hud_healtharmor 1 "enable/disable this panel, 2 = combined health/armor display" -seta hud_healtharmor_pos "0.300000 0.930000" "position of this panel" -seta hud_healtharmor_size "0.240000 0.050000" "size of this panel" -seta hud_healtharmor_flip 0 "flip health/armor positions" -seta hud_healtharmor_mirror 0 "mirror alignment of panel items" -seta hud_healtharmor_bg "border_healtharmor" "if set to something else than \"\" = override default background" -seta hud_healtharmor_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_healtharmor_bg_color_team "" "override panel color with team color in team based games" -seta hud_healtharmor_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" -seta hud_healtharmor_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_healtharmor_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" - -seta hud_notify 1 "enable/disable this panel" -seta hud_notify_pos "0.660000 0.600000" "position of this base of the panel" -seta hud_notify_size "0.320000 0.330000" "size of this panel with all notifications on" -seta hud_notify_bg "border_modicons" "if set to something else than \"\" = override default background" -seta hud_notify_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_notify_bg_color_team "" "override panel color with team color in team based games" -seta hud_notify_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha" -seta hud_notify_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_notify_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" -seta hud_notify_flip 0 "order the list top to bottom instead of bottom to top" -seta hud_notify_print 0 "also con_notify print the messages that are shown on the notify panel" -seta hud_notify_time 10 "time that a new entry stays until it fades out" -seta hud_notify_fadetime 3 "fade out time" -seta hud_notify_info_top 1 "show info messages at top of panel" - -seta hud_timer 1 "enable/disable this panel" -seta hud_timer_pos "0.880000 0.015000" "position of this base of the panel" -seta hud_timer_size "0.100000 0.032520" "size of this panel" -seta hud_timer_increment 0 "show elapsed time instead of remaining time" -seta hud_timer_bg "border_timer" "if set to something else than \"\" = override default background" -seta hud_timer_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_timer_bg_color_team "" "override panel color with team color in team based games" -seta hud_timer_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" -seta hud_timer_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_timer_bg_padding "0" "if set to something else than \"\" = override default padding of contents from border" - -seta hud_radar 2 "enable/disable this panel, 2 = also enable in non-teambased gamemodes" -seta hud_radar_pos "0.030000 0.020000" "position of this base of the panel" -seta hud_radar_size "0.190000 0.230000" "size of this panel" -seta hud_radar_bg "border_radar" "if set to something else than \"\" = override default background" -seta hud_radar_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_radar_bg_color_team "" "override panel color with team color in team based games" -seta hud_radar_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" -seta hud_radar_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_radar_bg_padding "-3" "if set to something else than \"\" = override default padding of contents from border" -seta hud_radar_foreground_alpha 0.8 "alpha of the map" -seta hud_radar_scale 4096 "distance you can see on the team radar" -seta hud_radar_rotation 0 "rotation mode: you set what points up. 0 = player, 1 = west, 2 = south, 3 = east, 4 = north" -seta hud_radar_zoommode 0 "zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out" -alias hud_radar_rotate "toggle hud_radar_rotation 0 1 2 3 4" - -seta hud_score 1 "enable/disable this panel" -seta hud_score_pos "0.020000 0.930000" "position of this base of the panel" -seta hud_score_size "0.150000 0.050000" "size of this panel" -seta hud_score_bg "border_score" "if set to something else than \"\" = override default background" -seta hud_score_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_score_bg_color_team "" "override panel color with team color in team based games" -seta hud_score_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" -seta hud_score_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_score_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" - -seta hud_racetimer 1 "enable/disable this panel" -seta hud_racetimer_pos "0.360000 0.010000" "position of this base of the panel" -seta hud_racetimer_size "0.280000 0.093333" "size of this panel" -seta hud_racetimer_bg "border_timer" "if set to something else than \"\" = override default background" -seta hud_racetimer_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_racetimer_bg_color_team "" "override panel color with team color in team based games" -seta hud_racetimer_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha" -seta hud_racetimer_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_racetimer_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" - -seta hud_vote 1 "enable/disable this panel" -seta hud_vote_pos "0.400000 0.800000" "position of this base of the panel" -seta hud_vote_size "0.240000 0.080000" "size of this panel" -seta hud_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted" -seta hud_vote_bg "border_vote" "if set to something else than \"\" = override default background" -seta hud_vote_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_vote_bg_color_team "" "override panel color with team color in team based games" -seta hud_vote_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" -seta hud_vote_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_vote_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" - -seta hud_modicons 1 "enable/disable this panel" -seta hud_modicons_pos "0.560000 0.930000" "position of this base of the panel" -seta hud_modicons_size "0.075000 0.050000" "size of this panel" -seta hud_modicons_bg "border_modicons" "if set to something else than \"\" = override default background" -seta hud_modicons_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_modicons_bg_color_team "" "override panel color with team color in team based games" -seta hud_modicons_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" -seta hud_modicons_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_modicons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" - -seta hud_pressedkeys 1 "enable/disable this panel, 1 = show only when spectating other players, 2 = show always" -seta hud_pressedkeys_pos "0.460000 0.730000" "position of this base of the panel" -seta hud_pressedkeys_size "0.080000 0.062912" "size of this panel" -seta hud_pressedkeys_bg "border_modicons" "if set to something else than \"\" = override default background" -seta hud_pressedkeys_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_pressedkeys_bg_color_team "" "override panel color with team color in team based games" -seta hud_pressedkeys_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha" -seta hud_pressedkeys_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_pressedkeys_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" - -seta hud_chat 1 "enable/disable this panel" -seta hud_chat_pos "0.020000 0.790000" "position of this base of the panel" -seta hud_chat_size "0.360000 0.100000" "size of this panel" -seta hud_chat_bg "border_chat" "if set to something else than \"\" = override default background" -seta hud_chat_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_chat_bg_color_team "" "override panel color with team color in team based games" -seta hud_chat_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha" -seta hud_chat_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_chat_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" - -seta hud_engineinfo 1 "enable/disable this panel -seta hud_engineinfo_pos "0.860000 0.950000" "position of this base of the panel" -seta hud_engineinfo_size "0.130000 0.034667" "size of this panel" -seta hud_engineinfo_bg "border_modicons" "if set to something else than \"\" = override default background" -seta hud_engineinfo_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_engineinfo_bg_color_team "" "override panel color with team color in team based games" -seta hud_engineinfo_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha" -seta hud_engineinfo_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_engineinfo_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" -seta hud_engineinfo_framecounter_time 1 "time between framerate display updates, smaller values yield less accuracy" -seta hud_engineinfo_framecounter_decimals 0 "amount of decimals to show" -seta hud_engineinfo_framecounter_exponentialmovingaverage 1 "use an averaging method for calculating fps instead of counting frametime like engine does" -seta hud_engineinfo_framecounter_exponentialmovingaverage_new_weight 0.1 "weight of latest data point" -seta hud_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold 0.5 "threshold for fps change when to update instantly, to make big fps changes update faster" diff --git a/models/misc/chatbubble.spr_0.tga b/models/misc/chatbubble.spr_0.tga index c1858ef03f..d30980ad70 100644 Binary files a/models/misc/chatbubble.spr_0.tga and b/models/misc/chatbubble.spr_0.tga differ diff --git a/physics10.cfg b/physics10.cfg index 4631d5ea7b..6e112b9f67 100644 --- a/physics10.cfg +++ b/physics10.cfg @@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0 sv_maxairstrafespeed 0 sv_airstrafeaccel_qw 0 sv_aircontrol 0 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 diff --git a/physics11.cfg b/physics11.cfg index 8c8219af5f..d4e1f54aba 100644 --- a/physics11.cfg +++ b/physics11.cfg @@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0 sv_maxairstrafespeed 0 sv_airstrafeaccel_qw 0 sv_aircontrol 0 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 diff --git a/physics151.cfg b/physics151.cfg index 9707f6f7ce..6cb19f1bde 100644 --- a/physics151.cfg +++ b/physics151.cfg @@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0 sv_maxairstrafespeed 0 sv_airstrafeaccel_qw 0 sv_aircontrol 0 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 diff --git a/physics151b.cfg b/physics151b.cfg index 475875b1a2..4796765cd3 100644 --- a/physics151b.cfg +++ b/physics151b.cfg @@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0 sv_maxairstrafespeed 0 sv_airstrafeaccel_qw 0 sv_aircontrol 0 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 diff --git a/physics16rc1.cfg b/physics16rc1.cfg index 68a8f198ef..c4d60c7f33 100644 --- a/physics16rc1.cfg +++ b/physics16rc1.cfg @@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0 sv_maxairstrafespeed 0 sv_airstrafeaccel_qw 0 sv_aircontrol 0 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 diff --git a/physics20.cfg b/physics20.cfg index b2e056ee5a..d317514c00 100644 --- a/physics20.cfg +++ b/physics20.cfg @@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0 sv_maxairstrafespeed 0 sv_airstrafeaccel_qw 0 sv_aircontrol 0 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 diff --git a/physics25.cfg b/physics25.cfg index 85e4841cd1..af5f386327 100644 --- a/physics25.cfg +++ b/physics25.cfg @@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0 sv_maxairstrafespeed 0 sv_airstrafeaccel_qw 0 sv_aircontrol 0 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 diff --git a/physics26.cfg b/physics26.cfg index 0e4de396e7..8fa5abc006 100644 --- a/physics26.cfg +++ b/physics26.cfg @@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0 sv_maxairstrafespeed 0 sv_airstrafeaccel_qw 0 sv_aircontrol 0 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 diff --git a/physicsCPMA.cfg b/physicsCPMA.cfg index d572e6d97f..5660a33421 100644 --- a/physicsCPMA.cfg +++ b/physicsCPMA.cfg @@ -18,6 +18,7 @@ sv_airstrafeaccelerate 70 sv_maxairstrafespeed 30 sv_airstrafeaccel_qw 0 sv_aircontrol 150 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 diff --git a/physicsHavoc.cfg b/physicsHavoc.cfg index eb63775623..f328f8967b 100644 --- a/physicsHavoc.cfg +++ b/physicsHavoc.cfg @@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0 sv_maxairstrafespeed 0 sv_airstrafeaccel_qw 0 sv_aircontrol 0 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 diff --git a/physicsLeeStricklin.cfg b/physicsLeeStricklin.cfg index 4a959db3e9..b162e5f800 100644 --- a/physicsLeeStricklin.cfg +++ b/physicsLeeStricklin.cfg @@ -19,6 +19,7 @@ sv_airstrafeaccelerate 0 sv_maxairstrafespeed 0 sv_airstrafeaccel_qw 0 sv_aircontrol 0 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 diff --git a/physicsLzd.cfg b/physicsLzd.cfg index 2b437d3443..064499002a 100644 --- a/physicsLzd.cfg +++ b/physicsLzd.cfg @@ -19,6 +19,7 @@ sv_airstrafeaccelerate 0 sv_maxairstrafespeed 0 sv_airstrafeaccel_qw 0 sv_aircontrol 0 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 diff --git a/physicsNoQWBunny-XPM.cfg b/physicsNoQWBunny-XPM.cfg new file mode 100644 index 0000000000..1beaeda7e8 --- /dev/null +++ b/physicsNoQWBunny-XPM.cfg @@ -0,0 +1,36 @@ +// 2.0-2.4.2 physics minus QW-bunnyhopping-bug, faster onground accel, CPMA air control +sv_gravity 800 +sv_maxspeed 320 + +sv_maxairspeed 320 + +sv_stopspeed 100 +sv_accelerate 15 +sv_airaccelerate 2 +sv_friction 8 +edgefriction 1 +sv_stepheight 34 + +sv_jumpvelocity 300 +sv_wateraccelerate 4 +sv_waterfriction 1 +sv_airaccel_sideways_friction 0 +sv_airaccel_qw -0.937 + +sv_airstopaccelerate 3 +sv_airstrafeaccelerate 24 +sv_maxairstrafespeed 100 +sv_airstrafeaccel_qw -0.979 +sv_aircontrol 125 +sv_aircontrol_penalty 100 +sv_aircontrol_power 2.5 +sv_airspeedlimit_nonqw 0 +sv_warsowbunny_turnaccel 0 +sv_warsowbunny_accel 0.1593 +sv_warsowbunny_topspeed 925 +sv_warsowbunny_backtosideratio 0.8 +sv_friction_on_land 0 +sv_doublejump 0 +sv_jumpspeedcap_min "" +sv_jumpspeedcap_max "" +sv_jumpspeedcap_max_disable_on_ramps 1 diff --git a/physicsNoQWBunny.cfg b/physicsNoQWBunny.cfg index d70bc1bde1..5a8732b680 100644 --- a/physicsNoQWBunny.cfg +++ b/physicsNoQWBunny.cfg @@ -18,6 +18,7 @@ sv_airstrafeaccelerate 24 sv_maxairstrafespeed 100 sv_airstrafeaccel_qw -0.9825 sv_aircontrol 125 +sv_aircontrol_penalty 0 sv_aircontrol_power 2.5 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 diff --git a/physicsNoQWBunny_easy.cfg b/physicsNoQWBunny_easy.cfg index ff8cd3bcce..721f819b3d 100644 --- a/physicsNoQWBunny_easy.cfg +++ b/physicsNoQWBunny_easy.cfg @@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0 sv_maxairstrafespeed 0 sv_airstrafeaccel_qw 0 sv_aircontrol 125 +sv_aircontrol_penalty 0 sv_aircontrol_power 2.5 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 diff --git a/physicsQ.cfg b/physicsQ.cfg index ea8e1acf7b..6fb02afe78 100644 --- a/physicsQ.cfg +++ b/physicsQ.cfg @@ -19,6 +19,7 @@ sv_airstrafeaccelerate 0 sv_maxairstrafespeed 0 sv_airstrafeaccel_qw 0 sv_aircontrol 0 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 diff --git a/physicsQ2.cfg b/physicsQ2.cfg index 1d08ae8c74..927fef3c44 100644 --- a/physicsQ2.cfg +++ b/physicsQ2.cfg @@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0 sv_maxairstrafespeed 0 sv_airstrafeaccel_qw 0 sv_aircontrol 0 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 diff --git a/physicsQ2a.cfg b/physicsQ2a.cfg index 7409ae4be2..7828cc608b 100644 --- a/physicsQ2a.cfg +++ b/physicsQ2a.cfg @@ -19,6 +19,7 @@ sv_airstrafeaccelerate 0 sv_maxairstrafespeed 0 sv_airstrafeaccel_qw 0 sv_aircontrol 0 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 diff --git a/physicsQ3.cfg b/physicsQ3.cfg index 1951becf20..37973aef68 100644 --- a/physicsQ3.cfg +++ b/physicsQ3.cfg @@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0 sv_maxairstrafespeed 0 sv_airstrafeaccel_qw 0 sv_aircontrol 0 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 diff --git a/physicsQBF.cfg b/physicsQBF.cfg index 4bbb9be2d4..2f325586e3 100644 --- a/physicsQBF.cfg +++ b/physicsQBF.cfg @@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0 sv_maxairstrafespeed 0 sv_airstrafeaccel_qw 0 sv_aircontrol 0 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 diff --git a/physicsQBFplus.cfg b/physicsQBFplus.cfg index 6c17ad683b..03be62dd43 100644 --- a/physicsQBFplus.cfg +++ b/physicsQBFplus.cfg @@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0 sv_maxairstrafespeed 0 sv_airstrafeaccel_qw 0 sv_aircontrol 0 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 diff --git a/physicsSamual.cfg b/physicsSamual.cfg index e03363a088..7492b415c5 100644 --- a/physicsSamual.cfg +++ b/physicsSamual.cfg @@ -18,6 +18,7 @@ sv_airstrafeaccelerate 0 sv_maxairstrafespeed 0 sv_airstrafeaccel_qw 0 sv_aircontrol 0 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 diff --git a/physicsWarsow.cfg b/physicsWarsow.cfg index b1b0655cbc..811084dd5f 100644 --- a/physicsWarsow.cfg +++ b/physicsWarsow.cfg @@ -18,6 +18,7 @@ sv_airstrafeaccelerate 70 sv_maxairstrafespeed 30 sv_airstrafeaccel_qw 0 sv_aircontrol 0 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 9 // activates warsow movement mode diff --git a/physicsWarsowClassicBunny.cfg b/physicsWarsowClassicBunny.cfg index 06e7c1a575..467c4212a0 100644 --- a/physicsWarsowClassicBunny.cfg +++ b/physicsWarsowClassicBunny.cfg @@ -18,6 +18,7 @@ sv_airstrafeaccelerate 70 sv_maxairstrafespeed 30 sv_airstrafeaccel_qw 0 sv_aircontrol 150 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 diff --git a/physicsWarsowDev.cfg b/physicsWarsowDev.cfg index cb07a48818..8a62f3e053 100644 --- a/physicsWarsowDev.cfg +++ b/physicsWarsowDev.cfg @@ -18,6 +18,7 @@ sv_airstrafeaccelerate 70 sv_maxairstrafespeed 30 sv_airstrafeaccel_qw 0 sv_aircontrol 0 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 6 // activates warsow movement mode diff --git a/physicsXPM.cfg b/physicsXPM.cfg index 2a60b65178..74a20a4684 100644 --- a/physicsXPM.cfg +++ b/physicsXPM.cfg @@ -22,6 +22,7 @@ sv_airstrafeaccelerate 70 sv_maxairstrafespeed 30 sv_airstrafeaccel_qw 1 sv_aircontrol 150 +sv_aircontrol_penalty 0 sv_aircontrol_power 2 sv_airspeedlimit_nonqw 0 sv_warsowbunny_turnaccel 0 @@ -31,5 +32,5 @@ sv_warsowbunny_backtosideratio 0.8 sv_friction_on_land 0 sv_doublejump 1 sv_jumpspeedcap_min 0 -sv_jumpspeedcap_max 1 +sv_jumpspeedcap_max 0.5 sv_jumpspeedcap_max_disable_on_ramps 1 diff --git a/physicsXPMLight.cfg b/physicsXPMLight.cfg new file mode 100644 index 0000000000..db9c6179c0 --- /dev/null +++ b/physicsXPMLight.cfg @@ -0,0 +1,36 @@ +// Nexrun tweaked to suit CPM +sv_gravity 800 +sv_maxspeed 320 +// CPMA: 320 +sv_maxairspeed 320 +// CPMA: 320 +sv_stopspeed 100 +sv_accelerate 15 +sv_airaccelerate 1 +sv_friction 8 +edgefriction 1 +sv_stepheight 34 +// CPMA: 18 +sv_jumpvelocity 270 +sv_wateraccelerate 4 +sv_waterfriction 1 +sv_airaccel_sideways_friction 0 +sv_airaccel_qw -0.9146875 +// CPMA: 1 +sv_airstopaccelerate 6.5625 // matches strafe-stopping speed +sv_airstrafeaccelerate 14 +sv_maxairstrafespeed 150 +sv_airstrafeaccel_qw -0.987 +sv_aircontrol 100 +sv_aircontrol_penalty 100 +sv_aircontrol_power 2.5 +sv_airspeedlimit_nonqw 0 +sv_warsowbunny_turnaccel 0 +sv_warsowbunny_accel 0.1593 +sv_warsowbunny_topspeed 925 +sv_warsowbunny_backtosideratio 0.8 +sv_friction_on_land 0 +sv_doublejump 0 +sv_jumpspeedcap_min "" +sv_jumpspeedcap_max "" +sv_jumpspeedcap_max_disable_on_ramps 1 diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc index 1a6996ce66..de5aad9d48 100644 --- a/qcsrc/client/Main.qc +++ b/qcsrc/client/Main.qc @@ -183,6 +183,7 @@ void CSQC_Init(void) minimapname = strzone(minimapname); WarpZone_Init(); + hud_configure_prev = -1; } // CSQC_Shutdown : Called every time the CSQC code is shutdown (changing maps, quitting, etc) @@ -1223,13 +1224,13 @@ void Net_ReadPingPLReport() void Net_VoteDialog(float highlight) { if(highlight) { - vote_highlighted = ReadShort(); + vote_highlighted = ReadByte(); return; } - vote_yescount = ReadShort(); - vote_nocount = ReadShort(); - vote_needed = ReadShort(); + vote_yescount = ReadByte(); + vote_nocount = ReadByte(); + vote_needed = ReadByte(); vote_active = 1; } @@ -1251,6 +1252,18 @@ void Net_Notify() { } } +void Net_WeaponComplain() { + complain_weapon = ReadByte(); + + if(complain_weapon_name) + strunzone(complain_weapon_name); + complain_weapon_name = strzone(ReadString()); + + complain_weapon_type = ReadByte(); + + complain_weapon_time = time; +} + // CSQC_Parse_TempEntity : Handles all temporary entity network data in the CSQC layer. // You must ALWAYS first acquire the temporary ID, which is sent as a byte. // Return value should be 1 if CSQC handled the temporary entity, otherwise return 0 to have the engine process the event. @@ -1321,6 +1334,10 @@ float CSQC_Parse_TempEntity() Net_Notify(); bHandled = true; break; + case TE_CSQC_WEAPONCOMPLAIN: + Net_WeaponComplain(); + bHandled = true; + break; default: // No special logic for this temporary entity; return 0 so the engine can handle it bHandled = false; diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index 0ec4277b6b..8c642415dd 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -375,7 +375,7 @@ void CSQC_UpdateView(float w, float h) input_angles = warpzone_fixview_cl_viewangles; view_angles = warpzone_fixview_angles; - if(cvar("cl_lockview") || hud_configure) + if(cvar("cl_lockview") || autocvar__hud_configure) { pmove_org = freeze_pmove_org; input_angles = view_angles = freeze_input_angles; @@ -879,7 +879,7 @@ void CSQC_UpdateView(float w, float h) cvar_set("vid_conheight", h0); } - if(hud_configure) + if(autocvar__hud_configure) HUD_Panel_Mouse(); // be safe against triggerbots until everyone has the fixed engine // this call is meant to overwrite the trace globals by something diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh index 83cdc12767..0c2df0e636 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -5,3 +5,232 @@ var float autocvar_cl_gibs_sloppy = 1; var float autocvar_cl_casings_ticrate = 0.1; var float autocvar_cl_casings_sloppy = 1; + +var float autocvar_cl_gentle; +var float autocvar_cl_gentle_gibs; +var float autocvar_cl_gentle_messages; + +var float autocvar_hud_color_bg_team; + +var float autocvar__menu_alpha; + +var float autocvar__hud_configure; +var float autocvar_hud_configure_teamcolorforced; +var float autocvar_hud_configure_checkcollisions; +var float autocvar_hud_configure_bg_minalpha; +var float autocvar_hud_configure_grid; +var float autocvar_hud_configure_grid_xsize; +var float autocvar_hud_configure_grid_ysize; +var float autocvar_hud_configure_grid_alpha; + +var float autocvar__con_chat_maximized; +var string autocvar__hud_panelorder; + +var string autocvar_hud_skin; +var string autocvar_hud_dock; +var string autocvar_hud_dock_color; +var float autocvar_hud_dock_color_team; +var float autocvar_hud_dock_alpha; + +var float autocvar_hud_progressbar_alpha; +var vector autocvar_hud_progressbar_strength_color; +var vector autocvar_hud_progressbar_shield_color; +var vector autocvar_hud_progressbar_health_color; +var vector autocvar_hud_progressbar_armor_color; +var vector autocvar_hud_progressbar_fuel_color; +var vector autocvar_hud_progressbar_nexball_color; + +var string autocvar_hud_panel_bg; +var vector autocvar_hud_panel_bg_color; +var float autocvar_hud_panel_bg_color_team; +var float autocvar_hud_panel_bg_alpha; +var float autocvar_hud_panel_bg_border; +var float autocvar_hud_panel_bg_padding; +var float autocvar_hud_panel_fg_alpha; + +var float autocvar_hud_panel_weapons; +var vector autocvar_hud_panel_weapons_pos; +var vector autocvar_hud_panel_weapons_size; +var string autocvar_hud_panel_weapons_bg; +var string autocvar_hud_panel_weapons_bg_color; +var string autocvar_hud_panel_weapons_bg_color_team; +var string autocvar_hud_panel_weapons_bg_alpha; +var string autocvar_hud_panel_weapons_bg_border; +var string autocvar_hud_panel_weapons_bg_padding; +var float autocvar_hud_panel_weapons_aspect; +var float autocvar_hud_panel_weapons_accuracy; +var float autocvar_hud_panel_weapons_accuracy_yellow; +var float autocvar_hud_panel_weapons_ammo; +var vector autocvar_hud_panel_weapons_ammo_color; +var float autocvar_hud_panel_weapons_ammo_alpha; +var float autocvar_hud_panel_weapons_ammo_full_shells; +var float autocvar_hud_panel_weapons_ammo_full_nails; +var float autocvar_hud_panel_weapons_ammo_full_rockets; +var float autocvar_hud_panel_weapons_ammo_full_cells; +var float autocvar_hud_panel_weapons_ammo_full_fuel; +var float autocvar_hud_panel_weapons_label; +var float autocvar_hud_panel_weapons_complainbubble; +var float autocvar_hud_panel_weapons_complainbubble_padding; +var float autocvar_hud_panel_weapons_complainbubble_time; +var float autocvar_hud_panel_weapons_complainbubble_fadetime; +var vector autocvar_hud_panel_weapons_complainbubble_color_outofammo; +var vector autocvar_hud_panel_weapons_complainbubble_color_donthave; +var vector autocvar_hud_panel_weapons_complainbubble_color_unavailable; + +var float autocvar_hud_panel_ammo; +var vector autocvar_hud_panel_ammo_pos; +var vector autocvar_hud_panel_ammo_size; +var string autocvar_hud_panel_ammo_bg; +var string autocvar_hud_panel_ammo_bg_color; +var string autocvar_hud_panel_ammo_bg_color_team; +var string autocvar_hud_panel_ammo_bg_alpha; +var string autocvar_hud_panel_ammo_bg_border; +var string autocvar_hud_panel_ammo_bg_padding; +var float autocvar_hud_panel_ammo_onlycurrent; +var float autocvar_hud_panel_ammo_iconalign; + +var float autocvar_hud_panel_powerups; +var vector autocvar_hud_panel_powerups_pos; +var vector autocvar_hud_panel_powerups_size; +var string autocvar_hud_panel_powerups_bg; +var string autocvar_hud_panel_powerups_bg_color; +var string autocvar_hud_panel_powerups_bg_color_team; +var string autocvar_hud_panel_powerups_bg_alpha; +var string autocvar_hud_panel_powerups_bg_border; +var string autocvar_hud_panel_powerups_bg_padding; +var float autocvar_hud_panel_powerups_flip; +var float autocvar_hud_panel_powerups_iconalign; +var float autocvar_hud_panel_powerups_baralign; +var float autocvar_hud_panel_powerups_progressbar; + +var float autocvar_hud_panel_healtharmor; +var vector autocvar_hud_panel_healtharmor_pos; +var vector autocvar_hud_panel_healtharmor_size; +var string autocvar_hud_panel_healtharmor_bg; +var string autocvar_hud_panel_healtharmor_bg_color; +var string autocvar_hud_panel_healtharmor_bg_color_team; +var string autocvar_hud_panel_healtharmor_bg_alpha; +var string autocvar_hud_panel_healtharmor_bg_border; +var string autocvar_hud_panel_healtharmor_bg_padding; +var float autocvar_hud_panel_healtharmor_flip; +var float autocvar_hud_panel_healtharmor_iconalign; +var float autocvar_hud_panel_healtharmor_baralign; +var float autocvar_hud_panel_healtharmor_progressbar; + +var float autocvar_hud_panel_notify; +var vector autocvar_hud_panel_notify_pos; +var vector autocvar_hud_panel_notify_size; +var string autocvar_hud_panel_notify_bg; +var string autocvar_hud_panel_notify_bg_color; +var string autocvar_hud_panel_notify_bg_color_team; +var string autocvar_hud_panel_notify_bg_alpha; +var string autocvar_hud_panel_notify_bg_border; +var string autocvar_hud_panel_notify_bg_padding; +var float autocvar_hud_panel_notify_print; +var float autocvar_hud_panel_notify_time; +var float autocvar_hud_panel_notify_fadetime; +var float autocvar_hud_panel_notify_flip; + +var float autocvar_hud_panel_timer; +var vector autocvar_hud_panel_timer_pos; +var vector autocvar_hud_panel_timer_size; +var string autocvar_hud_panel_timer_bg; +var string autocvar_hud_panel_timer_bg_color; +var string autocvar_hud_panel_timer_bg_color_team; +var string autocvar_hud_panel_timer_bg_alpha; +var string autocvar_hud_panel_timer_bg_border; +var string autocvar_hud_panel_timer_bg_padding; +var float autocvar_hud_panel_timer_increment; + +var float autocvar_hud_panel_radar; +var vector autocvar_hud_panel_radar_pos; +var vector autocvar_hud_panel_radar_size; +var string autocvar_hud_panel_radar_bg; +var string autocvar_hud_panel_radar_bg_color; +var string autocvar_hud_panel_radar_bg_color_team; +var string autocvar_hud_panel_radar_bg_alpha; +var string autocvar_hud_panel_radar_bg_border; +var string autocvar_hud_panel_radar_bg_padding; + +var float autocvar_hud_panel_score; +var vector autocvar_hud_panel_score_pos; +var vector autocvar_hud_panel_score_size; +var string autocvar_hud_panel_score_bg; +var string autocvar_hud_panel_score_bg_color; +var string autocvar_hud_panel_score_bg_color_team; +var string autocvar_hud_panel_score_bg_alpha; +var string autocvar_hud_panel_score_bg_border; +var string autocvar_hud_panel_score_bg_padding; + +var float autocvar_hud_panel_racetimer; +var vector autocvar_hud_panel_racetimer_pos; +var vector autocvar_hud_panel_racetimer_size; +var string autocvar_hud_panel_racetimer_bg; +var string autocvar_hud_panel_racetimer_bg_color; +var string autocvar_hud_panel_racetimer_bg_color_team; +var string autocvar_hud_panel_racetimer_bg_alpha; +var string autocvar_hud_panel_racetimer_bg_border; +var string autocvar_hud_panel_racetimer_bg_padding; + +var float autocvar_hud_panel_vote; +var vector autocvar_hud_panel_vote_pos; +var vector autocvar_hud_panel_vote_size; +var string autocvar_hud_panel_vote_bg; +var string autocvar_hud_panel_vote_bg_color; +var string autocvar_hud_panel_vote_bg_color_team; +var string autocvar_hud_panel_vote_bg_alpha; +var string autocvar_hud_panel_vote_bg_border; +var string autocvar_hud_panel_vote_bg_padding; +var float autocvar_hud_panel_vote_alreadyvoted_alpha; + +var float autocvar_hud_panel_modicons; +var vector autocvar_hud_panel_modicons_pos; +var vector autocvar_hud_panel_modicons_size; +var string autocvar_hud_panel_modicons_bg; +var string autocvar_hud_panel_modicons_bg_color; +var string autocvar_hud_panel_modicons_bg_color_team; +var string autocvar_hud_panel_modicons_bg_alpha; +var string autocvar_hud_panel_modicons_bg_border; +var string autocvar_hud_panel_modicons_bg_padding; + +var float autocvar_hud_panel_pressedkeys; +var vector autocvar_hud_panel_pressedkeys_pos; +var vector autocvar_hud_panel_pressedkeys_size; +var string autocvar_hud_panel_pressedkeys_bg; +var string autocvar_hud_panel_pressedkeys_bg_color; +var string autocvar_hud_panel_pressedkeys_bg_color_team; +var string autocvar_hud_panel_pressedkeys_bg_alpha; +var string autocvar_hud_panel_pressedkeys_bg_border; +var string autocvar_hud_panel_pressedkeys_bg_padding; +var float autocvar_hud_panel_pressedkeys_aspect; + +var float autocvar_hud_panel_chat; +var vector autocvar_hud_panel_chat_pos; +var vector autocvar_hud_panel_chat_size; +var string autocvar_hud_panel_chat_bg; +var string autocvar_hud_panel_chat_bg_color; +var string autocvar_hud_panel_chat_bg_color_team; +var string autocvar_hud_panel_chat_bg_alpha; +var string autocvar_hud_panel_chat_bg_border; +var string autocvar_hud_panel_chat_bg_padding; + +var float autocvar_hud_panel_engineinfo; +var vector autocvar_hud_panel_engineinfo_pos; +var vector autocvar_hud_panel_engineinfo_size; +var string autocvar_hud_panel_engineinfo_bg; +var string autocvar_hud_panel_engineinfo_bg_color; +var string autocvar_hud_panel_engineinfo_bg_color_team; +var string autocvar_hud_panel_engineinfo_bg_alpha; +var string autocvar_hud_panel_engineinfo_bg_border; +var string autocvar_hud_panel_engineinfo_bg_padding; + +var float autocvar_hud_panel_infomessages; +var vector autocvar_hud_panel_infomessages_pos; +var vector autocvar_hud_panel_infomessages_size; +var string autocvar_hud_panel_infomessages_bg; +var string autocvar_hud_panel_infomessages_bg_color; +var string autocvar_hud_panel_infomessages_bg_color_team; +var string autocvar_hud_panel_infomessages_bg_alpha; +var string autocvar_hud_panel_infomessages_bg_border; +var string autocvar_hud_panel_infomessages_bg_padding; +var float autocvar_hud_panel_infomessages_flip; diff --git a/qcsrc/client/gibs.qc b/qcsrc/client/gibs.qc index a92567e619..f395fb6a7b 100644 --- a/qcsrc/client/gibs.qc +++ b/qcsrc/client/gibs.qc @@ -151,16 +151,16 @@ void Ent_GibSplash(float isNew) org_z = ReadShort() * 4 + 2; vel = decompressShortVector(ReadShort()); - if(cvar("cl_gentle")) + if(cvar("cl_gentle_gibs") || cvar("cl_gentle")) type |= 0x80; // set gentle bit if(type & 0x80) { - if(cvar("cl_gentle") == 2) + if(cvar("cl_gentle_gibs") == 2) gentle_prefix = ""; - else if(cvar("cl_gentle") == 3) + else if(cvar("cl_gentle_gibs") == 3) gentle_prefix = "happy_"; - else if(cvar("cl_gentle")) + else gentle_prefix = "morphed_"; } else if(cvar("cl_particlegibs")) @@ -169,7 +169,7 @@ void Ent_GibSplash(float isNew) gentle_prefix = "particlegibs_"; } - if not(cvar("cl_gentle")) + if not(cvar("cl_gentle_gibs") || cvar("cl_gentle")) amount *= 1 - cvar("cl_nogibs"); if(cvar("ekg")) diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 1b8b2366e0..8b1d5b450a 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -14,6 +14,13 @@ Misc HUD functions // 1/4 height: bottom part void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector theColor, float theAlpha, vector theBorderSize) { + if (theBorderSize_x <= 0 && theBorderSize_y <= 0) // no border + { + // draw only the central part + drawsubpic(theOrigin, theSize, pic, '0.25 0.25 0', '0.5 0.5 0', theColor, theAlpha, 0); + return; + } + vector dX, dY; vector width, height; vector bW, bH; @@ -75,170 +82,6 @@ void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector the } } -// drawpic wrapper to draw an image as large as possible with preserved aspect ratio into a box -void drawpic_aspect(vector pos, string pic, vector sz, vector color, float alpha, float drawflag) { - vector imgsize; - imgsize = drawgetimagesize(pic); - float imgaspect; - imgaspect = imgsize_x/imgsize_y; - - vector oldsz; - oldsz = sz; - float aspect; - aspect = sz_x/sz_y; - - if(aspect > imgaspect) { - sz_x = sz_y * imgaspect; - drawpic(pos + eX * (oldsz_x - sz_x) * 0.5, pic, sz, color, alpha, drawflag); - } else { - sz_y = sz_x / imgaspect; - drawpic(pos + eY * (oldsz_y - sz_y) * 0.5, pic, sz, color, alpha, drawflag); - } -} - -// draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga -void drawpic_skin(vector pos, string pic, vector sz, vector color, float alpha, float drawflag) { - 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); -} - -void drawpic_skin_expanding_two(vector pos, string pic, vector sz, vector rgb, float alpha, float flag, float fadelerp) { - drawpic_expanding_two(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, rgb, alpha, flag, fadelerp); -} - -// return HUD background color -vector HUD_GetBgColor() -{ - vector color; - if (teamplay) - GetTeamRGB(myteam) * hud_color_bg_team; - else { - // allow custom HUD colors in non-teamgames - color_x = cvar("hud_color_bg_r"); - color_y = cvar("hud_color_bg_g"); - color_z = cvar("hud_color_bg_b"); - } - return color; -} - -// return accuracy text color -vector HUD_AccuracyColor(float accuracy) -{ - vector rgb; - float yellow_accuracy = cvar("hud_weaponicons_accuracy_yellow"); // value at which this function returns yellow - if(accuracy >= 100) { - rgb_x = 0; - rgb_y = 1; - } - else if(accuracy > yellow_accuracy) { - rgb_x = 1 - (accuracy-yellow_accuracy)/(100-yellow_accuracy); // red value between 1 -> 0 - rgb_y = 1; - } - else { - rgb_x = 1; - rgb_y = accuracy/yellow_accuracy; // green value between 0 -> 1 - } - rgb_z = 0; - return rgb; -} - -// draw number in the XSCALE font -void HUD_DrawXNum (vector pos, float num, float digits, float showsign, float lettersize, vector rgb, float highlighted, float stroke, float alpha, float dflags) -{ - float l, i; - string str, tmp, l_length; - float minus, plus; - vector vsize, num_color; - - vsize_x = vsize_y = lettersize; - vsize_z = 0; - - // showsign 1: always prefix with minus sign (useful in race distribution display) - // showsign 2: always prefix with plus sign (useful in race distribution display) - // showsign 3: prefix with minus sign if negative, plus sign if positive (useful in score distribution display) - - if((showsign == 2 && num >= 0) || (num > 0 && showsign == 3)) - { - plus = true; - pos_x -= lettersize; - } else - plus = false; - - if(num < 0 || (num < 0 && showsign == 3) || (showsign == 1 && num <= 0)) - { - minus = true; - num = -num; - pos_x -= lettersize; - } else - minus = false; - - if(digits < 0) - { - tmp = ftos(num); - digits = -digits; - str = strcat(substring("0000000000", 0, digits - strlen(tmp)), tmp); - } else - str = ftos(num); - - l = strlen(str); - l_length = ftos(l); - - if(l > digits) - { - str = substring(str, l-digits, 999); - l = strlen(str); - } else if(l < digits) - pos_x += (digits-l) * lettersize; - - if (highlighted == 1) { - vector hl_size; - hl_size_x = vsize_x * l + vsize_x * 0.2; - hl_size_y = vsize_y * 1.1; - hl_size_z = 0; - if(minus) - hl_size_x = hl_size_x + vsize_x; - - vector hl_pos; - hl_pos_x = pos_x - lettersize/10; - hl_pos_y = pos_y - lettersize/20; - hl_pos_z = 0; - - drawpic_skin(hl_pos, strcat("num_leading_", l_length), hl_size, '1 1 1', alpha, dflags); - } - - if (stroke == 1) - num_color = '1 1 1'; - else - num_color = rgb; - - if(minus) - { - if (stroke == 1) - drawpic_skin(pos, "num_minus_stroke", vsize, rgb, alpha, dflags); - drawpic_skin(pos, "num_minus", vsize, num_color, alpha, dflags); - pos_x += lettersize; - } else if(plus) - { - if (stroke == 1) - drawpic_skin(pos, "num_plus_stroke", vsize, rgb, alpha, dflags); - drawpic_skin(pos, "num_plus", vsize, num_color, alpha, dflags); - pos_x += lettersize; - } - - for(i = 0; i < l; ++i) - { - tmp = substring(str, i, 1); - if (stroke == 1) - drawpic_skin(pos, strcat("num_", tmp, "_stroke"), vsize, rgb, alpha, dflags); - drawpic_skin(pos, strcat("num_", tmp), vsize, num_color, alpha, dflags); - pos_x += lettersize; - } -} - vector HUD_Get_Num_Color (float x, float maxvalue) { vector color; @@ -274,13 +117,6 @@ vector HUD_Get_Num_Color (float x, float maxvalue) } return color; } -// color the number differently based on how big it is (used in the health/armor panel) -void HUD_DrawXNum_Colored (vector pos, float x, float digits, float lettersize, float alpha) -{ - vector color; - color = HUD_Get_Num_Color (x, 200); - HUD_DrawXNum(pos, x, digits, 0, lettersize, color, 0, 0, alpha, DRAWFLAG_NORMAL); -} float stringwidth_colors(string s, vector theSize) { @@ -462,7 +298,6 @@ void HUD_DrawCenterPrint (void) ts = centerprint_messages[i]; if (ts != "") { - dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0) drawcolorcodedstring(pos, ts, centerprint_fontsize, a, DRAWFLAG_NORMAL); // - '0 0.5 0' * (sz - 1) * centerprint_fontsize_x - '0.5 0 0' * (sz - 1) * centerprint_width[i] * centerprint_fontsize_y, centerprint_fontsize * sz pos_y = pos_y + centerprint_fontsize_y; @@ -582,7 +417,7 @@ HUD panels void HUD_Panel_ExportCfg(string cfgname) { float fh; - fh = fopen(strcat("hud_", cvar_string("hud_skin"), "_", cfgname, ".cfg"), FILE_WRITE); + fh = fopen(strcat("hud_", autocvar_hud_skin, "_", cfgname, ".cfg"), FILE_WRITE); if(fh >= 0) { fputs(fh, strcat("seta hud_skin \"", cvar_string("hud_skin"), "\"", "\n")); @@ -598,10 +433,10 @@ void HUD_Panel_ExportCfg(string cfgname) fputs(fh, strcat("seta hud_dock \"", cvar_string("hud_dock"), "\"", "\n")); fputs(fh, strcat("seta hud_dock_color \"", cvar_string("hud_dock_color"), "\"", "\n")); fputs(fh, strcat("seta hud_dock_color_team \"", cvar_string("hud_dock_color_team"), "\"", "\n")); - fputs(fh, strcat("seta hud_dock_alpha \"", ftos(cvar("hud_dock_alpha")), "\"", "\n")); + fputs(fh, strcat("seta hud_dock_alpha \"", cvar_string("hud_dock_alpha"), "\"", "\n")); fputs(fh, "\n"); - fputs(fh, strcat("seta hud_progressbar_alpha ", ftos(cvar("hud_progressbar_alpha")), "\n")); + fputs(fh, strcat("seta hud_progressbar_alpha \"", cvar_string("hud_progressbar_alpha"), "\"", "\n")); fputs(fh, strcat("seta hud_progressbar_strength_color \"", cvar_string("hud_progressbar_strength_color"), "\"", "\n")); fputs(fh, strcat("seta hud_progressbar_shield_color \"", cvar_string("hud_progressbar_shield_color"), "\"", "\n")); fputs(fh, strcat("seta hud_progressbar_health_color \"", cvar_string("hud_progressbar_health_color"), "\"", "\n")); @@ -610,296 +445,144 @@ void HUD_Panel_ExportCfg(string cfgname) fputs(fh, strcat("seta hud_progressbar_nexball_color \"", cvar_string("hud_progressbar_nexball_color"), "\"", "\n")); fputs(fh, "\n"); + fputs(fh, strcat("seta _hud_panelorder \"", cvar_string("_hud_panelorder"), "\"", "\n")); + fputs(fh, "\n"); + + fputs(fh, strcat("seta hud_configure_grid \"", cvar_string("hud_configure_grid"), "\"", "\n")); + fputs(fh, strcat("seta hud_configure_grid_xsize \"", cvar_string("hud_configure_grid_xsize"), "\"", "\n")); + fputs(fh, strcat("seta hud_configure_grid_ysize \"", cvar_string("hud_configure_grid_ysize"), "\"", "\n")); + fputs(fh, "\n"); + // common cvars for all panels float i; for (i = 0; i < HUD_PANEL_NUM; ++i) { - fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), " ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i)))), "\n")); - fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_pos \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_pos")), "\"", "\n")); - fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_size \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_size")), "\"", "\n")); - fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg")), "\"", "\n")); - fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_color \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_color")), "\"", "\n")); - fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_color_team \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_color_team")), "\"", "\n")); - fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_alpha \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_alpha")), "\"", "\n")); - fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_border \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_border")), "\"", "\n")); - fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_padding \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_padding")), "\"", "\n")); + HUD_Panel_GetName(i) + + fputs(fh, strcat("seta hud_panel_", panel_name, " ", cvar_string(strcat("hud_panel_", panel_name)), "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_pos \"", cvar_string(strcat("hud_panel_", panel_name, "_pos")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_size \"", cvar_string(strcat("hud_panel_", panel_name, "_size")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_bg \"", cvar_string(strcat("hud_panel_", panel_name, "_bg")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_bg_color \"", cvar_string(strcat("hud_panel_", panel_name, "_bg_color")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_bg_color_team \"", cvar_string(strcat("hud_panel_", panel_name, "_bg_color_team")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_bg_alpha \"", cvar_string(strcat("hud_panel_", panel_name, "_bg_alpha")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_bg_border \"", cvar_string(strcat("hud_panel_", panel_name, "_bg_border")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_bg_padding \"", cvar_string(strcat("hud_panel_", panel_name, "_bg_padding")), "\"", "\n")); switch(i) { - case 0: - fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_accuracy_yellow ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_accuracy_yellow"))), "\n")); + case HUD_PANEL_WEAPONS: + fputs(fh, strcat("seta hud_panel_", panel_name, "_complainbubble \"", cvar_string(strcat("hud_panel_", panel_name, "_complainbubble")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_complainbubble_padding \"", cvar_string(strcat("hud_panel_", panel_name, "_complainbubble_padding")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_complainbubble_color_outofammo \"", cvar_string(strcat("hud_panel_", panel_name, "_complainbubble_color_outofammo")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_complainbubble_color_donthave \"", cvar_string(strcat("hud_panel_", panel_name, "_complainbubble_color_donthave")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_complainbubble_color_unavailable \"", cvar_string(strcat("hud_panel_", panel_name, "_complainbubble_color_unavailable")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_ammo_color \"", cvar_string(strcat("hud_panel_", panel_name, "_ammo_color")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_ammo_alpha \"", cvar_string(strcat("hud_panel_", panel_name, "_ammo_alpha")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_aspect \"", cvar_string(strcat("hud_panel_", panel_name, "_ammo_alpha")), "\"", "\n")); break; - case 1: - fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_onlycurrent ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_onlycurrent"))), "\n")); + case HUD_PANEL_AMMO: + fputs(fh, strcat("seta hud_panel_", panel_name, "_onlycurrent \"", cvar_string(strcat("hud_panel_", panel_name, "_onlycurrent")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_iconalign \"", cvar_string(strcat("hud_panel_", panel_name, "_iconalign")), "\"", "\n")); break; - case 2: - fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_flip ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_flip"))), "\n")); - fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_mirror ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_mirror"))), "\n")); + case HUD_PANEL_POWERUPS: + fputs(fh, strcat("seta hud_panel_", panel_name, "_flip \"", cvar_string(strcat("hud_panel_", panel_name, "_flip")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_iconalign \"", cvar_string(strcat("hud_panel_", panel_name, "_iconalign")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_baralign \"", cvar_string(strcat("hud_panel_", panel_name, "_baralign")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_progressbar \"", cvar_string(strcat("hud_panel_", panel_name, "_progressbar")), "\"", "\n")); break; - case 3: - fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_flip ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_flip"))), "\n")); - fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_mirror ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_mirror"))), "\n")); + case HUD_PANEL_HEALTHARMOR: + fputs(fh, strcat("seta hud_panel_", panel_name, "_flip \"", cvar_string(strcat("hud_panel_", panel_name, "_flip")), "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_iconalign \"", cvar_string(strcat("hud_panel_", panel_name, "_iconalign")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_baralign \"", cvar_string(strcat("hud_panel_", panel_name, "_baralign")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_progressbar \"", cvar_string(strcat("hud_panel_", panel_name, "_progressbar")), "\"", "\n")); break; - case 4: - fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_flip ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_flip"))), "\n")); - fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_info_top ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_info_top"))), "\n")); + case HUD_PANEL_NOTIFY: + fputs(fh, strcat("seta hud_panel_", panel_name, "_flip \"", cvar_string(strcat("hud_panel_", panel_name, "_flip")), "\"", "\n")); + fputs(fh, strcat("seta hud_panel_", panel_name, "_print \"", cvar_string(strcat("hud_panel_", panel_name, "_print")), "\"", "\n")); break; - case 6: - fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_foreground_alpha ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_foreground_alpha"))), "\n")); - case 9: - fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_alreadyvoted_alpha ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_alreadyvoted_alpha"))), "\n")); + case HUD_PANEL_RADAR: + fputs(fh, strcat("seta hud_panel_", panel_name, "_foreground_alpha \"", cvar_string(strcat("hud_panel_", panel_name, "_foreground_alpha")), "\"", "\n")); + break; + case HUD_PANEL_VOTE: + fputs(fh, strcat("seta hud_panel_", panel_name, "_alreadyvoted_alpha \"", cvar_string(strcat("hud_panel_", panel_name, "_alreadyvoted_alpha")), "\"", "\n")); + break; + case HUD_PANEL_PRESSEDKEYS: + fputs(fh, strcat("seta hud_panel_", panel_name, "_aspect \"", cvar_string(strcat("hud_panel_", panel_name, "_aspect")), "\"", "\n")); break; } fputs(fh, "\n"); } + fputs(fh, strcat("menu_restart", "\n")); // force a menu update when execing config, so that the dialogs are updated - print("^2Successfully exported to hud_", cvar_string("hud_skin"), "_", cfgname, ".cfg! (Note: It's saved in data/data/)\n"); + print("^2Successfully exported to hud_", autocvar_hud_skin, "_", cfgname, ".cfg! (Note: It's saved in data/data/)\n"); } fclose(fh); } -// return active status of panel -float HUD_Panel_CheckActive(float id) -{ - if (cvar_or(strcat("hud_", HUD_Panel_GetName(id)), 1)) - return 1; - return 0; -} - -// return size of given panel -vector HUD_Panel_GetSize(float id) -{ - vector mySize; - mySize = stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_size"))); - - mySize = eX * mySize_x * vid_conwidth + eY * mySize_y * vid_conheight; - - if(disable_menu_alphacheck == 2 && id == highlightedPanel) - { - vector menu_enable_maxsize, menu_enable_size; - menu_enable_maxsize = '0 0 0'; // shut up FTEQCC - menu_enable_maxsize_x = 0.3 * vid_conwidth; - menu_enable_maxsize_y = 0.18 * vid_conheight; - if(mySize_x > mySize_y) - { - if(mySize_y > menu_enable_maxsize_y) - { - menu_enable_size_y = menu_enable_maxsize_y; - menu_enable_size_x = mySize_x * (menu_enable_maxsize_y/mySize_y); - mySize = (1 - cvar("_menu_alpha")) * mySize + (cvar("_menu_alpha")) * menu_enable_size; - } - } - else - { - if(mySize_x > menu_enable_maxsize_x) - { - menu_enable_size_x = menu_enable_maxsize_x; - menu_enable_size_y = mySize_y * (menu_enable_maxsize_x/mySize_x); - mySize = (1 - cvar("_menu_alpha")) * mySize + (cvar("_menu_alpha")) * menu_enable_size; - } - } - } - return mySize; -} - -// return pos of given panel -vector HUD_Panel_GetPos(float id) +const float hlBorderSize = 4; +const string hlBorder = "gfx/hud/default/border_highlighted"; +const string hlBorder2 = "gfx/hud/default/border_highlighted2"; +void HUD_Panel_HlBorder(float myBorder, vector color, float alpha) { - vector pos; - pos = stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_pos"))); - - pos = eX * pos_x * vid_conwidth + eY * pos_y * vid_conheight; - - if(disable_menu_alphacheck == 2 && id == highlightedPanel) - { - vector mySize, menu_enable_panelpos; - mySize = HUD_Panel_GetSize(id); - if(mySize_x > mySize_y) - menu_enable_panelpos = eX * 0.5 * vid_conwidth - eX * 0.5 * mySize_x + eY * 0.82 * vid_conheight; - else - menu_enable_panelpos = eY * 0.5 * vid_conheight - eY * 0.5 * mySize_y + eX * 0.7 * vid_conwidth; - pos = (1 - cvar("_menu_alpha")) * pos + (cvar("_menu_alpha")) * menu_enable_panelpos; - } - return pos; + drawfill(panel_pos - '1 1 0' * myBorder, panel_size + '2 2 0' * myBorder, '0 0.5 1', .5 * alpha, DRAWFLAG_NORMAL); + drawpic_tiled(panel_pos - '1 1 0' * myBorder, hlBorder, '8 1 0' * hlBorderSize, eX * (panel_size_x + 2 * myBorder) + eY * hlBorderSize, color, alpha, DRAWFLAG_NORMAL); + drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * (panel_size_y + 2 * myBorder - hlBorderSize), hlBorder, '8 1 0' * hlBorderSize, eX * (panel_size_x + 2 * myBorder) + eY * hlBorderSize, color, alpha, DRAWFLAG_NORMAL); + drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * hlBorderSize, hlBorder2, '1 8 0' * hlBorderSize, eY * (panel_size_y + 2 * myBorder - 2 * hlBorderSize) + eX * hlBorderSize, color, alpha, DRAWFLAG_NORMAL); + drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * hlBorderSize + eX * (panel_size_x + 2 * myBorder - hlBorderSize), hlBorder2, '1 8 0' * hlBorderSize, eY * (panel_size_y + 2 * myBorder - 2 * hlBorderSize) + eX * hlBorderSize, color, alpha, DRAWFLAG_NORMAL); } -float HUD_Panel_GetBorder(float id) -{ - string border; - border = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_border")); - if(border == "") - border = cvar_string("hud_bg_border"); - return stof(border); -} +// draw the background/borders +#define HUD_Panel_DrawBg(alpha)\ +if(panel_bg != "0")\ + draw_BorderPicture(panel_pos - '1 1 0' * panel_bg_border, panel_bg, panel_size + '1 1 0' * 2 * panel_bg_border, panel_bg_color, panel_bg_alpha * alpha, '1 1 0' * (panel_bg_border/BORDER_MULTIPLIER));\ +if(highlightedPanel_prev == active_panel && autocvar__hud_configure)\ + HUD_Panel_HlBorder(panel_bg_border + 1.5 * hlBorderSize, '0 0.5 1', 0.25 * (1 - autocvar__menu_alpha) * alpha); -vector HUD_Panel_GetColor(float id) +void HUD_Panel_DrawProgressBar(vector pos, float vertical, vector mySize, vector color, float alpha, float drawflag) { - float f; - vector color_vec; - string color; + if(!alpha) + return; - // fetch per-panel color - if(teamplay && cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_color_team")) != "") { - f = stof(getplayerkey(self.sv_entnum, "colors")); - color = vtos(colormapPaletteColor(mod(f, 16), 1) * cvar(strcat("hud_", HUD_Panel_GetName(id), "_bg_color_team"))); - } - else - color = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_color")); - color_vec = stov(color); - - if(color == "") { // fetch default color - color = cvar_string("hud_bg_color"); - color_vec = stov(color); - if(teamplay && cvar(strcat("hud_bg_color_team"))) { - f = stof(getplayerkey(self.sv_entnum, "colors")); - color_vec = colormapPaletteColor(mod(f, 16), 1) * cvar("hud_bg_color_team"); - } - else if(color == "shirt") { - f = stof(getplayerkey(self.sv_entnum, "colors")); - color_vec = colormapPaletteColor(floor(f / 16), 0); + string pic; + if(vertical) { + pic = strcat(hud_skin_path, "/statusbar_vertical"); + if(precache_pic(pic) == "") { + pic = "gfx/hud/default/statusbar_vertical"; } - else if(color == "pants") { - f = stof(getplayerkey(self.sv_entnum, "colors")); - color_vec = colormapPaletteColor(mod(f, 16), 1); + drawsubpic(pos, eY * min(mySize_y * 0.5, mySize_x) + eX * mySize_x, pic, '0 0 0', '1 0.25 0', color, alpha, drawflag); + if(mySize_y/mySize_x > 2) + drawsubpic(pos + eY * mySize_x, eY * (mySize_y - 2 * mySize_x) + eX * mySize_x, pic, '0 0.25 0', '1 0.5 0', color, alpha, drawflag); + drawsubpic(pos + eY * mySize_y - eY * min(mySize_y * 0.5, mySize_x), eY * min(mySize_y * 0.5, mySize_x) + eX * mySize_x, pic, '0 0.75 0', '1 0.25 0', color, alpha, drawflag); + } else { + pic = strcat(hud_skin_path, "/statusbar"); + if(precache_pic(pic) == "") { + pic = "gfx/hud/default/statusbar"; } + drawsubpic(pos, eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, pic, '0 0 0', '0.25 1 0', color, alpha, drawflag); + if(mySize_x/mySize_y > 2) + drawsubpic(pos + eX * mySize_y, eX * (mySize_x - 2 * mySize_y) + eY * mySize_y, pic, '0.25 0 0', '0.5 1 0', color, alpha, drawflag); + drawsubpic(pos + eX * mySize_x - eX * min(mySize_x * 0.5, mySize_y), eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, pic, '0.75 0 0', '0.25 1 0', color, alpha, drawflag); } - else if(color == "shirt") { - f = stof(getplayerkey(self.sv_entnum, "colors")); - color_vec = colormapPaletteColor(floor(f / 16), 0); - } - else if(color == "pants") { - f = stof(getplayerkey(self.sv_entnum, "colors")); - color_vec = colormapPaletteColor(mod(f, 16), 1); - } - return color_vec; -} - -vector HUD_Panel_Dock_GetColor(void) -{ - float f; - vector color_vec; - string color; - color = cvar_string("hud_dock_color"); - color_vec = stov(color); - if(teamplay && cvar(strcat("hud_dock_color_team"))) { - f = stof(getplayerkey(self.sv_entnum, "colors")); - color_vec = colormapPaletteColor(mod(f, 16), 1) * cvar("hud_dock_color_team"); - } - else if(color == "shirt") { - f = stof(getplayerkey(self.sv_entnum, "colors")); - color_vec = colormapPaletteColor(floor(f / 16), 0); - } - else if(color == "pants") { - f = stof(getplayerkey(self.sv_entnum, "colors")); - color_vec = colormapPaletteColor(mod(f, 16), 1); - } - return color_vec; -} - -float HUD_Panel_GetBgAlpha(float id) -{ - string alpha; - alpha = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_alpha")); - if(alpha == "") - alpha = cvar_string("hud_bg_alpha"); - - if(hud_configure && disable_menu_alphacheck == 2 && highlightedPanel == id) // do not set a minalpha cap when showing the config dialog for this panel - alpha = ftos((1 - cvar("_menu_alpha")) * max(cvar("hud_configure_bg_minalpha"), stof(alpha)) + (cvar("_menu_alpha")) * stof(alpha)); - else if(hud_configure) - alpha = ftos(max(cvar("hud_configure_bg_minalpha"), stof(alpha))); - - if(hud_configure && !cvar(strcat("hud_", HUD_Panel_GetName(id)))) // ALWAYS show disabled panels at 0.25 alpha when in config mode - return 0.25; - - if(disable_menu_alphacheck == 2 && highlightedPanel == id) // don't fade this panel when showing the panel-specific menu dialog - return stof(alpha); - else - return stof(alpha) * menu_fade_alpha; } -float HUD_Panel_GetFgAlpha(float id) +void HUD_Panel_DrawHighlight(vector pos, vector mySize, vector color, float alpha, float drawflag) { - float alpha; - alpha = hud_fg_alpha; - - if(hud_configure && !cvar(strcat("hud_", HUD_Panel_GetName(id)))) // ALWAYS show disabled panels at 0.25 alpha when in config mode - return 0.25; - - if(disable_menu_alphacheck == 2 && highlightedPanel == id) // don't fade this panel when showing the panel-specific menu dialog - return alpha; - else - return alpha * menu_fade_alpha; -} - -float HUD_Panel_GetPadding(float id) -{ - string padding; - padding = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_padding")); - if(padding == "") - padding = cvar_string("hud_bg_padding"); - - vector mySize; - mySize = HUD_Panel_GetSize(id); - float smallestsize; - smallestsize = min(mySize_x, mySize_y); - return min(smallestsize/2 - 5, stof(padding)); -} - -// draw the background/borders -void HUD_Panel_DrawBg(float id, vector pos, vector mySize, float alpha) -{ - if(!hud_configure && cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg")) == "0") + if(!alpha) return; - string bg; - bg = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg")); - if(bg == "") - bg = cvar_string("hud_bg"); - - if(bg == "0" && hud_configure) { - bg = "border"; // we probably want to see a background in config mode at all times... - } - - if(bg != "0") - { - float border; - border = max(0.0000001, HUD_Panel_GetBorder(id)); // draw_BorderPicture does not like border = 0 - - vector color; - color = HUD_Panel_GetColor(id); - - if(alpha) - alpha = HUD_Panel_GetBgAlpha(id) * alpha; // allow panels to fade in/out by passing an alpha value - else - alpha = HUD_Panel_GetBgAlpha(id); - - draw_BorderPicture(pos - '1 1 0' * border, strcat("gfx/hud/", cvar_string("hud_skin"), "/", bg), mySize + '1 1 0' * 2 * border, color, alpha, '1 1 0' * (border/BORDER_MULTIPLIER)); - } -} - -void HUD_Panel_DrawProgressBar(vector pos, float vertical, vector mySize, vector color, float alpha, float drawflag) -{ -//float drawsubpic(vector position, vector size, string pic, vector srcPosition, vector srcSize, vector rgb, float alpha, float flag) = #328; string pic; - pic = strcat("gfx/hud/", cvar_string("hud_skin"), "/"); - if(vertical) { - drawsubpic(pos, eY * min(mySize_y * 0.5, mySize_x) + eX * mySize_x, strcat(pic, "statusbar_vertical"), '0 0 0', '1 0.25 0', color, alpha, drawflag); - if(mySize_y/mySize_x > 2) - drawsubpic(pos + eY * mySize_x, eY * (mySize_y - 2 * mySize_x) + eX * mySize_x, strcat(pic, "statusbar_vertical"), '0 0.25 0', '1 0.5 0', color, alpha, drawflag); - drawsubpic(pos + eY * mySize_y - eY * min(mySize_y * 0.5, mySize_x), eY * min(mySize_y * 0.5, mySize_x) + eX * mySize_x, strcat(pic, "statusbar_vertical"), '0 0.75 0', '1 0.25 0', color, alpha, drawflag); - } else { - drawsubpic(pos, eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, strcat(pic, "statusbar"), '0 0 0', '0.25 1 0', color, alpha, drawflag); - if(mySize_x/mySize_y > 2) - drawsubpic(pos + eX * mySize_y, eX * (mySize_x - 2 * mySize_y) + eY * mySize_y, strcat(pic, "statusbar"), '0.25 0 0', '0.5 1 0', color, alpha, drawflag); - drawsubpic(pos + eX * mySize_x - eX * min(mySize_x * 0.5, mySize_y), eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, strcat(pic, "statusbar"), '0.75 0 0', '0.25 1 0', color, alpha, drawflag); + pic = strcat(hud_skin_path, "/num_leading"); + if(precache_pic(pic) == "") { + pic = "gfx/hud/default/num_leading"; } -} -vector HUD_Panel_GetProgressBarColor(string item) -{ - return stov(cvar_string(strcat("hud_progressbar_", item, "_color"))); + drawsubpic(pos, eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, pic, '0 0 0', '0.25 1 0', color, alpha, drawflag); + if(mySize_x/mySize_y > 2) + drawsubpic(pos + eX * mySize_y, eX * (mySize_x - 2 * mySize_y) + eY * mySize_y, pic, '0.25 0 0', '0.5 1 0', color, alpha, drawflag); + drawsubpic(pos + eX * mySize_x - eX * min(mySize_x * 0.5, mySize_y), eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, pic, '0.75 0 0', '0.25 1 0', color, alpha, drawflag); } // check if move will result in panel being moved into another panel. If so, return snapped vector, otherwise return the given vector -vector HUD_Panel_CheckMove(float id, vector myPos, vector mySize) +vector HUD_Panel_CheckMove(vector myPos, vector mySize) { float i; @@ -914,20 +597,22 @@ vector HUD_Panel_CheckMove(float id, vector myPos, vector mySize) targCenter = '0 0 0'; // shut up fteqcc, there IS a reference for (i = 0; i < HUD_PANEL_NUM; ++i) { - if(i == id || !HUD_Panel_CheckActive(i)) + if(i == highlightedPanel || !panel_enabled) continue; - targPos = HUD_Panel_GetPos(i) - '1 1 0' * HUD_Panel_GetBorder(id); - targSize = HUD_Panel_GetSize(i) + '2 2 0' * HUD_Panel_GetBorder(id); + HUD_Panel_UpdatePosSizeForId(i) - if(myPos_y + mySize_y < targPos_y) + panel_pos -= '1 1 0' * panel_bg_border; + panel_size += '2 2 0' * panel_bg_border; + + if(myPos_y + mySize_y < panel_pos_y) continue; - if(myPos_y > targPos_y + targSize_y) + if(myPos_y > panel_pos_y + panel_size_y) continue; - if(myPos_x + mySize_x < targPos_x) + if(myPos_x + mySize_x < panel_pos_x) continue; - if(myPos_x > targPos_x + targSize_x) + if(myPos_x > panel_pos_x + panel_size_x) continue; // OK, there IS a collision. @@ -935,97 +620,106 @@ vector HUD_Panel_CheckMove(float id, vector myPos, vector mySize) myCenter_x = myPos_x + 0.5 * mySize_x; myCenter_y = myPos_y + 0.5 * mySize_y; - targCenter_x = targPos_x + 0.5 * targSize_x; - targCenter_y = targPos_y + 0.5 * targSize_y; + targCenter_x = panel_pos_x + 0.5 * panel_size_x; + targCenter_y = panel_pos_y + 0.5 * panel_size_y; if(myCenter_x < targCenter_x && myCenter_y < targCenter_y) // top left (of the target panel) { - if(myPos_x + mySize_x - targPos_x < myPos_y + mySize_y - targPos_y) // push it to the side - myTarget_x = targPos_x - mySize_x; + if(myPos_x + mySize_x - panel_pos_x < myPos_y + mySize_y - panel_pos_y) // push it to the side + myTarget_x = panel_pos_x - mySize_x; else // push it upwards - myTarget_y = targPos_y - mySize_y; + myTarget_y = panel_pos_y - mySize_y; } else if(myCenter_x > targCenter_x && myCenter_y < targCenter_y) // top right { - if(targPos_x + targSize_x - myPos_x < myPos_y + mySize_y - targPos_y) // push it to the side - myTarget_x = targPos_x + targSize_x; + if(panel_pos_x + panel_size_x - myPos_x < myPos_y + mySize_y - panel_pos_y) // push it to the side + myTarget_x = panel_pos_x + panel_size_x; else // push it upwards - myTarget_y = targPos_y - mySize_y; + myTarget_y = panel_pos_y - mySize_y; } else if(myCenter_x < targCenter_x && myCenter_y > targCenter_y) // bottom left { - if(myPos_x + mySize_x - targPos_x < targPos_y + targSize_y - myPos_y) // push it to the side - myTarget_x = targPos_x - mySize_x; + if(myPos_x + mySize_x - panel_pos_x < panel_pos_y + panel_size_y - myPos_y) // push it to the side + myTarget_x = panel_pos_x - mySize_x; else // push it downwards - myTarget_y = targPos_y + targSize_y; + myTarget_y = panel_pos_y + panel_size_y; } else if(myCenter_x > targCenter_x && myCenter_y > targCenter_y) // bottom right { - if(targPos_x + targSize_x - myPos_x < targPos_y + targSize_y - myPos_y) // push it to the side - myTarget_x = targPos_x + targSize_x; + if(panel_pos_x + panel_size_x - myPos_x < panel_pos_y + panel_size_y - myPos_y) // push it to the side + myTarget_x = panel_pos_x + panel_size_x; else // push it downwards - myTarget_y = targPos_y + targSize_y; + myTarget_y = panel_pos_y + panel_size_y; } + if(cvar("hud_configure_checkcollisions_debug")) + drawfill(panel_pos, panel_size, '1 1 0', .3, DRAWFLAG_NORMAL); } return myTarget; } -void HUD_Panel_SetPos(float id, vector pos) +void HUD_Panel_SetPos(vector pos) { - vector oldPos; - oldPos = HUD_Panel_GetPos(id); - + HUD_Panel_UpdatePosSizeForId(highlightedPanel) vector mySize; - mySize = HUD_Panel_GetSize(id); + mySize = panel_size; - if(cvar("hud_configure_checkcollisions")) - pos = HUD_Panel_CheckMove(id, pos, mySize); - - pos_x = bound(0, pos_x, vid_conwidth - mySize_x); - pos_y = bound(0, pos_y, vid_conheight - mySize_y); + if(cvar("hud_configure_checkcollisions_debug")) + drawfill(pos, mySize, '1 1 1', .2, DRAWFLAG_NORMAL); - if(cvar("hud_configure_grid")) + if(autocvar_hud_configure_grid) { - 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; + pos_x = floor((pos_x/vid_conwidth)/bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) * vid_conwidth; + pos_y = floor((pos_y/vid_conheight)/bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) * vid_conheight; } + if(hud_configure_checkcollisions) + pos = HUD_Panel_CheckMove(pos, mySize); + + pos_x = bound(0, pos_x, vid_conwidth - mySize_x); + pos_y = bound(0, pos_y, vid_conheight - mySize_y); + string s; s = strcat(ftos(pos_x/vid_conwidth), " ", ftos(pos_y/vid_conheight)); - cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_pos"), s); + HUD_Panel_GetName(highlightedPanel); + cvar_set(strcat("hud_panel_", panel_name, "_pos"), s); } // 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) { +vector HUD_Panel_CheckResize(vector mySize, vector resizeorigin) { float i; float targBorder; vector targPos; vector targSize; vector targEndPos; + vector dist; + float ratio; + ratio = mySize_x/mySize_y; for (i = 0; i < HUD_PANEL_NUM; ++i) { - if(i == id || !HUD_Panel_CheckActive(i)) + if(i == highlightedPanel || !panel_enabled) continue; - targBorder = HUD_Panel_GetBorder(i); - targPos = HUD_Panel_GetPos(i) - '1 1 0' * targBorder; - targSize = HUD_Panel_GetSize(i) + '2 2 0' * targBorder; - targEndPos = targPos + targSize; + HUD_Panel_UpdatePosSizeForId(i) + + panel_pos -= '1 1 0' * panel_bg_border; + panel_size += '2 2 0' * panel_bg_border; + + targEndPos = panel_pos + panel_size; // resizeorigin is WITHIN target panel, just abort any collision testing against that particular panel to produce expected behaviour! - if(resizeorigin_x > targPos_x && resizeorigin_x < targPos_x + targSize_x && resizeorigin_y > targPos_y && resizeorigin_y < targPos_y + targSize_y) + if(resizeorigin_x > panel_pos_x && resizeorigin_x < targEndPos_x && resizeorigin_y > panel_pos_y && resizeorigin_y < targEndPos_y) continue; if (resizeCorner == 1) { // check if this panel is on our way - if (resizeorigin_x <= targPos_x) + if (resizeorigin_x <= panel_pos_x) continue; - if (resizeorigin_y <= targPos_y) + if (resizeorigin_y <= panel_pos_y) continue; if (targEndPos_x <= resizeorigin_x - mySize_x) continue; @@ -1040,7 +734,7 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin) { // 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) + if (dist_y <= 0 || dist_x / dist_y > ratio) mySize_x = min(mySize_x, dist_x); else mySize_y = min(mySize_y, dist_y); @@ -1049,34 +743,34 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin) { { if (resizeorigin_x >= targEndPos_x) continue; - if (resizeorigin_y <= targPos_y) + if (resizeorigin_y <= panel_pos_y) continue; - if (targPos_x >= resizeorigin_x + mySize_x) + if (panel_pos_x >= resizeorigin_x + mySize_x) continue; if (targEndPos_y <= resizeorigin_y - mySize_y) continue; - dist_x = targPos_x - resizeorigin_x; + dist_x = panel_pos_x - resizeorigin_x; dist_y = resizeorigin_y - targEndPos_y; - if (dist_y < 0) + if (dist_y <= 0 || dist_x / dist_y > ratio) mySize_x = min(mySize_x, dist_x); else mySize_y = min(mySize_y, dist_y); } else if (resizeCorner == 3) { - if (resizeorigin_x <= targPos_x) + if (resizeorigin_x <= panel_pos_x) continue; if (resizeorigin_y >= targEndPos_y) continue; if (targEndPos_x <= resizeorigin_x - mySize_x) continue; - if (targPos_y >= resizeorigin_y + mySize_y) + if (panel_pos_y >= resizeorigin_y + mySize_y) continue; dist_x = resizeorigin_x - targEndPos_x; - dist_y = targPos_y - resizeorigin_y; - if (dist_y < 0) + dist_y = panel_pos_y - resizeorigin_y; + if (dist_y <= 0 || dist_x / dist_y > ratio) mySize_x = min(mySize_x, dist_x); else mySize_y = min(mySize_y, dist_y); @@ -1087,53 +781,40 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin) { continue; if (resizeorigin_y >= targEndPos_y) continue; - if (targPos_x >= resizeorigin_x + mySize_x) + if (panel_pos_x >= resizeorigin_x + mySize_x) continue; - if (targPos_y >= resizeorigin_y + mySize_y) + if (panel_pos_y >= resizeorigin_y + mySize_y) continue; - dist_x = targPos_x - resizeorigin_x; - dist_y = targPos_y - resizeorigin_y; - if (dist_y < 0) + dist_x = panel_pos_x - resizeorigin_x; + dist_y = panel_pos_y - resizeorigin_y; + if (dist_y <= 0 || dist_x / dist_y > ratio) mySize_x = min(mySize_x, dist_x); else mySize_y = min(mySize_y, dist_y); } if(cvar("hud_configure_checkcollisions_debug")) - drawfill(targPos + '1 1 0' * targBorder, targSize - '2 2 0' * targBorder, '1 1 0', .3, DRAWFLAG_NORMAL); + drawfill(panel_pos, panel_size, '1 1 0', .3, DRAWFLAG_NORMAL); } return mySize; } -void HUD_Panel_SetPosSize(float id) +void HUD_Panel_SetPosSize(vector mySize) { + HUD_Panel_UpdatePosSizeForId(highlightedPanel) vector resizeorigin; resizeorigin = panel_click_resizeorigin; - vector mySize, myPos; - - if(resizeCorner == 1) { - mySize_x = resizeorigin_x - (mousepos_x - panel_click_distance_x); - mySize_y = resizeorigin_y - (mousepos_y - panel_click_distance_y); - } else if(resizeCorner == 2) { - mySize_x = mousepos_x + panel_click_distance_x - resizeorigin_x; - mySize_y = panel_click_distance_y + resizeorigin_y - mousepos_y; - } else if(resizeCorner == 3) { - mySize_x = resizeorigin_x + panel_click_distance_x - mousepos_x; - mySize_y = mousepos_y + panel_click_distance_y - resizeorigin_y; - } else { // resizeCorner == 4 - mySize_x = mousepos_x - (resizeorigin_x - panel_click_distance_x); - mySize_y = mousepos_y - (resizeorigin_y - panel_click_distance_y); - } + vector myPos; // minimum panel size cap mySize_x = max(0.025 * vid_conwidth, mySize_x); mySize_y = max(0.025 * vid_conheight, mySize_y); - if(id == 12) // some panels have their own restrictions, like the chat panel (which actually only moves the engine chat print around). Looks bad if it's too small. + if(highlightedPanel == HUD_PANEL_CHAT) // some panels have their own restrictions, like the chat panel (which actually only moves the engine chat print around). Looks bad if it's too small. { mySize_x = max(17 * cvar("con_chatsize"), mySize_x); - mySize_y = max(2 * cvar("con_chatsize") + 2 * HUD_Panel_GetPadding(id), mySize_y); + mySize_y = max(2 * cvar("con_chatsize") + 2 * panel_bg_padding, mySize_y); } // collision testing| @@ -1170,16 +851,14 @@ void HUD_Panel_SetPosSize(float id) drawfill(myPos, mySize, '1 1 1', .2, DRAWFLAG_NORMAL); // before checkresize, otherwise panel can be snapped partially inside another panel or panel aspect ratio can be broken - if(cvar("hud_configure_grid")) + if(autocvar_hud_configure_grid) { - 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; + mySize_x = floor((mySize_x/vid_conwidth)/bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) * vid_conwidth; + mySize_y = floor((mySize_y/vid_conheight)/bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) * vid_conheight; } - if(cvar("hud_configure_checkcollisions")) - { - mySize = HUD_Panel_CheckResize(id, mySize, resizeorigin); - } + if(hud_configure_checkcollisions) + mySize = HUD_Panel_CheckResize(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) mySize_x = max(0.025 * vid_conwidth, mySize_x); @@ -1201,15 +880,15 @@ void HUD_Panel_SetPosSize(float id) } if(cvar("hud_configure_checkcollisions_debug")) - if(cvar("hud_configure_checkcollisions")) drawfill(myPos, mySize, '0 1 0', .3, DRAWFLAG_NORMAL); + HUD_Panel_GetName(highlightedPanel); string s; s = strcat(ftos(mySize_x/vid_conwidth), " ", ftos(mySize_y/vid_conheight)); - cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_size"), s); + cvar_set(strcat("hud_panel_", panel_name, "_size"), s); s = strcat(ftos(myPos_x/vid_conwidth), " ", ftos(myPos_y/vid_conheight)); - cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_pos"), s); + cvar_set(strcat("hud_panel_", panel_name, "_pos"), s); } float mouseClicked; @@ -1219,9 +898,106 @@ vector prevMouseClickedPos; // pos during previous mouse click, to check for dou float menu_enabled; float menu_enabled_time; +float pressed_key_time; +void HUD_Panel_Arrow_Action(float nPrimary) +{ + if (highlightedPanel_prev == -1 || mouseClicked) + return; + + hud_configure_checkcollisions = (!(hudShiftState & S_CTRL) && cvar("hud_configure_checkcollisions")); + + float step; + if(autocvar_hud_configure_grid) + { + if (nPrimary == K_UPARROW || nPrimary == K_DOWNARROW) + { + if (hudShiftState & S_SHIFT) + step = bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) * vid_conheight; + else + step = 2 * bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) * vid_conheight; + } + else + { + if (hudShiftState & S_SHIFT) + step = bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) * vid_conwidth; + else + step = 2 * bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) * vid_conwidth; + } + } + else + { + if (nPrimary == K_UPARROW || nPrimary == K_DOWNARROW) + step = vid_conheight; + else + step = vid_conwidth; + if (hudShiftState & S_SHIFT) + step = (step / 256); // more precision + else + step = (step / 64) * (1 + 2 * (time - pressed_key_time)); + } + + highlightedPanel = highlightedPanel_prev; + + HUD_Panel_UpdatePosSizeForId(highlightedPanel) + + if (hudShiftState & S_ALT) // resize + { + highlightedAction = 1; + if(nPrimary == K_UPARROW) + resizeCorner = 1; + else if(nPrimary == K_RIGHTARROW) + resizeCorner = 2; + else if(nPrimary == K_LEFTARROW) + resizeCorner = 3; + else // if(nPrimary == K_DOWNARROW) + resizeCorner = 4; + + // ctrl+arrow reduces the size, instead of increasing it + // Note that ctrl disables collisions check too, but it's fine + // since we don't collide with anything reducing the size + if (hudShiftState & S_CTRL) { + step = -step; + resizeCorner = 5 - resizeCorner; + } + + vector mySize; + mySize = panel_size; + panel_click_resizeorigin = panel_pos; + if(resizeCorner == 1) { + panel_click_resizeorigin += mySize; + mySize_y += step; + } else if(resizeCorner == 2) { + panel_click_resizeorigin_y += mySize_y; + mySize_x += step; + } else if(resizeCorner == 3) { + panel_click_resizeorigin_x += mySize_x; + mySize_x += step; + } else { // resizeCorner == 4 + mySize_y += step; + } + HUD_Panel_SetPosSize(mySize); + } + else // move + { + highlightedAction = 2; + vector pos; + pos = panel_pos; + if(nPrimary == K_UPARROW) + pos_y -= step; + else if(nPrimary == K_DOWNARROW) + pos_y += step; + else if(nPrimary == K_LEFTARROW) + pos_x -= step; + else // if(nPrimary == K_RIGHTARROW) + pos_x += step; + + HUD_Panel_SetPos(pos); + } +} + float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary) { - if(!hud_configure) + if(!autocvar__hud_configure) return false; // allow console bind to work @@ -1237,6 +1013,17 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary) hit_con_bind = 1; } + if(bInputType == 0) { + if(nPrimary == K_ALT) hudShiftState |= S_ALT; + if(nPrimary == K_CTRL) hudShiftState |= S_CTRL; + if(nPrimary == K_SHIFT) hudShiftState |= S_SHIFT; + } + else if(bInputType == 1) { + if(nPrimary == K_ALT) hudShiftState -= (hudShiftState & S_ALT); + if(nPrimary == K_CTRL) hudShiftState -= (hudShiftState & S_CTRL); + if(nPrimary == K_SHIFT) hudShiftState -= (hudShiftState & S_SHIFT); + } + if(nPrimary == K_MOUSE1) { if(bInputType == 0) { // key pressed @@ -1250,24 +1037,201 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary) } else if(nPrimary == K_ESCAPE) { + if (bInputType == 1) + return true; disable_menu_alphacheck = 1; menu_enabled = 1; menu_enabled_time = time; localcmd("menu_showhudexit\n"); } + else if(nPrimary == K_UPARROW || nPrimary == K_DOWNARROW || nPrimary == K_LEFTARROW || nPrimary == K_RIGHTARROW) + { + if (bInputType == 1) + { + pressed_key_time = 0; + return true; + } + else if (pressed_key_time == 0) + pressed_key_time = time; + HUD_Panel_Arrow_Action(nPrimary); //move or resize panel + } else if(hit_con_bind) return false; return true; // Suppress ALL other input } +float HUD_Panel_HighlightCheck() +{ + float i, j, border; + vector panelPos; + vector panelSize; + + while(j <= HUD_PANEL_NUM) + { + i = panel_order[j]; + j += 1; + + HUD_Panel_UpdatePosSizeForId(i) + + panelPos = panel_pos; + panelSize = panel_size; + border = max(8, panel_bg_border); // FORCED border so a small border size doesn't mean you can't resize + + // move + if(mousepos_x >= panelPos_x && mousepos_y >= panelPos_y && mousepos_x <= panelPos_x + panelSize_x && mousepos_y <= panelPos_y + panelSize_y) + { + return 1; + } + // resize from topleft border + 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) + { + return 2; + } + // resize from topright border + 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) + { + return 3; + } + // resize from bottomleft border + 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) + { + return 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 + border && mousepos_y <= panelPos_y + panelSize_y + border) + { + return 2; + } + } + return 0; +} + +// move a panel to the beginning of the panel order array (which means it gets drawn last, on top of everything else) +void HUD_Panel_FirstInDrawQ(float id) +{ + float i; + var float place = -1; + // find out where in the array our current id is, save into place + for(i = 0; i < HUD_PANEL_NUM; ++i) + { + if(panel_order[i] == id) + { + place = i; + break; + } + } + // place last if we didn't find a place for it yet (probably new panel, or screwed up cvar) + if(place == -1) + place = HUD_PANEL_NUM - 1; + + // move all ids up by one step in the array until "place" + for(i = place; i > 0; --i) + { + panel_order[i] = panel_order[i-1]; + } + // now save the new top id + panel_order[0] = id; + + // let's save them into the cvar by some strcat trickery + string s; + for(i = 0; i < HUD_PANEL_NUM; ++i) + { + s = strcat(s, ftos(panel_order[i]), " "); + } + cvar_set("_hud_panelorder", s); + if(hud_panelorder_prev) + strunzone(hud_panelorder_prev); + hud_panelorder_prev = strzone(autocvar__hud_panelorder); // prevent HUD_Main from doing useless update, we already updated here +} + +void HUD_Panel_Highlight() +{ + float i, j, border; + vector panelPos; + vector panelSize; + + while(j <= HUD_PANEL_NUM) + { + i = panel_order[j]; + j += 1; + + HUD_Panel_UpdatePosSizeForId(i) + + panelPos = panel_pos; + panelSize = panel_size; + border = max(8, panel_bg_border); // FORCED border so a small border size doesn't mean you can't resize + + // move + if(mousepos_x >= panelPos_x && mousepos_y >= panelPos_y && mousepos_x <= panelPos_x + panelSize_x && mousepos_y <= panelPos_y + panelSize_y) + { + highlightedPanel = i; + HUD_Panel_FirstInDrawQ(i); + highlightedAction = 1; + panel_click_distance = mousepos - panelPos; + return; + } + // resize from topleft border + 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; + HUD_Panel_FirstInDrawQ(i); + highlightedAction = 2; + resizeCorner = 1; + panel_click_distance = mousepos - panelPos; + panel_click_resizeorigin = panelPos + panelSize; + return; + } + // resize from topright border + 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; + HUD_Panel_FirstInDrawQ(i); + highlightedAction = 2; + resizeCorner = 2; + panel_click_distance_x = panelSize_x - mousepos_x + panelPos_x; + panel_click_distance_y = mousepos_y - panelPos_y; + panel_click_resizeorigin = panelPos + eY * panelSize_y; + return; + } + // resize from bottomleft border + 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; + HUD_Panel_FirstInDrawQ(i); + highlightedAction = 2; + resizeCorner = 3; + panel_click_distance_x = mousepos_x - panelPos_x; + panel_click_distance_y = panelSize_y - mousepos_y + panelPos_y; + panel_click_resizeorigin = panelPos + eX * panelSize_x; + return; + } + // 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 + border && mousepos_y <= panelPos_y + panelSize_y + border) + { + highlightedPanel = i; + HUD_Panel_FirstInDrawQ(i); + highlightedAction = 2; + resizeCorner = 4; + panel_click_distance = panelSize - mousepos + panelPos; + panel_click_resizeorigin = panelPos; + return; + } + else + { + highlightedPanel_prev = -1; + } + } +} + +float highlightcheck; void HUD_Panel_Mouse() { // TODO: needs better check... is there any float that contains the current state of the menu? _menu_alpha isn't apparently updated the frame the menu gets enabled if (menu_enabled == 0) // menu dialog closed, enable normal alpha stuff again disable_menu_alphacheck = 0; - if (cvar("_menu_alpha") == 0 && time - menu_enabled_time > 0.5) + if (autocvar__menu_alpha == 0 && time - menu_enabled_time > 0.5) menu_enabled = 0; /* @@ -1276,100 +1240,44 @@ void HUD_Panel_Mouse() print("Menu alpha: ", cvar_string("_menu_alpha"), "\n"); */ - if(mouseClicked == 0 && disable_menu_alphacheck != 2) { // don't reset these variables in disable_menu_alphacheck mode 2! + if(mouseClicked == 0 && disable_menu_alphacheck != 2 && highlightedPanel >= 0) { // don't reset these variables in disable_menu_alphacheck mode 2! highlightedPanel = -1; highlightedAction = 0; } + if(highlightedPanel != -1) + highlightedPanel_prev = highlightedPanel; - mousepos = mousepos + getmousepos(); + mousepos = mousepos + getmousepos() * cvar("menu_mouse_speed"); mousepos_x = bound(0, mousepos_x, vid_conwidth); mousepos_y = bound(0, mousepos_y, vid_conheight); - drawpic(mousepos, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor.tga"), '32 32 0', '1 1 1', 1, DRAWFLAG_NORMAL); - if(mouseClicked) { - float i, border; - vector panelPos; - vector panelSize; - - for(i = 0; i < HUD_PANEL_NUM; ++i) - { - panelPos = HUD_Panel_GetPos(i); - panelSize = HUD_Panel_GetSize(i); - border = HUD_Panel_GetBorder(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) - { - highlightedPanel = i; - highlightedAction = 1; - } - // resize from topleft border - 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 - 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 - 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 + border && mousepos_y <= panelPos_y + panelSize_y + border) - { - highlightedPanel = i; - highlightedAction = 2; - resizeCorner = 4; - } - } - - if(highlightedPanel == i) - { - if(prevMouseClicked == 0) - { - if(highlightedAction == 1) - panel_click_distance = mousepos - panelPos; - else if(highlightedAction == 2) - { - if(resizeCorner == 1) { - panel_click_distance = mousepos - panelPos; - panel_click_resizeorigin = panelPos + panelSize; - } else if(resizeCorner == 2) { - panel_click_distance_x = panelSize_x - mousepos_x + panelPos_x; - panel_click_distance_y = mousepos_y - panelPos_y; - panel_click_resizeorigin = panelPos + eY * panelSize_y; - } else if(resizeCorner == 3) { - panel_click_distance_x = mousepos_x - panelPos_x; - panel_click_distance_y = panelSize_y - mousepos_y + panelPos_y; - panel_click_resizeorigin = panelPos + eX * panelSize_x; - } else if(resizeCorner == 4) { - panel_click_distance = panelSize - mousepos + panelPos; - panel_click_resizeorigin = panelPos; - } - } - } + if(prevMouseClicked == 0) + HUD_Panel_Highlight(); // sets highlightedPanel, highlightedAction, panel_click_distance, panel_click_resizeorigin - if(cvar("hud_configure_checkcollisions_debug")) - drawfill(panelPos, panelSize, '1 0 0', .3, DRAWFLAG_NORMAL); + hud_configure_checkcollisions = (!(hudShiftState & S_CTRL) && autocvar_hud_configure_checkcollisions); - if(highlightedAction == 1) - HUD_Panel_SetPos(i, mousepos - panel_click_distance); - else if(highlightedAction == 2) - HUD_Panel_SetPosSize(i); + if(highlightedAction == 1) + HUD_Panel_SetPos(mousepos - panel_click_distance); + else if(highlightedAction == 2) + { + vector mySize; + if(resizeCorner == 1) { + mySize_x = panel_click_resizeorigin_x - (mousepos_x - panel_click_distance_x); + mySize_y = panel_click_resizeorigin_y - (mousepos_y - panel_click_distance_y); + } else if(resizeCorner == 2) { + mySize_x = mousepos_x + panel_click_distance_x - panel_click_resizeorigin_x; + mySize_y = panel_click_distance_y + panel_click_resizeorigin_y - mousepos_y; + } else if(resizeCorner == 3) { + mySize_x = panel_click_resizeorigin_x + panel_click_distance_x - mousepos_x; + mySize_y = mousepos_y + panel_click_distance_y - panel_click_resizeorigin_y; + } else { // resizeCorner == 4 + mySize_x = mousepos_x - (panel_click_resizeorigin_x - panel_click_distance_x); + mySize_y = mousepos_y - (panel_click_resizeorigin_y - panel_click_distance_y); } + HUD_Panel_SetPosSize(mySize); } // doubleclick check @@ -1379,7 +1287,8 @@ void HUD_Panel_Mouse() disable_menu_alphacheck = 2; menu_enabled = 1; menu_enabled_time = time; - localcmd("menu_showhudoptions ", ftos(highlightedPanel), "\n"); + HUD_Panel_GetName(highlightedPanel) + localcmd("menu_showhudoptions ", panel_name, "\n"); return; } if(prevMouseClicked == 0) @@ -1388,18 +1297,34 @@ void HUD_Panel_Mouse() prevMouseClickedPos = mousepos; } } + else + { + highlightcheck = HUD_Panel_HighlightCheck(); + } + // draw cursor after performing move/resize to have the panel pos/size updated before highlightcheck + string cursor; + vector cursorsize; + cursorsize = '32 32 0'; + + if(highlightcheck == 0) + drawpic(mousepos, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor.tga"), '32 32 0', '1 1 1', 1, DRAWFLAG_NORMAL); + else if(highlightcheck == 1) + drawpic(mousepos - cursorsize * 0.5, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor_move.tga"), '32 32 0', '1 1 1', 1, DRAWFLAG_NORMAL); + else if(highlightcheck == 2) + drawpic(mousepos - cursorsize * 0.5, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor_resize.tga"), '32 32 0', '1 1 1', 1, DRAWFLAG_NORMAL); + else + drawpic(mousepos - cursorsize * 0.5, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor_resize2.tga"), '32 32 0', '1 1 1', 1, DRAWFLAG_NORMAL); + prevMouseClicked = mouseClicked; } // Weapon icons (#0) // float weaponspace[10]; -void HUD_WeaponIcons_Clear() -{ - float idx; - for(idx = 0; idx < 10; ++idx) +#define HUD_Weapons_Clear()\ + float idx;\ + for(idx = 0; idx < 10; ++idx)\ weaponspace[idx] = 0; -} entity weaponorder[WEP_MAXCOUNT]; void weaponorder_swap(float i, float j, entity pass) @@ -1420,17 +1345,58 @@ float weaponorder_cmp(float i, float j, entity pass) return aj - ai; // the string is in REVERSE order (higher prio at the right is what we want, but higher prio first is the string) } -void HUD_WeaponIcons(void) +float GetAmmoStat(float i) +{ + switch(i) + { + case 0: return STAT_SHELLS; + case 1: return STAT_NAILS; + case 2: return STAT_ROCKETS; + case 3: return STAT_CELLS; + case 4: return STAT_FUEL; + default: return -1; + } +} + +float GetAmmoTypeForWep(float i) +{ + switch(i) + { + case WEP_SHOTGUN: return 0; + case WEP_UZI: return 1; + case WEP_CAMPINGRIFLE: return 1; + case WEP_GRENADE_LAUNCHER: return 2; + case WEP_ELECTRO: return 3; + case WEP_CRYLINK: return 3; + case WEP_HLAC: return 3; + case WEP_MINSTANEX: return 3; + case WEP_NEX: return 3; + case WEP_HAGAR: return 2; + case WEP_ROCKET_LAUNCHER: return 2; + case WEP_SEEKER: return 2; + case WEP_FIREBALL: return 4; + case WEP_HOOK: return 3; + default: return -1; + } +} + +#define acc_color(i) stov(cvar_string(strcat("hud_panel_weapons_accuracy_color", ftos(i)))) +#define MAX_ACCURACY_LEVELS 10 +float acc_lev[MAX_ACCURACY_LEVELS]; + +void HUD_Weapons(void) { - float id = HUD_PANEL_WEAPONICONS; - float alpha, stat_weapons; // "constants" - vector pos, mySize, accuracy_color; - float i, weapid, fade, weapon_stats, weapon_hit, weapon_damage, weapon_cnt; // variables + if(!autocvar_hud_panel_weapons && !autocvar__hud_configure) + return; + + active_panel = HUD_PANEL_WEAPONS; + HUD_Panel_UpdateCvars(weapons); + vector pos, mySize; + float i, weapid, fade, weapon_stats, weapon_number, weapon_cnt; - pos = HUD_Panel_GetPos(id); - mySize = HUD_Panel_GetSize(id); + pos = panel_pos; + mySize = panel_size; - stat_weapons = getstati(STAT_WEAPONS); weapon_cnt = 0; for(i = WEP_FIRST; i <= WEP_LAST; ++i) { @@ -1460,13 +1426,11 @@ void HUD_WeaponIcons(void) heapsort(weapon_cnt, weaponorder_swap, weaponorder_cmp, world); } - HUD_Panel_DrawBg(id, pos, mySize, 0); - float padding; - padding = HUD_Panel_GetPadding(id); - if(padding) + HUD_Panel_DrawBg(1); + if(panel_bg_padding) { - pos += '1 1 0' * padding; - mySize -= '2 2 0' * padding; + pos += '1 1 0' * panel_bg_padding; + mySize -= '2 2 0' * panel_bg_padding; } // hits @@ -1478,7 +1442,7 @@ void HUD_WeaponIcons(void) weapon_number = weapon_stats & 63; weapon_fired[weapon_number-WEP_FIRST] = floor(weapon_stats / 64); - if(cvar_or("hud_weaponicons_fade", 1)) + if(cvar_or("hud_panel_weapons_fade", 1)) { fade = 3.2 - 2 * (time - weapontime); fade = bound(0.7, fade, 1); @@ -1486,78 +1450,188 @@ void HUD_WeaponIcons(void) else fade = 1; - HUD_WeaponIcons_Clear(); + HUD_Weapons_Clear(); float rows, columns; rows = mySize_y/mySize_x; - rows = bound(1, floor((sqrt(4 * (2/1) * rows * WEP_COUNT + rows * rows) + rows + 0.5) / 2), WEP_COUNT); - // ^^^ weapon icon aspect goes here + rows = bound(1, floor((sqrt(4 * autocvar_hud_panel_weapons_aspect * rows * WEP_COUNT + rows * rows) + rows + 0.5) / 2), WEP_COUNT); columns = ceil(WEP_COUNT/rows); float row, column; + + float a, type, fullammo; + float when; + when = autocvar_hud_panel_weapons_complainbubble_time; + float fadetime; + fadetime = autocvar_hud_panel_weapons_complainbubble_fadetime; + + vector color; + vector wpnpos; + vector wpnsize; + + float acc_levels; + if(autocvar_hud_panel_weapons_accuracy && !(gametype == GAME_RACE || gametype == GAME_CTS)) + { + acc_levels = tokenize(cvar_string("hud_panel_weapons_accuracy_color_levels")); + if (acc_levels > MAX_ACCURACY_LEVELS) + acc_levels = MAX_ACCURACY_LEVELS; + + for (i = 0; i < acc_levels; ++i) + acc_lev[i] = stof(argv(i)); + } + for(i = 0; i < weapon_cnt; ++i) { + wpnpos = pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows); + wpnsize = eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows); + self = weaponorder[i]; weapid = self.impulse; - alpha = (self.weapon == activeweapon) ? 1 : 0.6; - - weapon_hit = weapon_hits[self.weapon-WEP_FIRST]; - weapon_damage = weapon_fired[self.weapon-WEP_FIRST]; - // draw background behind currently selected weapon if(self.weapon == activeweapon) - drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "weapon_current_bg", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_aspect_skin(wpnpos, "weapon_current_bg", wpnsize, '1 1 1', fade * panel_fg_alpha, DRAWFLAG_NORMAL); - // draw the weapon accuracy on the HUD - if(hud_accuracy_hud && !(gametype == GAME_RACE || gametype == GAME_CTS)) + // draw the weapon accuracy + if(acc_levels) { + float weapon_hit, weapon_damage; + weapon_damage = weapon_fired[self.weapon-WEP_FIRST]; if(weapon_damage) + { + weapon_hit = weapon_hits[self.weapon-WEP_FIRST]; weapon_stats = floor(100 * weapon_hit / weapon_damage); + } + + // find the max level lower than weapon_stats + float j; + j = acc_levels-1; + while ( j && weapon_stats < acc_lev[j] ) + --j; + + // inject color j+1 in color j, how much depending on how much weapon_stats is higher than level j + float factor; + factor = (weapon_stats - acc_lev[j]) / (acc_lev[j+1] - acc_lev[j]); + color = acc_color(j); + color = color + factor * (acc_color(j+1) - color); - accuracy_color = HUD_AccuracyColor(weapon_stats); if(weapon_damage) - drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "weapon_accuracy", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), accuracy_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_aspect_skin(wpnpos, "weapon_accuracy", wpnsize, color, panel_fg_alpha, DRAWFLAG_NORMAL); } // draw the weapon icon - if((self.impulse >= 0) && (stat_weapons & self.weapons)) + if((self.impulse >= 0) && (getstati(STAT_WEAPONS) & self.weapons)) { - drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_aspect_skin(wpnpos, strcat("weapon", self.netname), wpnsize, '1 1 1', fade * panel_fg_alpha, DRAWFLAG_NORMAL); + + if(autocvar_hud_panel_weapons_label == 1) // weapon number + drawstring(wpnpos, ftos(weapid), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + else if(autocvar_hud_panel_weapons_label == 2) // bind + drawstring(wpnpos, getcommandkey(ftos(weapid), strcat("impulse ", ftos(weapid))), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - if(cvar_or("hud_weaponicons_number", 1)) - drawstring(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), ftos(weapid), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + // draw ammo status bar + if(autocvar_hud_panel_weapons_ammo && weapid != WEP_TUBA && weapid != WEP_LASER && weapid != WEP_PORTO) + { + a = 0; + type = GetAmmoTypeForWep(weapid); + if(type != -1) + a = getstati(GetAmmoStat(type)); // how much ammo do we have? + + if(a > 0) + { + switch(type) { + case 0: fullammo = autocvar_hud_panel_weapons_ammo_full_shells; break; + case 1: fullammo = autocvar_hud_panel_weapons_ammo_full_nails; break; + case 2: fullammo = autocvar_hud_panel_weapons_ammo_full_rockets; break; + case 3: fullammo = autocvar_hud_panel_weapons_ammo_full_cells; break; + case 4: fullammo = autocvar_hud_panel_weapons_ammo_full_fuel; break; + default: fullammo = 60; + } + + vector barsize; + vector barpos; + if(wpnsize_x/wpnsize_y > autocvar_hud_panel_weapons_aspect) + { + barsize_x = autocvar_hud_panel_weapons_aspect * wpnsize_y; + barsize_y = wpnsize_y; + + barpos_x = wpnpos_x + (wpnsize_x - barsize_x) / 2; + barpos_y = wpnpos_y; + } + else + { + barsize_y = 1/autocvar_hud_panel_weapons_aspect * wpnsize_x; + barsize_x = wpnsize_x; + + barpos_y = wpnpos_y + (wpnsize_y - barsize_y) / 2; + barpos_x = wpnpos_x; + } + + drawsetcliparea( + barpos_x, + barpos_y, + barsize_x * bound(0, a/fullammo, 1), + barsize_y); + drawpic_aspect_skin(wpnpos, "weapon_ammo", wpnsize, autocvar_hud_panel_weapons_ammo_color, panel_fg_alpha * autocvar_hud_panel_weapons_ammo_alpha, DRAWFLAG_NORMAL); + drawresetcliparea(); + } + } } + + // draw a "ghost weapon icon" if you don't have the weapon else { - drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '0 0 0', HUD_Panel_GetFgAlpha(id) * 0.5, DRAWFLAG_NORMAL); + drawpic_aspect_skin(wpnpos, strcat("weapon", self.netname), wpnsize, '0 0 0', panel_fg_alpha * 0.5, DRAWFLAG_NORMAL); + } + + // draw the complain message + if(time - complain_weapon_time < when + fadetime && self.weapon == complain_weapon && autocvar_hud_panel_weapons_complainbubble) + { + if(fadetime) + { + if(complain_weapon_time + when > time) + a = 1; + else + a = bound(0, (complain_weapon_time + when + fadetime - time) / fadetime, 1); + } + else + { + if(complain_weapon_time + when > time) + a = 1; + else + a = 0; + } + + string s; + if(complain_weapon_type == 0) { + s = "Out of ammo"; + color = autocvar_hud_panel_weapons_complainbubble_color_outofammo; + } + else if(complain_weapon_type == 1) { + s = "Don't have"; + color = autocvar_hud_panel_weapons_complainbubble_color_donthave; + } + else { + s = "Unavailable"; + color = autocvar_hud_panel_weapons_complainbubble_color_unavailable; + } + drawpic_aspect_skin(wpnpos + '1 1 0' * autocvar_hud_panel_weapons_complainbubble_padding, "weapon_complainbubble", wpnsize - '2 2 0' * autocvar_hud_panel_weapons_complainbubble_padding, color, a * panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(wpnpos + '1 1 0' * autocvar_hud_panel_weapons_complainbubble_padding, s, wpnsize - '2 2 0' * autocvar_hud_panel_weapons_complainbubble_padding, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); } ++row; if(row >= rows) { row = 0; - ++column; - } - } - -} - -// Inventory (#1) -// -float GetAmmoStat(float i) -{ - switch(i) - { - case 0: return STAT_SHELLS; - case 1: return STAT_NAILS; - case 2: return STAT_ROCKETS; - case 3: return STAT_CELLS; - case 4: return STAT_FUEL; - default: return -1; + ++column; + } } + } +// Ammo (#1) +// +// TODO: macro float GetAmmoItemCode(float i) { switch(i) @@ -1584,104 +1658,189 @@ string GetAmmoPicture(float i) } } -void HUD_Inventory(void) +void DrawAmmoItem(vector myPos, vector mySize, float itemcode, float currently_selected) { - float id = HUD_PANEL_INVENTORY; - float i; - float stat_items; + float a; + a = getstati(GetAmmoStat(itemcode)); // how much ammo do we have of type itemcode? + if(autocvar__hud_configure) + a = 100; + + vector color; + if(a < 10) + color = '0.7 0 0'; + else + color = '1 1 1'; + + float alpha; + if(currently_selected) + alpha = 1; + else + alpha = 0.7; + + vector newSize, newPos; + if(mySize_x/mySize_y > 3) + { + newSize_x = 3 * mySize_y; + newSize_y = mySize_y; + + newPos_x = myPos_x + (mySize_x - newSize_x) / 2; + newPos_y = myPos_y; + } + else + { + newSize_y = 1/3 * mySize_x; + newSize_x = mySize_x; + + newPos_y = myPos_y + (mySize_y - newSize_y) / 2; + newPos_x = myPos_x; + } + + vector picpos, numpos; + if(autocvar_hud_panel_ammo_iconalign) + { + numpos = newPos; + picpos = newPos + eX * 2 * newSize_y; + } + else + { + numpos = newPos + eX * newSize_y; + picpos = newPos; + } + + if (currently_selected) + drawpic_aspect_skin(newPos, "ammo_current_bg", newSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + + drawfont = hud_bigfont; + drawstring_aspect(numpos, ftos(a), eX * (2/3) * newSize_x + eY * newSize_y, color, panel_fg_alpha * alpha, DRAWFLAG_NORMAL); + drawfont = hud_font; + drawpic_aspect_skin(picpos, GetAmmoPicture(itemcode), '1 1 0' * newSize_y, '1 1 1', panel_fg_alpha * alpha, DRAWFLAG_NORMAL); +} - vector pos, mySize, mysize, mypos; - pos = HUD_Panel_GetPos(id); - mySize = HUD_Panel_GetSize(id); +void HUD_Ammo(void) +{ + if(!autocvar_hud_panel_ammo && !autocvar__hud_configure) + return; + + active_panel = HUD_PANEL_AMMO; + HUD_Panel_UpdateCvars(ammo); + float i, currently_selected; + + vector pos, mySize; + pos = panel_pos; + mySize = panel_size; - HUD_Panel_DrawBg(id, pos, mySize, 0); - float padding; - padding = HUD_Panel_GetPadding(id); - if(padding) + HUD_Panel_DrawBg(1); + if(panel_bg_padding) { - pos += '1 1 0' * padding; - mySize -= '2 2 0' * padding; + pos += '1 1 0' * panel_bg_padding; + mySize -= '2 2 0' * panel_bg_padding; } + float rows, columns; + rows = mySize_y/mySize_x; + rows = bound(1, floor((sqrt(4 * (3/1) * rows * AMMO_COUNT + rows * rows) + rows + 0.5) / 2), AMMO_COUNT); + // ^^^ ammo item aspect goes here + + columns = ceil(AMMO_COUNT/rows); + + float row, column; // ammo - stat_items = getstati(STAT_ITEMS); - for (i = 0; i < 4; ++i) { - float a; - a = getstati(GetAmmoStat(i)); // how much ammo do we have of type i? - if(hud_configure) - a = 100; - - if(cvar("hud_inventory_onlycurrent")) { - if(hud_configure) + for (i = 0; i < AMMO_COUNT; ++i) { + currently_selected = getstati(STAT_ITEMS) & GetAmmoItemCode(i); + if(autocvar_hud_panel_ammo_onlycurrent) { + if(autocvar__hud_configure) i = 2; - if (stat_items & GetAmmoItemCode(i) || hud_configure) { - drawpic_skin(pos, GetAmmoPicture(i), '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - if(a < 10) - HUD_DrawXNum(pos + eX * mySize_y + eY * 0.25 * mySize_y, a, strlen(ftos(a)), 0, 0.5 * mySize_y, '0.7 0 0', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - else - HUD_DrawXNum(pos + eX * mySize_y + eY * 0.25 * mySize_y, a, strlen(ftos(a)), 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - } - if(hud_configure) + if (currently_selected || autocvar__hud_configure) + { + DrawAmmoItem(pos, mySize, i, currently_selected); break; + } } else { - if (a > 0) { - if(mySize_x/mySize_y >= 10) { // arrange horizontally - switch (i) { - case 0: mypos_x = pos_x; mypos_y = pos_y; break; // shells - case 1: mypos_x = pos_x + 0.25 * mySize_x; mypos_y = pos_y; break; // bullets - case 2: mypos_x = pos_x + 0.5 * mySize_x; mypos_y = pos_y; break; // rockets - case 3: mypos_x = pos_x + 0.75 * mySize_x; mypos_y = pos_y; break; // cells - } - mysize_x = 0.25 * mySize_x; - mysize_y = mySize_y; - } else if(mySize_x/mySize_y >= 2.5) { // arrange in a 2x2 grid - switch (i) { - case 0: mypos_x = pos_x + 0.5 * mySize_x; mypos_y = pos_y + 0.5 * mySize_y; break; // shells - case 1: mypos_x = pos_x + 0.5 * mySize_x; mypos_y = pos_y; break; // bullets - case 2: mypos_x = pos_x; mypos_y = pos_y + 0.5 * mySize_y; break; // rockets - case 3: mypos_x = pos_x; mypos_y = pos_y; break; // cells - } - mysize_x = 0.5 * mySize_x; - mysize_y = 0.5 * mySize_y; - } else { // arrange vertically - switch (i) { - case 0: mypos_x = pos_x; mypos_y = pos_y; break; // shells - case 1: mypos_x = pos_x; mypos_y = pos_y + 0.25 * mySize_y; break; // bullets - case 2: mypos_x = pos_x; mypos_y = pos_y + 0.5 * mySize_y; break; // rockets - case 3: mypos_x = pos_x; mypos_y = pos_y + 0.75 * mySize_y; break; // cells - } - mysize_x = mySize_x; - mysize_y = 0.25 * mySize_y; - } - - if (stat_items & GetAmmoItemCode(i)) - drawpic_skin(mypos, "ammo_current_bg", mysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(mypos + eY * 0.05 * mysize_y, GetAmmoPicture(i), '1 1 0' * 0.8 * mysize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - if (a < 10) { - if(stat_items & GetAmmoItemCode(i)) - HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0 0', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - else - HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0 0', 0, 0, HUD_Panel_GetFgAlpha(id) * 0.7, DRAWFLAG_NORMAL); - } else { - if(stat_items & GetAmmoItemCode(i)) - HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - else - HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0.7 0.7', 0, 0, HUD_Panel_GetFgAlpha(id) * 0.7, DRAWFLAG_NORMAL); - } + DrawAmmoItem(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), i, currently_selected); + ++row; + if(row >= rows) + { + row = 0; + column = column + 1; } } } } +void DrawNumIcon(float iconalign, vector myPos, vector mySize, float x, string icon, float left, vector color, float alpha) +{ + vector newSize, newPos; + if(mySize_x/mySize_y > 3) + { + newSize_x = 3 * mySize_y; + newSize_y = mySize_y; + + newPos_x = myPos_x + (mySize_x - newSize_x) / 2; + newPos_y = myPos_y; + } + else + { + newSize_y = 1/3 * mySize_x; + newSize_x = mySize_x; + + newPos_y = myPos_y + (mySize_y - newSize_y) / 2; + newPos_x = myPos_x; + } + + vector picpos, numpos; + if(left) + { + if(iconalign == 1 || iconalign == 3) // right align + { + numpos = newPos; + picpos = newPos + eX * 2 * newSize_y; + } + else // left align + { + numpos = newPos + eX * newSize_y; + picpos = newPos; + } + } + else + { + if(iconalign == 0 || iconalign == 3) // left align + { + numpos = newPos + eX * newSize_y; + picpos = newPos; + } + else // right align + { + numpos = newPos; + picpos = newPos + eX * 2 * newSize_y; + } + } + + drawfont = hud_bigfont; + drawstring_aspect(numpos, ftos(x), eX * (2/3) * newSize_x + eY * newSize_y, color, panel_fg_alpha * alpha, DRAWFLAG_NORMAL); + drawfont = hud_font; + drawpic_aspect_skin(picpos, icon, '1 1 0' * newSize_y, '1 1 1', panel_fg_alpha * alpha, DRAWFLAG_NORMAL); +} + +void DrawNumIcon_expanding(float iconalign, vector myPos, vector mySize, float x, string icon, float left, vector color, float fadelerp) +{ + float sz; + sz = expandingbox_sizefactor_from_fadelerp(fadelerp); + + DrawNumIcon(iconalign, myPos + expandingbox_resize_centered_box_offset(sz, mySize, 1), mySize * sz, x, icon, left, color, (1 - fadelerp)); +} // Powerups (#2) // void HUD_Powerups(void) { - float id = HUD_PANEL_POWERUPS; + if(!autocvar_hud_panel_powerups && !autocvar__hud_configure) + return; + + active_panel = HUD_PANEL_POWERUPS; + HUD_Panel_UpdateCvars(powerups); float stat_items; stat_items = getstati(STAT_ITEMS); - if(!hud_configure) + if(!autocvar__hud_configure) { if not(stat_items & IT_STRENGTH) if not(stat_items & IT_INVINCIBLE) @@ -1692,31 +1851,27 @@ void HUD_Powerups(void) { } vector pos, mySize; - pos = HUD_Panel_GetPos(id); - mySize = HUD_Panel_GetSize(id); - - HUD_Panel_DrawBg(id, pos, mySize, 0); - float padding; - padding = HUD_Panel_GetPadding(id); - if(padding) - { - pos += '1 1 0' * padding; - mySize -= '2 2 0' * padding; - } + pos = panel_pos; + mySize = panel_size; float strength_time, shield_time; strength_time = bound(0, getstatf(STAT_STRENGTH_FINISHED) - time, 99); shield_time = bound(0, getstatf(STAT_INVINCIBLE_FINISHED) - time, 99); - if(hud_configure) + HUD_Panel_DrawBg(bound(0, max(strength_time, shield_time), 1)); + if(panel_bg_padding) + { + pos += '1 1 0' * panel_bg_padding; + mySize -= '2 2 0' * panel_bg_padding; + } + + if(autocvar__hud_configure) { strength_time = 15; shield_time = 27; } - float len; - vector barpos, barsize; vector picpos; vector numpos; @@ -1724,8 +1879,7 @@ void HUD_Powerups(void) { string leftname, rightname; float leftcnt, rightcnt; float leftexact, rightexact; - float leftalpha, rightalpha; - if (cvar(strcat("hud_", HUD_Panel_GetName(id), "_flip"))) { + if (autocvar_hud_panel_powerups_flip) { leftname = "strength"; leftcnt = ceil(strength_time); leftexact = strength_time; @@ -1742,177 +1896,179 @@ void HUD_Powerups(void) { rightcnt = ceil(strength_time); rightexact = strength_time; } - leftalpha = bound(0, leftexact, 1); - rightalpha = bound(0, rightexact, 1); + drawfont = hud_bigfont; if (mySize_x/mySize_y > 4) { if(leftcnt) { - len = strlen(ftos(leftcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(autocvar_hud_panel_powerups_baralign == 1 || autocvar_hud_panel_powerups_baralign == 3) { // right align barpos = pos + eX * 0.5 * mySize_x - eX * 0.5 * mySize_x * min(1, leftcnt/30); barsize = eX * 0.5 * mySize_x * min(1, leftcnt/30) + eY * mySize_y; - picpos = pos + eX * 0.5 * mySize_x - eX * mySize_y; - numpos = picpos - eX * 2 * 0.5 * mySize_y + eX * (2-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y; - } else { + } else { // left align barpos = pos; barsize = eX * 0.5 * mySize_x * min(1, leftcnt/30) + eY * mySize_y; - picpos = pos; - numpos = picpos + eX * mySize_y - eX * (2-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y; } - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + if(autocvar_hud_panel_powerups_progressbar) + { + HUD_Panel_GetProgressBarColor(leftname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); + } + if(leftcnt > 1) + DrawNumIcon(autocvar_hud_panel_powerups_iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, '1 1 1', 1); if(leftcnt <= 5) - drawpic_skin_expanding_two(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1)); - else - drawpic_skin(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(numpos, leftcnt, 2, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + DrawNumIcon_expanding(autocvar_hud_panel_powerups_iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, '1 1 1', bound(0, (leftcnt - leftexact) / 0.5, 1)); } if(rightcnt) { - len = strlen(ftos(rightcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(autocvar_hud_panel_powerups_baralign == 0 || autocvar_hud_panel_powerups_baralign == 3) { // left align barpos = pos + eX * 0.5 * mySize_x; barsize = eX * 0.5 * mySize_x * min(1, rightcnt/30) + eY * mySize_y; - picpos = pos + eX * 0.5 * mySize_x; - numpos = picpos + eX * mySize_y - eX * (2-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y; - } else { + } else { // right align barpos = pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, rightcnt/30); barsize = eX * 0.5 * mySize_x * min(1, rightcnt/30) + eY * mySize_y; - picpos = pos + eX * mySize_x - eX * mySize_y; - numpos = picpos - eX * mySize_y + eY * 0.25 * mySize_y; } - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + if(autocvar_hud_panel_powerups_progressbar) + { + HUD_Panel_GetProgressBarColor(rightname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL); + } + if(rightcnt > 1) + DrawNumIcon(autocvar_hud_panel_powerups_iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, '1 1 1', 1); if(rightcnt <= 5) - drawpic_skin_expanding_two(picpos, rightname, '1 1 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1)); - else - drawpic_skin(picpos, rightname, '1 1 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(numpos, rightcnt, 2, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + DrawNumIcon_expanding(autocvar_hud_panel_powerups_iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, '1 1 1', bound(0, (rightcnt - rightexact) / 0.5, 1)); } } else if (mySize_x/mySize_y > 1.5) { if(leftcnt) { - len = strlen(ftos(leftcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(autocvar_hud_panel_powerups_baralign == 1 || autocvar_hud_panel_powerups_baralign == 3) { // right align barpos = pos + eX * mySize_x - eX * mySize_x * min(1, leftcnt/30); barsize = eX * mySize_x * min(1, leftcnt/30) + eY * 0.5 * mySize_y; - picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y; - numpos = picpos - eX * len * 0.5 * mySize_y; - } else { + } else { // left align barpos = pos; barsize = eX * mySize_x * min(1, leftcnt/30) + eY * 0.5 * mySize_y; - picpos = pos; - numpos = picpos + eX * 0.5 * mySize_y; } - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + if(autocvar_hud_panel_powerups_progressbar) + { + HUD_Panel_GetProgressBarColor(leftname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL); + } + if(leftcnt > 1) + DrawNumIcon(autocvar_hud_panel_powerups_iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, '1 1 1', 1); if(leftcnt <= 5) - drawpic_skin_expanding_two(picpos, leftname, '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1)); - else - drawpic_skin(picpos, leftname, '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(numpos, leftcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + DrawNumIcon_expanding(autocvar_hud_panel_powerups_iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, '1 1 1', bound(0, (leftcnt - leftexact) / 0.5, 1)); } if(rightcnt) { - len = strlen(ftos(rightcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { - barpos = pos + eX * mySize_x - eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y; - barsize = eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y; - picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y + eY * 0.5 * mySize_y; - numpos = picpos - eX * len * 0.5 * mySize_y; - } else { + if(autocvar_hud_panel_powerups_baralign == 0 || autocvar_hud_panel_powerups_baralign == 3) { // left align barpos = pos + eY * 0.5 * mySize_y; barsize = eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y; - picpos = pos + eY * 0.5 * mySize_y; - numpos = picpos + eX * 0.5 * mySize_y; + } else { // right align + barpos = pos + eX * mySize_x - eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y; + barsize = eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y; } - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + if(autocvar_hud_panel_powerups_progressbar) + { + HUD_Panel_GetProgressBarColor(rightname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL); + } + if(rightcnt > 1) + DrawNumIcon(autocvar_hud_panel_powerups_iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, '1 1 1', 1); if(rightcnt <= 5) - drawpic_skin_expanding_two(picpos, rightname, '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1)); - else - drawpic_skin(picpos, rightname, '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(numpos, rightcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + DrawNumIcon_expanding(autocvar_hud_panel_powerups_iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, '1 1 1', bound(0, (rightcnt - rightexact) / 0.5, 1)); } } else { if(leftcnt) { - len = strlen(ftos(leftcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(autocvar_hud_panel_powerups_baralign == 1 || autocvar_hud_panel_powerups_baralign == 3) { // down align + barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/30); + barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30); + } else { // up align barpos = pos; barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30); + } + + if(autocvar_hud_panel_powerups_iconalign == 1 || autocvar_hud_panel_powerups_iconalign == 3) { // down align + picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x); + numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x; + } else { // up align picpos = pos + eX * 0.05 * mySize_x; - numpos = pos + eX * ((2-len)/2) * 0.25 * mySize_x + eY * 0.4 * mySize_x; - } else { - barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/30); - barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30); - picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.65 * mySize_x; - numpos = pos + eX * ((2-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.25 * mySize_x; + numpos = pos + eY * 0.4 * mySize_x; } - HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + if(autocvar_hud_panel_powerups_progressbar) + { + HUD_Panel_GetProgressBarColor(leftname) + HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL); + } if(leftcnt <= 5) - drawpic_skin_expanding_two(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1)); - else - drawpic_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(numpos, leftcnt, len, 0, 0.25 * mySize_x, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_aspect_skin_expanding(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, bound(0, (leftcnt - leftexact) / 0.5, 1)); + if(leftcnt > 1) + drawpic_aspect_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(numpos, ftos(leftcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); } if(rightcnt) { - len = strlen(ftos(rightcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(autocvar_hud_panel_powerups_baralign == 0 || autocvar_hud_panel_powerups_baralign == 3) { // up align barpos = pos + eX * 0.5 * mySize_x; barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/30); - picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x; - numpos = pos + eX * ((2-len)/2) * 0.25 * mySize_x + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x; - } else { + } else { // down align barpos = pos + eY * mySize_y - eY * mySize_y * min(1, rightcnt/30) + eX * 0.5 * mySize_x; barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/30); - picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.65 * mySize_x + eX * 0.5 * mySize_x; - numpos = pos + eX * ((2-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.25 * mySize_x + eX * 0.5 * mySize_x; } - HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + if(autocvar_hud_panel_powerups_iconalign == 0 || autocvar_hud_panel_powerups_iconalign == 3) { // up align + picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x; + numpos = pos + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x; + } else { // down align + picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x) + eX * 0.5 * mySize_x; + numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x + eX * 0.5 * mySize_x; + } + + if(autocvar_hud_panel_powerups_progressbar) + { + HUD_Panel_GetProgressBarColor(rightname) + HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1) * panel_fg_alpha, DRAWFLAG_NORMAL); + } if(rightcnt <= 5) - drawpic_skin_expanding_two(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1)); - else - drawpic_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(numpos, rightcnt, len, 0, 0.25 * mySize_x, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_aspect_skin_expanding(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, bound(0, (rightcnt - rightexact) / 0.5, 1)); + if(rightcnt > 1) + drawpic_aspect_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(numpos, ftos(rightcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); } } + drawfont = hud_font; } // Health/armor (#3) // void HUD_HealthArmor(void) { - float id = HUD_PANEL_HEALTHARMOR; + if(!autocvar_hud_panel_healtharmor && !autocvar__hud_configure) + return; + + active_panel = HUD_PANEL_HEALTHARMOR; + HUD_Panel_UpdateCvars(healtharmor); vector pos, mySize; - pos = HUD_Panel_GetPos(id); - mySize = HUD_Panel_GetSize(id); + pos = panel_pos; + mySize = panel_size; - HUD_Panel_DrawBg(id, pos, mySize, 0); - float padding; - padding = HUD_Panel_GetPadding(id); - if(padding) + HUD_Panel_DrawBg(1); + if(panel_bg_padding) { - pos += '1 1 0' * padding; - mySize -= '2 2 0' * padding; + pos += '1 1 0' * panel_bg_padding; + mySize -= '2 2 0' * panel_bg_padding; } float armor, health; @@ -1922,7 +2078,7 @@ void HUD_HealthArmor(void) float fuel; fuel = getstati(GetAmmoStat(4)); // how much fuel do we have? - if(hud_configure) + if(autocvar__hud_configure) { armor = 150; health = 100; @@ -1932,12 +2088,12 @@ void HUD_HealthArmor(void) if(health <= 0) return; - float len; vector barpos, barsize; vector picpos; vector numpos; - if(cvar("hud_healtharmor") == 2) // combined health and armor display + drawfont = hud_bigfont; + if(autocvar_hud_panel_healtharmor == 2) // combined health and armor display { vector v; v = healtharmor_maxdamage(health, armor, armorblockpercent); @@ -1945,53 +2101,60 @@ void HUD_HealthArmor(void) float x; x = floor(v_x + 1); - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(autocvar_hud_panel_healtharmor_baralign == 1 || autocvar_hud_panel_healtharmor_baralign == 3) { // right align barpos = pos + eX * mySize_x - eX * mySize_x * min(1, x/400); barsize = eX * mySize_x * min(1, x/400) + eY * mySize_y; - picpos = pos; - numpos = picpos + eX * 1.5 * mySize_y; - } else { + } else { // left align barpos = pos; barsize = eX * mySize_x * min(1, x/400) + eY * mySize_y; - picpos = pos + eX * 3 * mySize_y; - numpos = pos; } + string biggercount; if(v_z) // NOT fully armored { - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("health"), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(picpos, "health", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + biggercount = "health"; + if(autocvar_hud_panel_healtharmor_progressbar) + { + HUD_Panel_GetProgressBarColor("health") + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + } if(armor) - drawpic_skin(picpos + eX * mySize_y, "armor", '0.5 0.5 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id) * armor / health, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos + eX * mySize_x - eX * 0.5 * mySize_y, "armor", '0.5 0.5 0' * mySize_y, '1 1 1', panel_fg_alpha * armor / health, DRAWFLAG_NORMAL); } else { - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("armor"), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(picpos + eX * mySize_y, "health", '0.5 0.5 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id) * health / armor, DRAWFLAG_NORMAL); - if(armor) - drawpic_skin(picpos, "armor", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + biggercount = "armor"; + if(autocvar_hud_panel_healtharmor_progressbar) + { + HUD_Panel_GetProgressBarColor("armor") + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + } + if(health) + drawpic_aspect_skin(pos + eX * mySize_x - eX * 0.5 * mySize_y, "health", '0.5 0.5 0' * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); } - HUD_DrawXNum_Colored(numpos, x, 3, mySize_y, HUD_Panel_GetFgAlpha(id)); // draw the combined health and armor + DrawNumIcon(autocvar_hud_panel_healtharmor_iconalign, pos, mySize, x, biggercount, 1, HUD_Get_Num_Color(x, 2 * 200), 1); // fuel - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { - barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100); - barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y; - } else { - barpos = pos; - barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y; - } if(fuel) - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL); + { + if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align + barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100); + barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y; + } else { + barpos = pos; + barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y; + } + HUD_Panel_GetProgressBarColor("fuel") + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); + } } - else { string leftname, rightname; float leftcnt, rightcnt; float leftactive, rightactive; float leftalpha, rightalpha; - if (cvar(strcat("hud_", HUD_Panel_GetName(id), "_flip"))) { // old style layout with armor left/top of health + if (autocvar_hud_panel_healtharmor_flip) { // old style layout with armor left/top of health leftname = "armor"; leftcnt = armor; if(leftcnt) @@ -2015,172 +2178,181 @@ void HUD_HealthArmor(void) rightalpha = min((armor+10)/55, 1); } - if (mySize_x/mySize_y > 5) + if (mySize_x/mySize_y > 4) { if(leftactive) { - len = strlen(ftos(leftcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(autocvar_hud_panel_healtharmor_baralign == 1 || autocvar_hud_panel_healtharmor_baralign == 3) { // right align barpos = pos + eX * 0.5 * mySize_x - eX * 0.5 * mySize_x * min(1, leftcnt/200); barsize = eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y; - picpos = pos + eX * 0.5 * mySize_x - eX * mySize_y; - numpos = picpos - eX * 3 * 0.5 * mySize_y + eX * (3-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y; - } else { + } else { // left align barpos = pos; barsize = eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y; - picpos = pos; - numpos = picpos + eX * mySize_y + eY * 0.25 * mySize_y; } - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id)); + if(autocvar_hud_panel_healtharmor_progressbar) + { + HUD_Panel_GetProgressBarColor(leftname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + } + DrawNumIcon(autocvar_hud_panel_healtharmor_iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, 200), 1); } if(rightactive) { - len = strlen(ftos(rightcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align barpos = pos + eX * 0.5 * mySize_x; barsize = eX * 0.5 * mySize_x * min(1, rightcnt/200) + eY * mySize_y; - picpos = pos + eX * 0.5 * mySize_x; - numpos = picpos + eX * mySize_y - eX * (3-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y; - } else { + } else { // right align barpos = pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, rightcnt/200); barsize = eX * 0.5 * mySize_x * min(1, rightcnt/200) + eY * mySize_y; - picpos = pos + eX * mySize_x - eX * mySize_y; - numpos = picpos - eX * 1.5 * mySize_y + eY * 0.25 * mySize_y; } - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(picpos, rightname, '1 1 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(numpos, rightcnt, 3, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id)); + if(autocvar_hud_panel_healtharmor_progressbar) + { + HUD_Panel_GetProgressBarColor(rightname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + } + DrawNumIcon(autocvar_hud_panel_healtharmor_iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(rightcnt, 200), 1); } - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { - barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100); - barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y; - } else { - barpos = pos; - barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y; - } if(fuel) - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL); + { + if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align + barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100); + barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y; + } else { + barpos = pos; + barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y; + } + HUD_Panel_GetProgressBarColor("fuel") + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); + } } - else if (mySize_x/mySize_y > 2) + else if (mySize_x/mySize_y > 1.5) { if(leftactive) { - len = strlen(ftos(leftcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(autocvar_hud_panel_healtharmor_baralign == 1 || autocvar_hud_panel_healtharmor_baralign == 3) { // right align barpos = pos + eX * mySize_x - eX * mySize_x * min(1, leftcnt/200); barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y; - picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y; - numpos = picpos - eX * len * 0.5 * mySize_y; - } else { + } else { // left align barpos = pos; barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y; - picpos = pos; - numpos = picpos + eX * 0.5 * mySize_y; } - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(picpos, leftname, '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id)); + if(autocvar_hud_panel_healtharmor_progressbar) + { + HUD_Panel_GetProgressBarColor(leftname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + } + DrawNumIcon(autocvar_hud_panel_healtharmor_iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, 200), 1); } if(rightactive) { - len = strlen(ftos(rightcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { - barpos = pos + eX * mySize_x - eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; - barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; - picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y + eY * 0.5 * mySize_y; - numpos = picpos - eX * len * 0.5 * mySize_y; - } else { + if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align barpos = pos + eY * 0.5 * mySize_y; barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; - picpos = pos + eY * 0.5 * mySize_y; - numpos = picpos + eX * 0.5 * mySize_y; + } else { // right align + barpos = pos + eX * mySize_x - eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; + barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; } - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(picpos, rightname, '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(numpos, rightcnt, len, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id)); + if(autocvar_hud_panel_healtharmor_progressbar) + { + HUD_Panel_GetProgressBarColor(rightname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + } + DrawNumIcon(autocvar_hud_panel_healtharmor_iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(rightcnt, 200), 1); } - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { - barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100); - barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y; - } else { - barpos = pos; - barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y; - } if(fuel) - HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL); + { + if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align + barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100); + barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y; + } else { + barpos = pos; + barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y; + } + HUD_Panel_GetProgressBarColor("fuel") + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); + } } else { if(leftactive) { - len = strlen(ftos(leftcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(autocvar_hud_panel_healtharmor_baralign == 1 || autocvar_hud_panel_healtharmor_baralign == 3) { // down align + barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/200); + barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200); + } else { // up align barpos = pos; barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200); + } + + if(autocvar_hud_panel_healtharmor_iconalign == 1 || autocvar_hud_panel_healtharmor_iconalign == 3) { // down align + picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x); + numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x; + } else { // up align picpos = pos + eX * 0.05 * mySize_x; - numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * 0.4 * mySize_x; - } else { - barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/200); - barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200); - picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.566 * mySize_x; - numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.166 * mySize_x; + numpos = pos + eY * 0.4 * mySize_x; } - HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.166 * mySize_x, HUD_Panel_GetFgAlpha(id)); + if(autocvar_hud_panel_healtharmor_progressbar) + { + HUD_Panel_GetProgressBarColor(leftname) + HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + } + drawpic_aspect_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(numpos, ftos(leftcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, HUD_Get_Num_Color(leftcnt, 200), panel_fg_alpha, DRAWFLAG_NORMAL); } if(rightactive) { - len = strlen(ftos(rightcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // up align barpos = pos + eX * 0.5 * mySize_x; barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/200); - picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x; - numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x; - } else { + } else { // down align barpos = pos + eY * mySize_y - eY * mySize_y * min(1, rightcnt/200) + eX * 0.5 * mySize_x; barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/200); - picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.566 * mySize_x + eX * 0.5 * mySize_x; - numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.166 * mySize_x + eX * 0.5 * mySize_x; } - HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(numpos, rightcnt, len, 0.166 * mySize_x, HUD_Panel_GetFgAlpha(id)); - } + if(autocvar_hud_panel_healtharmor_iconalign == 0 || autocvar_hud_panel_healtharmor_iconalign == 3) { // up align + picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x; + numpos = pos + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x; + } else { // down align + picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x) + eX * 0.5 * mySize_x; + numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x + eX * 0.5 * mySize_x; + } - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { - barpos = pos; - barsize = eX * 0.05 * mySize_x + eY * mySize_y * min(1, fuel/100); - } else { - barpos = pos + eY * mySize_y - eY * mySize_y * min(1, fuel/100); - barsize = eX * 0.05 * mySize_x + eY * mySize_y * min(1, fuel/100); + if(autocvar_hud_panel_healtharmor_progressbar) + { + HUD_Panel_GetProgressBarColor(rightname) + HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + } + drawpic_aspect_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(numpos, ftos(rightcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, HUD_Get_Num_Color(rightcnt, 200), panel_fg_alpha, DRAWFLAG_NORMAL); } + if(fuel) - HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL); + { + if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align + barpos = pos; + barsize = eX * 0.05 * mySize_x + eY * mySize_y * min(1, fuel/100); + } else { + barpos = pos + eY * mySize_y - eY * mySize_y * min(1, fuel/100); + barsize = eX * 0.05 * mySize_x + eY * mySize_y * min(1, fuel/100); + } + HUD_Panel_GetProgressBarColor("fuel") + HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL); + } } } + drawfont = hud_font; } -// ___TODO___ !!! // Notification area (#4) // @@ -2231,11 +2403,11 @@ void HUD_KillNotify_Push(string attacker, string victim, float actiontype, float void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) { float w; - float alsoprint; - alsoprint = (cvar("hud_notify_print") || !HUD_Panel_CheckActive(4)); // print message to console if: notify panel disabled, or cvar to do so enabled + float alsoprint, gentle; + alsoprint = (autocvar_hud_panel_notify_print || !panel_enabled); // print message to console if: notify panel disabled, or cvar to do so enabled + gentle = (autocvar_cl_gentle || autocvar_cl_gentle_messages); if(msg == MSG_SUICIDE) { - // TODO: cl_gentle w = DEATH_WEAPONOF(type); if(WEP_VALID(w)) { HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); @@ -2288,20 +2460,20 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) HUD_KillNotify_Push(s1, s2, 1, type); if(alsoprint) { - if(cvar("cl_gentle")) { + if(gentle) { print ("^1", s1, "^1 took action against a team mate\n"); } else { print ("^1", s1, "^1 mows down a team mate\n"); } } if (stof(s2) > 2 && type == KILL_TEAM_SPREE) { - if(cvar("cl_gentle")) + if(gentle) print ("^1",s1,"^1 ended a ",s3," scoring spree by going against a team mate\n"); else print ("^1",s1,"^1 ended a ",s3," kill spree by killing a team mate\n"); } else if (stof(s2) > 2) { - if(cvar("cl_gentle")) + if(gentle) print ("^1",s1,"'s ^1",s3," scoring spree was ended by a team mate!\n"); else print ("^1",s1,"'s ^1",s3," kill spree was ended by a team mate!\n"); @@ -2402,47 +2574,47 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) } } else if(msg == MSG_SPREE) { if(type == KILL_END_SPREE) { - if(cvar("cl_gentle")) + if(gentle) print ("^1",s1,"'s ^1", s2, " scoring spree was ended by ", s3, "\n"); else print ("^1",s1,"'s ^1", s2, " kill spree was ended by ", s3, "\n"); } else if(type == KILL_SPREE) { - if(cvar("cl_gentle")) + if(gentle) print ("^1",s1,"^1 made ",s2," scores in a row\n"); else print ("^1",s1,"^1 has ",s2," frags in a row\n"); } else if(type == KILL_SPREE_3) { - if(cvar("cl_gentle")) + if(gentle) print (s1,"^7 made a ^1TRIPLE SCORE\n"); else print (s1,"^7 made a ^1TRIPLE FRAG\n"); } else if(type == KILL_SPREE_5) { - if(cvar("cl_gentle")) + if(gentle) print (s1,"^7 unleashes ^1SCORING RAGE\n"); else print (s1,"^7 unleashes ^1RAGE\n"); } else if(type == KILL_SPREE_10) { - if(cvar("cl_gentle")) + if(gentle) print (s1,"^7 made ^1TEN SCORES IN A ROW!\n"); else print (s1,"^7 starts the ^1MASSACRE!\n"); } else if(type == KILL_SPREE_15) { - if(cvar("cl_gentle")) + if(gentle) print (s1,"^7 made ^1FIFTEEN SCORES IN A ROW!\n"); else print (s1,"^7 executes ^1MAYHEM!\n"); } else if(type == KILL_SPREE_20) { - if(cvar("cl_gentle")) + if(gentle) print (s1,"^7 made ^1TWENTY SCORES IN A ROW!\n"); else print (s1,"^7 is a ^1BERSERKER!\n"); } else if(type == KILL_SPREE_25) { - if(cvar("cl_gentle")) + if(gentle) print (s1,"^7 made ^1TWENTY FIFE SCORES IN A ROW!\n"); else print (s1,"^7 inflicts ^1CARNAGE!\n"); } else if(type == KILL_SPREE_30) { - if(cvar("cl_gentle")) + if(gentle) print (s1,"^7 made ^1THIRTY SCORES IN A ROW!\n"); else print (s1,"^7 unleashes ^1ARMAGEDDON!\n"); @@ -2452,7 +2624,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) HUD_KillNotify_Push(s1, "", 0, DEATH_DROWN); if(alsoprint) { - if(cvar("cl_gentle")) + if(gentle) print ("^1",s1, "^1 was in the water for too long\n"); else print ("^1",s1, "^1 drowned\n"); @@ -2465,7 +2637,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) HUD_KillNotify_Push(s1, "", 0, DEATH_LAVA); if(alsoprint) { - if(cvar("cl_gentle")) + if(gentle) print ("^1",s1, "^1 found a hot place\n"); else print ("^1",s1, "^1 turned into hot slag\n"); @@ -2474,7 +2646,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); if(alsoprint) { - if(cvar("cl_gentle")) + if(gentle) print ("^1",s1, "^1 tested gravity (and it worked)\n"); else print ("^1",s1, "^1 hit the ground with a crunch\n"); @@ -2487,7 +2659,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); if(alsoprint) { - if(cvar("cl_gentle")) + if(gentle) print ("^1",s1, "^1 discovered a swamp\n"); else print ("^1",s1, "^1 is now conserved for centuries to come\n"); @@ -2516,7 +2688,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); if(alsoprint) { - if(cvar("cl_gentle")) + if(gentle) print ("^1",s1, "^1 felt a little hot\n"); else print ("^1",s1, "^1 burnt to death\n"); @@ -2525,14 +2697,14 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); if(alsoprint) { - if(cvar("cl_gentle")) + if(gentle) print ("^1",s1, "^1 needs a restart\n"); else print ("^1",s1, "^1 died\n"); } } } else if(msg == MSG_KILL_ACTION_SPREE) { - if(cvar("cl_gentle")) + if(gentle) print ("^1",s1,"^1 needs a restart after a ",s2," scoring spree\n"); else print ("^1",s1,"^1 died with a ",s2," kill spree\n"); @@ -2549,6 +2721,9 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) } else if(type == INFO_RETURNFLAG) { HUD_KillNotify_Push(s1, s2, 0, INFO_RETURNFLAG); print(s1, "^7 returned the ", s2, "\n"); + } else if(type == INFO_CAPTUREFLAG) { + HUD_KillNotify_Push(s1, s2, 0, INFO_CAPTUREFLAG); + print(s1, "^7 captured the ", s2, s3, "\n"); } } } @@ -2557,78 +2732,80 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) void HUD_Centerprint(string s1, string s2, float type, float msg) { + float gentle; + gentle = (autocvar_cl_gentle || autocvar_cl_gentle_messages); if(msg == MSG_SUICIDE) { if (type == DEATH_TEAMCHANGE) { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "You are now on: ", s1)); } else if (type == DEATH_AUTOTEAMCHANGE) { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "You have been moved into a different team to improve team balance\nYou are now on: ", s1)); } else if (type == DEATH_CAMP) { - if(cvar("cl_gentle")) + if(gentle) centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Reconsider your tactics, camper!")); else centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Die camper!")); } else if (type == DEATH_NOAMMO) { - if(cvar("cl_gentle")) + if(gentle) centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You are reinserted into the game for running out of ammo...")); else centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were killed for running out of ammo...")); } else if (type == DEATH_ROT) { - if(cvar("cl_gentle")) + if(gentle) centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You need to preserve your health")); else centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You grew too old without taking your medicine")); } else if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) { - if(cvar("cl_gentle")) + if(gentle) centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Don't go against team mates!")); else centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Don't shoot your team mates!")); } else if (type == DEATH_QUIET) { // do nothing } else if (type == DEATH_KILL) { - if(cvar("cl_gentle")) + if(gentle) centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You need to be more careful!")); else centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You killed your own dumb self!")); } } else if(msg == MSG_KILL) { if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) { - if(cvar("cl_gentle")) { + if(gentle) { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You went against", s1, ",a team mate!")); } else { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You fragged ", s1, ", a team mate!")); } } else if (type == KILL_FIRST_BLOOD) { - if(cvar("cl_gentle")) { + if(gentle) { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1First score")); } else { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1First blood")); } } else if (type == KILL_FIRST_VICTIM) { - if(cvar("cl_gentle")) { + if(gentle) { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1First casualty")); } else { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1First victim")); } } else if (type == KILL_TYPEFRAG) { // s2 contains "advanced kill messages" such as ping, handicap... - if(cvar("cl_gentle")) { + if(gentle) { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You scored against ^7", s1, "^1 who was typing!", s2)); } else { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You typefragged ^7", s1, s2)); } } else if (type == KILL_TYPEFRAGGED) { - if(cvar("cl_gentle")) { + if(gentle) { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were scored against by ^7", s1, "^1 while you were typing!", s2)); } else { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were typefragged by ^7", s1, s2)); } } else if (type == KILL_FRAG) { - if(cvar("cl_gentle")) { + if(gentle) { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You scored against ^7", s1, s2)); } else { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You fragged ^7", s1, s2)); } } else if (type == KILL_FRAGGED) { - if(cvar("cl_gentle")) { + if(gentle) { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were scored against by ^7", s1, s2)); } else { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were fragged by ^7", s1, s2)); @@ -2642,50 +2819,50 @@ void HUD_Centerprint(string s1, string s2, float type, float msg) void HUD_Notify (void) { - float id = HUD_PANEL_NOTIFY; + if(!autocvar_hud_panel_notify && !autocvar__hud_configure) + return; + + active_panel = HUD_PANEL_NOTIFY; + HUD_Panel_UpdateCvars(notify); vector pos, mySize; - pos = HUD_Panel_GetPos(id); - mySize = HUD_Panel_GetSize(id); + pos = panel_pos; + mySize = panel_size; - HUD_Panel_DrawBg(id, pos, mySize, 0); - float padding; - padding = HUD_Panel_GetPadding(id); - if(padding) + HUD_Panel_DrawBg(1); + if(panel_bg_padding) { - pos += '1 1 0' * padding; - mySize -= '2 2 0' * padding; + pos += '1 1 0' * panel_bg_padding; + mySize -= '2 2 0' * panel_bg_padding; } float entries, height; - entries = bound(1, floor(14 * mySize_y/mySize_x), 12); + entries = bound(1, floor(10 * mySize_y/mySize_x), 10); height = mySize_y/entries; - entries -= 2; // top/bottom two lines reserved for info messaged, such as spec instructions vector fontsize; fontsize = '0.5 0.5 0' * height; float a; float when; - when = cvar("hud_notify_time"); + when = autocvar_hud_panel_notify_time; float fadetime; - fadetime = cvar("hud_notify_fadetime"); + fadetime = autocvar_hud_panel_notify_fadetime; string s; vector pos_attacker, pos_victim; vector weap_pos; - float width_attacker, width_victim; + float width_attacker; string attacker, victim; float i, j; for(j = 0; j < entries; ++j) { - if(cvar("hud_notify_flip")) + s = ""; + if(autocvar_hud_panel_notify_flip) i = j; else // rather nasty hack for ordering items from the bottom up i = entries - j - 1; - if(cvar("hud_notify_info_top")) - i += 2; // top/bottom two lines reserved for info messaged, such as spec instructions if(fadetime) { @@ -2703,341 +2880,185 @@ void HUD_Notify (void) } // TODO: maybe print in team colors? - // TODO: maybe this could be cleaned up somehow... - // TODO: less copypaste code below // // Y [used by] X - if(killnotify_actiontype[j] == 0 && !hud_configure) + if(killnotify_actiontype[j] == 0 && !autocvar__hud_configure) { - attacker = textShortenToWidth(killnotify_attackers[j], mySize_x - 2 * height, fontsize, stringwidth_colors); - - width_attacker = stringwidth(attacker, TRUE, fontsize); - pos_attacker = pos + eX * 0.5 * (mySize_x - width_attacker + 2 * height) + eY * 0.5 * fontsize_y + eY * i * height; + attacker = textShortenToWidth(killnotify_attackers[j], 0.48 * mySize_x - height, fontsize, stringwidth_colors); + pos_attacker = pos + eX * (0.52 * mySize_x + height) + eY * (0.5 * fontsize_y + i * height); + weap_pos = pos + eX * 0.5 * mySize_x - eX * height + eY * i * height; - weap_pos = pos + eX * 0.5 * (mySize_x - width_attacker) - eX * height + eY * i * height; if(killnotify_deathtype[j] == DEATH_GENERIC) { - drawpic_skin(weap_pos, "notify_death", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + s = "notify_death"; } else if(killnotify_deathtype[j] == DEATH_NOAMMO) { - drawpic_skin(weap_pos, "notify_outofammo", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + s = "notify_outofammo"; } else if(killnotify_deathtype[j] == DEATH_KILL) { - drawpic_skin(weap_pos, "notify_selfkill", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + s = "notify_selfkill"; } else if(killnotify_deathtype[j] == DEATH_CAMP) { - drawpic_skin(weap_pos, "notify_camping", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + s = "notify_camping"; } else if(killnotify_deathtype[j] == KILL_TEAM_RED) { - drawpic_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '1 0 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + s = "notify_teamkill_red"; } else if(killnotify_deathtype[j] == KILL_TEAM_BLUE) { - drawpic_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '0 0 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + s = "notify_teamkill_blue"; } else if(killnotify_deathtype[j] == DEATH_DROWN) { - drawpic_skin(weap_pos, "notify_water", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + s = "notify_water"; } else if(killnotify_deathtype[j] == DEATH_SLIME) { - drawpic_skin(weap_pos, "notify_slime", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + s = "notify_slime"; } else if(killnotify_deathtype[j] == DEATH_LAVA) { - drawpic_skin(weap_pos, "notify_lava", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + s = "notify_lava"; } else if(killnotify_deathtype[j] == DEATH_FALL) { - drawpic_skin(weap_pos, "notify_fall", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + s = "notify_fall"; } else if(killnotify_deathtype[j] == DEATH_SHOOTING_STAR) { - drawpic_skin(weap_pos, "notify_shootingstar", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + s = "notify_shootingstar"; } else if(killnotify_deathtype[j] == DEATH_HURTTRIGGER || killnotify_deathtype[j] == DEATH_CUSTOM) { - drawpic_skin(weap_pos, "notify_void", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + s = "notify_death"; } else if(killnotify_deathtype[j] == INFO_GOTFLAG) { if(killnotify_victims[j] == "^1RED^7 flag") - s = "red"; + { + s = "notify_red_taken"; + } + else + { + s = "notify_blue_taken"; + } + } + else if(killnotify_deathtype[j] == INFO_RETURNFLAG) + { + if(killnotify_victims[j] == "^1RED^7 flag") + { + s = "notify_red_returned"; + } + else + { + s = "notify_blue_returned"; + } + } + else if(killnotify_deathtype[j] == INFO_LOSTFLAG) + { + if(killnotify_victims[j] == "^1RED^7 flag") + { + s = "notify_red_lost"; + } else - s = "blue"; - drawpic_skin(weap_pos, strcat("flag_", s, "_carrying"), '1 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + { + s = "notify_blue_lost"; + } } - else if(killnotify_deathtype[j] == INFO_RETURNFLAG) + else if(killnotify_deathtype[j] == INFO_CAPTUREFLAG) { if(killnotify_victims[j] == "^1RED^7 flag") - s = "red"; + { + s = "notify_red_captured"; + } else - s = "blue"; - drawpic_skin(weap_pos, strcat("flag_", s, "_taken"), '1 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + { + s = "notify_blue_captured"; + } } - else if(killnotify_deathtype[j] == INFO_LOSTFLAG) + if(s != "" && a) { - if(killnotify_victims[j] == "^1RED^7 flag") - s = "red"; - else - s = "blue"; - drawpic_skin(weap_pos, strcat("flag_", s, "_lost"), '1 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); } } // X [did action to] Y else { - if(hud_configure) + if(autocvar__hud_configure) { - attacker = textShortenToWidth("Player1", 0.5 * mySize_x - height, fontsize, stringwidth_colors); - victim = textShortenToWidth("Player2", 0.5 * mySize_x - height, fontsize, stringwidth_colors); + attacker = textShortenToWidth("Player1", 0.48 * mySize_x - height, fontsize, stringwidth_colors); + victim = textShortenToWidth("Player2", 0.48 * mySize_x - height, fontsize, stringwidth_colors); a = bound(0, (when - j) / 4, 1); } else { - attacker = textShortenToWidth(killnotify_attackers[j], 0.5 * mySize_x - height, fontsize, stringwidth_colors); - victim = textShortenToWidth(killnotify_victims[j], 0.5 * mySize_x - height, fontsize, stringwidth_colors); + attacker = textShortenToWidth(killnotify_attackers[j], 0.48 * mySize_x - height, fontsize, stringwidth_colors); + victim = textShortenToWidth(killnotify_victims[j], 0.48 * mySize_x - height, fontsize, stringwidth_colors); } width_attacker = stringwidth(attacker, TRUE, fontsize); - width_victim = stringwidth(victim, TRUE, fontsize); - pos_attacker = pos + eX * 0.5 * ((0.5 * mySize_x - height) - width_attacker) + eY * 0.5 * fontsize_y + eY * i * height; - pos_victim = pos + eX * 0.5 * ((0.5 * mySize_x - height) - width_victim) + eY * 0.5 * fontsize_y + eX * 0.5 * mySize_x + eX * height + eY * i * height; + pos_attacker = pos + eX * (0.48 * mySize_x - height - width_attacker) + eY * (0.5 * fontsize_y + i * height); + pos_victim = pos + eX * (0.52 * mySize_x + height) + eY * (0.5 * fontsize_y + i * height); weap_pos = pos + eX * 0.5 * mySize_x - eX * height + eY * i * height; - if(hud_configure) // example actions for config mode + if(autocvar__hud_configure) // example actions for config mode { - drawpic_skin(weap_pos, strcat("weapon", "electro"), '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + s = "weaponelectro"; } else if(WEP_VALID(killnotify_deathtype[j])) { self = get_weaponinfo(killnotify_deathtype[j]); - drawpic_skin(weap_pos, strcat("weapon", self.netname), '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + s = strcat("weapon", self.netname); } else if(killnotify_deathtype[j] == KILL_TEAM_RED) { - drawpic_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '1 0 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + s = "notify_teamkill_red"; } else if(killnotify_deathtype[j] == KILL_TEAM_BLUE) { - drawpic_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '0 0 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + s = "notify_teamkill_red"; } else if(killnotify_deathtype[j] == DEATH_DROWN) { - drawpic_skin(weap_pos, "notify_water", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + s = "notify_water"; } else if(killnotify_deathtype[j] == DEATH_SLIME) { - drawpic_skin(weap_pos, "notify_slime", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + s = "notify_slime"; } else if(killnotify_deathtype[j] == DEATH_LAVA) { - drawpic_skin(weap_pos, "notify_lava", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + s = "notify_lava"; } else if(killnotify_deathtype[j] == DEATH_FALL) { - drawpic_skin(weap_pos, "notify_fall", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + s = "notify_fall"; } else if(killnotify_deathtype[j] == DEATH_SHOOTING_STAR) { - drawpic_skin(weap_pos, "notify_shootingstar", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + s = "notify_shootingstar"; } else if(killnotify_deathtype[j] == DEATH_HURTTRIGGER || killnotify_deathtype[j] == DEATH_CUSTOM) // DEATH_CUSTOM is also void, right? { - drawpic_skin(weap_pos, "notify_void", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - } - } - - } - - // Info messages - // - entity tm; - vector o; - o = pos; - if(cvar("hud_notify_info_top")) - o = pos + eY; - else - o = pos + eY * mySize_y - eY * 2 * height; - - if(spectatee_status && !intermission) - { - //drawfont = hud_bigfont; - if(spectatee_status == -1) - s = "^1Observing"; - else - s = GetPlayerName(spectatee_status - 1); - - //s = textShortenToWidth(s, mySize_y, 0.5 * height, stringwidth_colors); - //drawcolorcodedstring(pos + eY * 0.25 * height, s, 0.5 * height, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - //drawfont = hud_font; - - // spectator text in the upper right corner - if(spectatee_status == -1) - s = strcat("^1Press ^3", getcommandkey("primary fire", "+attack"), "^1 to spectate"); - else - s = strcat("^1Press ^3", getcommandkey("primary fire", "+attack"), "^1 for another player"); - drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - o += eY * fontsize_y; - - if(spectatee_status == -1) - s = strcat("^1Use ^3", getcommandkey("next weapon", "weapnext"), "^1 or ^3", getcommandkey("previous weapon", "weapprev"), "^1 to change the speed"); - else - s = strcat("^1Press ^3", getcommandkey("secondary fire", "+attack2"), "^1 to observe"); - drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - o += eY * fontsize_y; - - s = strcat("^1Press ^3", getcommandkey("server info", "+show_info"), "^1 for gamemode info"); - drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - o += eY * fontsize_y; - - if(gametype == GAME_ARENA) - s = "^1Wait for your turn to join"; - else if(gametype == GAME_LMS) - { - entity sk; - sk = playerslots[player_localentnum - 1]; - if(sk.(scores[ps_primary]) >= 666) - s = "^1Match has already begun"; - else if(sk.(scores[ps_primary]) > 0) - s = "^1You have no more lives left"; - else - s = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join"); - } - else - s = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join"); - drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - o += eY * fontsize_y; - - //show restart countdown: - if (time < getstatf(STAT_GAMESTARTTIME)) { - float countdown; - //we need to ceil, otherwise the countdown would be off by .5 when using round() - countdown = ceil(getstatf(STAT_GAMESTARTTIME) - time); - s = strcat("^1Game starts in ^3", ftos(countdown), "^1 seconds"); - drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - o += eY * fontsize_y; - } - } - if(warmup_stage && !intermission) - { - s = "^2Currently in ^1warmup^2 stage!"; - drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - o += eY * fontsize_y; - } - - string blinkcolor; - if(mod(time, 1) >= 0.5) - blinkcolor = "^1"; - else - blinkcolor = "^3"; - - if(ready_waiting && !intermission && !spectatee_status) - { - if(ready_waiting_for_me) - { - if(warmup_stage) - s = strcat(blinkcolor, "Press ^3", getcommandkey("ready", "ready"), blinkcolor, " to end warmup"); - else - s = strcat(blinkcolor, "Press ^3", getcommandkey("ready", "ready"), blinkcolor, " once you are ready"); - } - else - { - if(warmup_stage) - s = strcat("^2Waiting for others to ready up to end warmup..."); - else - s = strcat("^2Waiting for others to ready up..."); - } - drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - o += eY * fontsize_y; - } - else if(warmup_stage && !intermission && !spectatee_status) - { - s = strcat("^2Press ^3", getcommandkey("ready", "ready"), "^2 to end warmup"); - drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - o += eY * fontsize_y; - } - - if(teamplay && !intermission && !spectatee_status && gametype != GAME_CA && teamnagger) - { - float ts_min, ts_max; - tm = teams.sort_next; - if (tm) - { - for(; tm.sort_next; tm = tm.sort_next) - { - if(!tm.team_size || tm.team == COLOR_SPECTATOR) - continue; - if(!ts_min) ts_min = tm.team_size; - else ts_min = min(ts_min, tm.team_size); - if(!ts_max) ts_max = tm.team_size; - else ts_max = max(ts_max, tm.team_size); + s = "notify_void"; } - if ((ts_max - ts_min) > 1) + if(s != "" && a) { - s = strcat(blinkcolor, "Teamnumbers are unbalanced!"); - tm = GetTeam(myteam, false); - if (tm) - if (tm.team != COLOR_SPECTATOR) - if (tm.team_size == ts_max) - s = strcat(s, " Press ^3", getcommandkey("team menu", "menu_showteamselect"), blinkcolor, " to adjust"); - - drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - o += eY * fontsize_y; + drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos_victim, victim, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); } } } - if(hud_configure) - { - s = "^7Press ^3ESC ^7to show HUD options."; - drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - o += eY * fontsize_y; - s = "^3Doubleclick a panel for panel-specific options."; - drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - o += eY * fontsize_y; - } } // Timer (#5) // +// TODO: macro string seconds_tostring(float sec) { float minutes; @@ -3053,18 +3074,20 @@ string seconds_tostring(float sec) void HUD_Timer(void) { - float id = HUD_PANEL_TIMER; + if(!autocvar_hud_panel_timer && !autocvar__hud_configure) + return; + + active_panel = HUD_PANEL_TIMER; + HUD_Panel_UpdateCvars(timer); vector pos, mySize; - pos = HUD_Panel_GetPos(id); - mySize = HUD_Panel_GetSize(id); + pos = panel_pos; + mySize = panel_size; - HUD_Panel_DrawBg(id, pos, mySize, 0); - float padding; - padding = HUD_Panel_GetPadding(id); - if(padding) + HUD_Panel_DrawBg(1); + if(panel_bg_padding) { - pos += '1 1 0' * padding; - mySize -= '2 2 0' * padding; + pos += '1 1 0' * panel_bg_padding; + mySize -= '2 2 0' * panel_bg_padding; } string timer; @@ -3085,7 +3108,7 @@ void HUD_Timer(void) else timer_color = '1 0 0'; //red - if (cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) { + if (autocvar_hud_panel_timer_increment || timelimit == 0 || warmup_stage) { if (time < getstatf(STAT_GAMESTARTTIME)) { //while restart is still active, show 00:00 timer = seconds_tostring(0); @@ -3097,25 +3120,29 @@ void HUD_Timer(void) timer = seconds_tostring(timeleft); } - drawstring_aspect(pos, timer, mySize, mySize_y, timer_color, HUD_Panel_GetFgAlpha(HUD_PANEL_TIMER), DRAWFLAG_NORMAL); + drawfont = hud_bigfont; + drawstring_aspect(pos, timer, mySize, timer_color, panel_fg_alpha, DRAWFLAG_NORMAL); + drawfont = hud_font; } // Radar (#6) // void HUD_Radar(void) { - float id = HUD_PANEL_RADAR; + if ((autocvar_hud_panel_radar == 0 || (autocvar_hud_panel_radar != 2 && !teamplay)) && !autocvar__hud_configure) + return; + + active_panel = HUD_PANEL_RADAR; + HUD_Panel_UpdateCvars(radar); vector pos, mySize; - pos = HUD_Panel_GetPos(id); - mySize = HUD_Panel_GetSize(id); + pos = panel_pos; + mySize = panel_size; - HUD_Panel_DrawBg(id, pos, mySize, 0); - float padding; - padding = HUD_Panel_GetPadding(id); - if(padding) + HUD_Panel_DrawBg(1); + if(panel_bg_padding) { - pos += '1 1 0' * padding; - mySize -= '2 2 0' * padding; + pos += '1 1 0' * panel_bg_padding; + mySize -= '2 2 0' * panel_bg_padding; } local float color1, color2; // color already declared as a global in hud.qc @@ -3132,7 +3159,7 @@ void HUD_Radar(void) teamradar_loadcvars(); - switch(hud_radar_zoommode) + switch(hud_panel_radar_zoommode) { default: case 0: @@ -3149,13 +3176,13 @@ void HUD_Radar(void) break; } - switch(hud_radar_rotation) + switch(hud_panel_radar_rotation) { case 0: teamradar_angle = view_angles_y - 90; break; default: - teamradar_angle = 90 * hud_radar_rotation; + teamradar_angle = 90 * hud_panel_radar_rotation; break; } @@ -3165,7 +3192,7 @@ void HUD_Radar(void) teamradar_extraclip_mins = teamradar_extraclip_maxs = '0 0 0'; // we always center // pixels per world qu to match the teamradar_size2d_x range in the longest dimension - if(hud_radar_rotation == 0) + if(hud_panel_radar_rotation == 0) { // max-min distance must fit the radar in any rotation bigsize = vlen_minnorm2d(teamradar_size2d) * scale2d / (1.05 * vlen2d(mi_max - mi_min)); @@ -3188,7 +3215,7 @@ void HUD_Radar(void) ); } - normalsize = vlen_maxnorm2d(teamradar_size2d) * scale2d / hud_radar_scale; + normalsize = vlen_maxnorm2d(teamradar_size2d) * scale2d / hud_panel_radar_scale; if(bigsize > normalsize) normalsize = bigsize; @@ -3209,12 +3236,12 @@ void HUD_Radar(void) mySize_y ); - draw_teamradar_background(hud_radar_background_alpha, hud_radar_foreground_alpha); + draw_teamradar_background(hud_panel_radar_background_alpha, hud_panel_radar_foreground_alpha); for(tm = world; (tm = find(tm, classname, "radarlink")); ) draw_teamradar_link(tm.origin, tm.velocity, tm.team); for(tm = world; (tm = findflags(tm, teamradar_icon, 0xFFFFFF)); ) - draw_teamradar_icon(tm.origin, tm.teamradar_icon, tm, tm.teamradar_color, HUD_Panel_GetFgAlpha(id)); + draw_teamradar_icon(tm.origin, tm.teamradar_icon, tm, tm.teamradar_color, panel_fg_alpha); for(tm = world; (tm = find(tm, classname, "entcs_receiver")); ) { color2 = GetPlayerColor(tm.sv_entnum); @@ -3230,29 +3257,31 @@ void HUD_Radar(void) // void HUD_Score(void) { - float id = HUD_PANEL_SCORE; + if(!autocvar_hud_panel_score && !autocvar__hud_configure) + return; + + active_panel = HUD_PANEL_SCORE; + HUD_Panel_UpdateCvars(score); vector pos, mySize; - pos = HUD_Panel_GetPos(id); - mySize = HUD_Panel_GetSize(id); + pos = panel_pos; + mySize = panel_size; - HUD_Panel_DrawBg(id, pos, mySize, 0); - float padding; - padding = HUD_Panel_GetPadding(id); - if(padding) + HUD_Panel_DrawBg(1); + if(panel_bg_padding) { - pos += '1 1 0' * padding; - mySize -= '2 2 0' * padding; + pos += '1 1 0' * panel_bg_padding; + mySize -= '2 2 0' * panel_bg_padding; } float score, distribution, leader; - float score_len, distr_len; vector distribution_color; entity tm, pl, me; me = (spectatee_status > 0) ? playerslots[spectatee_status - 1] : playerslots[player_localentnum - 1]; - // TODO... this (race part) still uses constant coordinates :/ if((scores_flags[ps_primary] & SFL_TIME) && !teamplay) { // race/cts record display on HUD - /*pl = players.sort_next; + string timer, distrtimer; + + pl = players.sort_next; if(pl == me) pl = pl.sort_next; if(scores_flags[ps_primary] & SFL_ZERO_IS_WORST) @@ -3260,57 +3289,35 @@ void HUD_Score(void) pl = world; score = me.(scores[ps_primary]); - - float racemin, racesec, racemsec; - float distsec, distmsec, minusplus; - - racemin = floor(score/(60 * TIME_FACTOR)); - racesec = floor((score - racemin*(60 * TIME_FACTOR))/TIME_FACTOR); - racemsec = score - racemin*60*TIME_FACTOR - racesec*TIME_FACTOR; + timer = TIME_ENCODED_TOSTRING(score); if (pl && ((!(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)) || score)) { // distribution display distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]); - if (distribution < TIME_FACTOR && distribution > -TIME_FACTOR) - distmsec = fabs(distribution); - else { - distsec = floor(fabs(distribution)/TIME_FACTOR); - distmsec = fabs(distribution) - distsec*TIME_FACTOR; - if (distribution < 0) - distsec = -distsec; - } + distrtimer = ftos(distribution/pow(10, TIME_DECIMALS)); if (distribution <= 0) { - distribution_color = eY; - minusplus = 1; // minusplus 1: always prefix with minus sign + distribution_color = '0 1 0'; } else { - distribution_color = eX; - minusplus = 2; // minusplus 1: always prefix with plus sign + distribution_color = '1 0 0'; } - HUD_DrawXNum(bottomright - '0 48 0' - '16 0 0' * TIME_DECIMALS, distmsec, -TIME_DECIMALS, 0, 16, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(bottomright - '68 48 0' - '16 0 0' * TIME_DECIMALS, distsec, 4, minusplus, 16, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(bottomright - '10 48 0' - '16 0 0' * TIME_DECIMALS, "num_dot", '16 16 0', distribution_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE); + drawstring_aspect(pos + eX * 0.75 * mySize_x, distrtimer, eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL); } // race record display - if (distribution <= 0 || distribution == score) // draw the highlight background behind the timer if we have the lead - drawpic_skin(bottomright - '0 32 0' - '32 0 0' * (4 + TIME_DECIMALS), "num_leading_4", '0 28 0' + '32 0 0' * (4 + TIME_DECIMALS), '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - - HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0', racemsec, -TIME_DECIMALS, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '66 0 0', racesec, -2, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '18 0 0', "num_dot", '30 30 0', '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE); - - HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '132 0 0', racemin, -2, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - drawpic_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '84 0 0', "num_colon", '30 30 0', '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE); - */ + if (distribution <= 0) + HUD_Panel_DrawHighlight(pos, eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawfont = hud_bigfont; + drawstring_aspect(pos, timer, eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawfont = hud_font; } else if (!teamplay) { // non-teamgames // me vector := [team/connected frags id] pl = players.sort_next; if(pl == me) pl = pl.sort_next; - if(hud_configure) + if(autocvar__hud_configure) distribution = 42; else if(pl) distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]); @@ -3318,7 +3325,7 @@ void HUD_Score(void) distribution = 0; score = me.(scores[ps_primary]); - if(hud_configure) + if(autocvar__hud_configure) score = 123; if(distribution >= 5) { @@ -3332,28 +3339,25 @@ void HUD_Score(void) else distribution_color = eX; - score_len = strlen(ftos(score)); - distr_len = strlen(ftos(distribution)); - - HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * 0.33 * mySize_y, distribution, 3, 3, 0.33 * mySize_y, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawstring_aspect(pos + eX * 0.75 * mySize_x, ftos(distribution), eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL); if (leader) - drawpic_skin(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("num_leading_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * mySize_y - eX * 3 * 0.33 * mySize_y, score, 3, 0, mySize_y, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + HUD_Panel_DrawHighlight(pos, eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawfont = hud_bigfont; + drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize_x + eY * mySize_y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL); + drawfont = hud_font; } else { // teamgames float max_fragcount; max_fragcount = -99; float teamnum; for(tm = teams.sort_next; tm; tm = tm.sort_next) { - if(tm.team == COLOR_SPECTATOR || (!tm.team_size && !hud_configure)) // no players? don't display + if(tm.team == COLOR_SPECTATOR || (!tm.team_size && !autocvar__hud_configure)) // no players? don't display continue; score = tm.(teamscores[ts_primary]); - if(hud_configure) + if(autocvar__hud_configure) score = 123; leader = 0; - score_len = strlen(ftos(score)); - if (score > max_fragcount) max_fragcount = score; @@ -3361,14 +3365,16 @@ void HUD_Score(void) if (max_fragcount == score) leader = 1; if (leader) - drawpic_skin(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("num_leading_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * mySize_y - eX * 3 * 0.33 * mySize_y, score, 3, 0, mySize_y, GetTeamRGB(tm.team) * 0.8, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + HUD_Panel_DrawHighlight(pos, eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawfont = hud_bigfont; + drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize_x + eY * mySize_y, GetTeamRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL); + drawfont = hud_font; } else { if (max_fragcount == score) leader = 1; if (leader) - drawpic_skin(pos + eX * mySize_x - eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y * teamnum, strcat("num_leading_", ftos(score_len)), eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * 0.33 * mySize_y + eY * 0.33 * mySize_y * teamnum, score, 3, 0, 0.33 * mySize_y, GetTeamRGB(tm.team) * 0.8, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + HUD_Panel_DrawHighlight(pos + eX * 0.75 * mySize_x + eY * (1/3) * teamnum * mySize_y, eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos + eX * 0.75 * mySize_x + eY * (1/3) * teamnum * mySize_y, ftos(score), eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, GetTeamRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL); teamnum += 1; } } @@ -3378,32 +3384,52 @@ void HUD_Score(void) // Race timer (#8) // void HUD_RaceTimer (void) { - float id = HUD_PANEL_RACETIMER; + if(!autocvar_hud_panel_racetimer && !(gametype == GAME_RACE || gametype == GAME_CTS) && !autocvar__hud_configure) + return; + + active_panel = HUD_PANEL_RACETIMER; + HUD_Panel_UpdateCvars(racetimer); vector pos, mySize; - pos = HUD_Panel_GetPos(id); - mySize = HUD_Panel_GetSize(id); + pos = panel_pos; + mySize = panel_size; + + HUD_Panel_DrawBg(1); + if(panel_bg_padding) + { + pos += '1 1 0' * panel_bg_padding; + mySize -= '2 2 0' * panel_bg_padding; + } + + // always force 4:1 aspect + vector newSize; + if(mySize_x/mySize_y > 4) + { + newSize_x = 4 * mySize_y; + newSize_y = mySize_y; - HUD_Panel_DrawBg(id, pos, mySize, 0); - float padding; - padding = HUD_Panel_GetPadding(id); - if(padding) + pos_x = pos_x + (mySize_x - newSize_x) / 2; + } + else { - pos += '1 1 0' * padding; - mySize -= '2 2 0' * padding; + newSize_y = 1/4 * mySize_x; + newSize_x = mySize_x; + + pos_y = pos_y + (mySize_y - newSize_y) / 2; } + mySize = newSize; drawfont = hud_bigfont; float a, t; string s, forcetime; - if(hud_configure) + if(autocvar__hud_configure) { s = "0:13:37"; - drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.60 0.60 0' * mySize_y), s, '0.60 0.60 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.60 0.60 0' * mySize_y), s, '0.60 0.60 0' * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); s = "^1Intermediate 1 (+15.42)"; - drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.20 * mySize_y) + eY * 0.60 * mySize_y, s, '1 1 0' * 0.20 * mySize_y, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.20 * mySize_y) + eY * 0.60 * mySize_y, s, '1 1 0' * 0.20 * mySize_y, panel_fg_alpha, DRAWFLAG_NORMAL); s = strcat("^1PENALTY: ", ftos_decimals(20 * 0.1, 1), " (missing a checkpoint)"); - drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.20 * mySize_y) + eY * 0.80 * mySize_y, s, '1 1 0' * 0.20 * mySize_y, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.20 * mySize_y) + eY * 0.80 * mySize_y, s, '1 1 0' * 0.20 * mySize_y, panel_fg_alpha, DRAWFLAG_NORMAL); } else if(race_checkpointtime) { @@ -3436,9 +3462,7 @@ void HUD_RaceTimer (void) { if(s != "" && a > 0) { - dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0) - //drawcolorcodedstring(m - '0 16 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL); } if(race_penaltytime) @@ -3447,17 +3471,14 @@ void HUD_RaceTimer (void) { if(a > 0) { s = strcat("^1PENALTY: ", ftos_decimals(race_penaltytime * 0.1, 1), " (", race_penaltyreason, ")"); - dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0) - //drawcolorcodedstring(m - '0 32 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.8 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.8 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL); } } if(forcetime != "") { a = bound(0, (time - race_checkpointtime) / 0.5, 1); - //drawstring_expanding(m - '16 0 0' * stringwidth(forcetime, FALSE), forcetime, '32 32 0', '1 1 1', HUD_Panel_GetFgAlpha(id), 0, a); - drawstring_expanding(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(forcetime, FALSE, '1 1 0' * 0.6 * mySize_y), forcetime, '1 1 0' * 0.6 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), 0, a); + drawstring_expanding(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(forcetime, FALSE, '1 1 0' * 0.6 * mySize_y), forcetime, '1 1 0' * 0.6 * mySize_y, '1 1 1', panel_fg_alpha, 0, a); } else a = 1; @@ -3465,8 +3486,7 @@ void HUD_RaceTimer (void) { if(race_laptime && race_checkpoint != 255) { s = TIME_ENCODED_TOSTRING(TIME_ENCODE(time + TIME_DECODE(race_penaltyaccumulator) - race_laptime)); - //drawstring(m - '16 0 0' * stringwidth(s, FALSE), s, '32 32 0', '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.6 0.6 0' * mySize_y), s, '0.6 0.6 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.6 0.6 0' * mySize_y), s, '0.6 0.6 0' * mySize_y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); } } else @@ -3475,17 +3495,13 @@ void HUD_RaceTimer (void) { { a = bound(0, 2 - (time - race_mycheckpointtime), 1); s = MakeRaceString(race_mycheckpoint, TIME_DECODE(race_mycheckpointdelta), -!race_mycheckpointenemy, race_mycheckpointlapsdelta, race_mycheckpointenemy); - dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0) - //drawcolorcodedstring(m - '0 16 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL); } if(race_othercheckpointtime && race_othercheckpointenemy != "") { a = bound(0, 2 - (time - race_othercheckpointtime), 1); s = MakeRaceString(race_othercheckpoint, -TIME_DECODE(race_othercheckpointdelta), -!race_othercheckpointenemy, race_othercheckpointlapsdelta, race_othercheckpointenemy); - dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0) - //drawcolorcodedstring(m - '0 0 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL); } if(race_penaltytime && !race_penaltyaccumulator) @@ -3498,9 +3514,7 @@ void HUD_RaceTimer (void) { s = strcat("^1PENALTY: ", ftos_decimals(t - time, 1), " (", race_penaltyreason, ")"); else s = strcat("^2PENALTY: 0.0 (", race_penaltyreason, ")"); - dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0) - //drawcolorcodedstring(m - '0 32 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL); } } } @@ -3522,10 +3536,14 @@ float vote_change; // "time" when vote_active changed void HUD_VoteWindow(void) { - float id = HUD_PANEL_VOTE; + if(!autocvar_hud_panel_vote && !autocvar__hud_configure) + return; + + active_panel = HUD_PANEL_VOTE; + HUD_Panel_UpdateCvars(vote); vector pos, mySize; - pos = HUD_Panel_GetPos(id); - mySize = HUD_Panel_GetSize(id); + pos = panel_pos; + mySize = panel_size; string s; float a; @@ -3534,12 +3552,12 @@ void HUD_VoteWindow(void) vote_prev = vote_active; } - if(vote_active || hud_configure) + if(vote_active || autocvar__hud_configure) vote_alpha = bound(0, (time - vote_change) * 2, 1); else vote_alpha = bound(0, 1 - (time - vote_change) * 2, 1); - if(hud_configure) + if(autocvar__hud_configure) { vote_yescount = 3; vote_nocount = 2; @@ -3549,49 +3567,66 @@ void HUD_VoteWindow(void) if(!vote_alpha) return; - a = vote_alpha * bound(cvar_or("hud_vote_alreadyvoted_alpha", 0.75), 1 - vote_highlighted, 1); + a = vote_alpha * bound(autocvar_hud_panel_vote_alreadyvoted_alpha, 1 - vote_highlighted, 1); - HUD_Panel_DrawBg(id, pos, mySize, a); - float padding; - padding = HUD_Panel_GetPadding(id); - if(padding) + HUD_Panel_DrawBg(a); + if(panel_bg_padding) { - pos += '1 1 0' * padding; - mySize -= '2 2 0' * padding; + pos += '1 1 0' * panel_bg_padding; + mySize -= '2 2 0' * panel_bg_padding; } - drawpic_skin(pos, "voteprogress_back", mySize, '1 1 1', a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + // always force 3:1 aspect + vector newSize; + if(mySize_x/mySize_y > 3) + { + newSize_x = 3 * mySize_y; + newSize_y = mySize_y; - 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_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - s = textShortenToWidth(vote_called_vote, mySize_x * 0.96, '1 1 0' * mySize_y*(1/5), 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_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + pos_x = pos_x + (mySize_x - newSize_x) / 2; + } + else + { + newSize_y = 1/3 * mySize_x; + newSize_x = mySize_x; - // print the yes/no counts - s = strcat("Yes: ", ftos(vote_yescount)); - drawstring(pos + '0 0.6 0' * mySize_y + '0.02 0 0' * mySize_x, s, '1 1 0' * mySize_y*(1/6) , eY, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); - s = strcat("No: ", ftos(vote_nocount)); - drawstring(pos + '0 0.6 0' * mySize_y + '0.98 0 0' * mySize_x - eX * stringwidth(s, FALSE, '1 1 0' * mySize_y*(1/6)), s, '1 1 0' * mySize_y*(1/6), eX, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + pos_y = pos_y + (mySize_y - newSize_y) / 2; + } + mySize = newSize; - // draw the progress bars - drawsetcliparea(pos_x, pos_y, mySize_x * 0.5 * (vote_yescount/vote_needed), mySize_y); - drawpic_skin(pos, "voteprogress_prog", mySize, eY, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + s = "A vote has been called for:"; + drawstring_aspect(pos, s, eX * mySize_x + eY * (2/8) * mySize_y, '1 1 1', a * panel_fg_alpha, DRAWFLAG_NORMAL); + s = textShortenToWidth(vote_called_vote, mySize_x, '1 1 0' * mySize_y * (1.75/8), stringwidth_colors); + if(autocvar__hud_configure) + s = "^1Configure the HUD"; + drawcolorcodedstring_aspect(pos + eY * (2/8) * mySize_y, s, eX * mySize_x + eY * (1.75/8) * mySize_y, a * panel_fg_alpha, DRAWFLAG_NORMAL); - drawsetcliparea(pos_x + mySize_x - mySize_x * 0.5 * (vote_nocount/vote_needed), pos_y, mySize_x * 0.5, mySize_y); - drawpic_skin(pos, "voteprogress_prog", mySize, eX, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + // print the yes/no counts + s = strcat("Yes (", getcommandkey("not bound", "vyes"), "): ", ftos(vote_yescount)); + drawstring_aspect(pos + eY * (4/8) * mySize_y, s, eX * 0.5 * mySize_x + eY * (1.5/8) * mySize_y, '0 1 0', a * panel_fg_alpha, DRAWFLAG_NORMAL); + s = strcat("No (", getcommandkey("not bound", "vno"), "): ", ftos(vote_nocount)); + drawstring_aspect(pos + eX * 0.5 * mySize_x + eY * (4/8) * mySize_y, s, eX * 0.5 * mySize_x + eY * (1.5/8) * mySize_y, '1 0 0', a * panel_fg_alpha, DRAWFLAG_NORMAL); + + // draw the progress bar backgrounds + drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_back", eX * mySize_x + eY * (3/8) * mySize_y, '1 1 1', a * panel_fg_alpha, DRAWFLAG_NORMAL); // draw the highlights if(vote_highlighted == 1) { drawsetcliparea(pos_x, pos_y, mySize_x * 0.5, mySize_y); - drawpic_skin(pos, "voteprogress_voted", mySize, eY, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_voted", eX * mySize_x + eY * (3/8) * mySize_y, '0 1 0', a * panel_fg_alpha, DRAWFLAG_NORMAL); } else if(vote_highlighted == 2) { drawsetcliparea(pos_x + 0.5 * mySize_x, pos_y, mySize_x * 0.5, mySize_y); - drawpic_skin(pos, "voteprogress_voted", mySize, eX, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_voted", eX * mySize_x + eY * (3/8) * mySize_y, '0 1 0', a * panel_fg_alpha, DRAWFLAG_NORMAL); } + // draw the progress bars + drawsetcliparea(pos_x, pos_y, mySize_x * 0.5 * (vote_yescount/vote_needed), mySize_y); + drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_prog", eX * mySize_x + eY * (3/8) * mySize_y, '0 1 0', a * panel_fg_alpha, DRAWFLAG_NORMAL); + + drawsetcliparea(pos_x + mySize_x - mySize_x * 0.5 * (vote_nocount/vote_needed), pos_y, mySize_x * 0.5, mySize_y); + drawpic_skin(pos + eY * (5/8) * mySize_y, "voteprogress_prog", eX * mySize_x + eY * (3/8) * mySize_y, '1 0 0', a * panel_fg_alpha, DRAWFLAG_NORMAL); + drawresetcliparea(); if(!vote_active) { @@ -3633,7 +3668,7 @@ void HUD_Mod_CTF(vector pos, vector mySize) else mod_active = 0; - if(hud_configure) + if(autocvar__hud_configure) { redflag = 1; blueflag = 2; @@ -3744,15 +3779,15 @@ void HUD_Mod_CTF(vector pos, vector mySize) f = bound(0, redflag_statuschange_elapsedtime*2, 1); if(red_icon_prevstatus && f < 1) - 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); + drawpic_aspect_skin_expanding(redflag_pos, red_icon_prevstatus, flag_size, '1 1 1', panel_fg_alpha * red_alpha_prevstatus, DRAWFLAG_NORMAL, f); if(red_icon) - drawpic_skin(redflag_pos, red_icon, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha * f, DRAWFLAG_NORMAL); + drawpic_aspect_skin(redflag_pos, red_icon, flag_size, '1 1 1', panel_fg_alpha * 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, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha_prevstatus, DRAWFLAG_NORMAL, f); + drawpic_aspect_skin_expanding(blueflag_pos, blue_icon_prevstatus, flag_size, '1 1 1', panel_fg_alpha * blue_alpha_prevstatus, DRAWFLAG_NORMAL, f); if(blue_icon) - drawpic_skin(blueflag_pos, blue_icon, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha * f, DRAWFLAG_NORMAL); + drawpic_aspect_skin(blueflag_pos, blue_icon, flag_size, '1 1 1', panel_fg_alpha * blue_alpha * f, DRAWFLAG_NORMAL); } // Keyhunt HUD modicon section @@ -3840,23 +3875,23 @@ void HUD_Mod_KH(vector pos, vector mySize) aa = 0.5; break; } - a = a * HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS); - aa = aa * HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS); + a = a * panel_fg_alpha; + aa = aa * panel_fg_alpha; if(a > 0) { switch(keyteam) { case COLOR_TEAM1: - drawpic_skin(pa, "kh_redarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic_aspect_skin(pa, "kh_redarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key break; case COLOR_TEAM2: - drawpic_skin(pa, "kh_bluearrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic_aspect_skin(pa, "kh_bluearrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key break; case COLOR_TEAM3: - drawpic_skin(pa, "kh_yellowarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic_aspect_skin(pa, "kh_yellowarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key break; case COLOR_TEAM4: - drawpic_skin(pa, "kh_pinkarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic_aspect_skin(pa, "kh_pinkarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% alpha key break; default: break; @@ -3864,16 +3899,16 @@ void HUD_Mod_KH(vector pos, vector mySize) switch(i) // YAY! switch(i) inside a for loop for i. DailyWTF, here we come! { case 0: - drawpic_skin(p, "kh_red", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic_aspect_skin(p, "kh_red", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key break; case 1: - drawpic_skin(p, "kh_blue", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic_aspect_skin(p, "kh_blue", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key break; case 2: - drawpic_skin(p, "kh_yellow", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic_aspect_skin(p, "kh_yellow", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key break; case 3: - drawpic_skin(p, "kh_pink", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key + drawpic_aspect_skin(p, "kh_pink", kh_size, '1 1 1', a, DRAWFLAG_NORMAL); // show 30% alpha key break; } } @@ -3935,11 +3970,12 @@ void HUD_Mod_NexBall(vector pos, vector mySize) 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); + HUD_Panel_GetProgressBarColor("nexball") + HUD_Panel_DrawProgressBar(pos, vertical, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } if (stat_items & IT_KEY1) - drawpic_skin(pos, "nexball_carrying", eX * mySize_x + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos, "nexball_carrying", eX * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); } // Race/CTS HUD mod icons @@ -3990,13 +4026,13 @@ void HUD_Mod_Race(vector pos, vector mySize) f = time - crecordtime_change_time; if (f > 1) { - 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); + drawstring_aspect(pos, "Personal best", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos + eY * 0.25 * mySize_y, TIME_ENCODED_TOSTRING(t), eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, 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); - 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); - drawstring_expanding(pos, "Personal best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL, f); - drawstring_expanding(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, f); + drawstring_aspect(pos, "Personal best", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos + eY * 0.25 * mySize_y, TIME_ENCODED_TOSTRING(t), eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect_expanding(pos, "Personal best", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f); + drawstring_aspect_expanding(pos + eY * 0.25 * mySize_y, TIME_ENCODED_TOSTRING(t), eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f); } // server record @@ -4008,13 +4044,13 @@ void HUD_Mod_Race(vector pos, vector mySize) f = time - srecordtime_change_time; if (f > 1) { - drawstring(pos + eY * 0.5 * mySize_y, "Server best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); - drawstring(pos + eY * 0.5 * mySize_y + 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); + drawstring_aspect(pos + eY * 0.5 * mySize_y, "Server best", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos + eY * 0.75 * mySize_y, TIME_ENCODED_TOSTRING(t), eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); } else { - drawstring(pos + eY * 0.5 * mySize_y, "Server best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL); - drawstring(pos + eY * 0.5 * mySize_y + 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); - drawstring_expanding(pos + eY * 0.5 * mySize_y, "Server best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL, f); - drawstring_expanding(pos + eY * 0.5 * mySize_y + 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, f); + drawstring_aspect(pos + eY * 0.5 * mySize_y, "Server best", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos + eY * 0.75 * mySize_y, TIME_ENCODED_TOSTRING(t), eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect_expanding(pos + eY * 0.5 * mySize_y, "Server best", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f); + drawstring_aspect_expanding(pos + eY * 0.75 * mySize_y, TIME_ENCODED_TOSTRING(t), eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f); } if (race_status != race_status_prev || race_status_name != race_status_name_prev) { @@ -4045,22 +4081,22 @@ void HUD_Mod_Race(vector pos, vector mySize) rankpos = pos + '0.5 0.25 0' * mySize_y - eX * stringwidth(rankname, TRUE, '1 1 0' * 0.15 * mySize_y); if(race_status == 0) - drawpic_skin(pos, "race_newfail", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos, "race_newfail", '1 1 0' * mySize_y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); else if(race_status == 1) { - drawpic_skin(pos, "race_newtime", '1 1 0' * 0.9 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(namepos, s, '1 1 0' * 0.1 * mySize_y, HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); - drawstring(rankpos, rankname, '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos, "race_newtime", '1 1 0' * 0.9 * mySize_y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(namepos, s, '1 1 0' * 0.1 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL); + drawstring(rankpos, rankname, '1 1 0' * 0.15 * mySize_y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); } else if(race_status == 2) { if(race_status_name == GetPlayerName(player_localentnum -1) || !race_myrank || race_myrank < rank) - drawpic_skin(pos, "race_newrankgreen", '1 1 0' * 0.9 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos, "race_newrankgreen", '1 1 0' * 0.9 * mySize_y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); else - drawpic_skin(pos, "race_newrankyellow", '1 1 0' * 0.9 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(namepos, s, '1 1 0' * 0.1 * mySize_y, HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); - drawstring(rankpos, rankname, '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos, "race_newrankyellow", '1 1 0' * 0.9 * mySize_y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(namepos, s, '1 1 0' * 0.1 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL); + drawstring(rankpos, rankname, '1 1 0' * 0.15 * mySize_y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); } else if(race_status == 3) { - drawpic_skin(pos, "race_newrecordserver", '1 1 0' * 0.9 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); - drawcolorcodedstring(namepos, s, '1 1 0' * 0.1 * mySize_y, HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); - drawstring(rankpos, rankname, '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos, "race_newrecordserver", '1 1 0' * 0.9 * mySize_y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); + drawcolorcodedstring(namepos, s, '1 1 0' * 0.1 * mySize_y, panel_fg_alpha * a, DRAWFLAG_NORMAL); + drawstring(rankpos, rankname, '1 1 0' * 0.15 * mySize_y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); } if (race_status_time - time <= 0) { @@ -4082,39 +4118,41 @@ float mod_change; // "time" when mod_active changed void HUD_ModIcons(void) { - if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && !hud_configure) + if(!autocvar_hud_panel_modicons && !autocvar__hud_configure) + return; + + if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && !autocvar__hud_configure) return; - float id = HUD_PANEL_MODICONS; + active_panel = HUD_PANEL_MODICONS; + HUD_Panel_UpdateCvars(modicons); vector pos, mySize; - pos = HUD_Panel_GetPos(id); - mySize = HUD_Panel_GetSize(id); + pos = panel_pos; + mySize = panel_size; if(mod_active != mod_prev) { mod_change = time; mod_prev = mod_active; } - if(mod_active || hud_configure) + if(mod_active || autocvar__hud_configure) mod_alpha = bound(0, (time - mod_change) * 2, 1); else mod_alpha = bound(0, 1 - (time - mod_change) * 2, 1); if(mod_alpha) - HUD_Panel_DrawBg(id, pos, mySize, mod_alpha); + HUD_Panel_DrawBg(mod_alpha); - float padding; - padding = HUD_Panel_GetPadding(id); - if(padding) + if(panel_bg_padding) { - pos += '1 1 0' * padding; - mySize -= '2 2 0' * padding; + pos += '1 1 0' * panel_bg_padding; + mySize -= '2 2 0' * panel_bg_padding; } // these MUST be ran in order to update mod_active if(gametype == GAME_KEYHUNT) HUD_Mod_KH(pos, mySize); - else if(gametype == GAME_CTF || hud_configure) + else if(gametype == GAME_CTF || autocvar__hud_configure) HUD_Mod_CTF(pos, mySize); // forcealpha only needed for ctf icons, as only they are shown in config mode else if(gametype == GAME_NEXBALL) HUD_Mod_NexBall(pos, mySize); @@ -4126,18 +4164,44 @@ void HUD_ModIcons(void) // void HUD_DrawPressedKeys(void) { - float id = HUD_PANEL_PRESSEDKEYS; + if(!autocvar_hud_panel_pressedkeys && !autocvar__hud_configure) + return; + + if(!(spectatee_status > 0 || autocvar_hud_panel_pressedkeys >= 2 || autocvar__hud_configure)) + return; + + active_panel = HUD_PANEL_PRESSEDKEYS; + HUD_Panel_UpdateCvars(pressedkeys); vector pos, mySize; - pos = HUD_Panel_GetPos(id); - mySize = HUD_Panel_GetSize(id); + pos = panel_pos; + mySize = panel_size; - HUD_Panel_DrawBg(id, pos, mySize, 0); - float padding; - padding = HUD_Panel_GetPadding(id); - if(padding) + HUD_Panel_DrawBg(1); + if(panel_bg_padding) { - pos += '1 1 0' * padding; - mySize -= '2 2 0' * padding; + pos += '1 1 0' * panel_bg_padding; + mySize -= '2 2 0' * panel_bg_padding; + } + + // force custom aspect + if(autocvar_hud_panel_pressedkeys_aspect) + { + vector newSize; + if(mySize_x/mySize_y > autocvar_hud_panel_pressedkeys_aspect) + { + newSize_x = autocvar_hud_panel_pressedkeys_aspect * mySize_y; + newSize_y = mySize_y; + + pos_x = pos_x + (mySize_x - newSize_x) / 2; + } + else + { + newSize_y = 1/autocvar_hud_panel_pressedkeys_aspect * mySize_x; + newSize_x = mySize_x; + + pos_y = pos_y + (mySize_y - newSize_y) / 2; + } + mySize = newSize; } vector keysize; @@ -4145,30 +4209,46 @@ void HUD_DrawPressedKeys(void) float pressedkeys; pressedkeys = getstatf(STAT_PRESSED_KEYS); - 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); + drawpic_aspect_skin(pos, ((pressedkeys & KEY_CROUCH) ? "key_crouch_inv.tga" : "key_crouch.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos + eX * mySize_x * (1/3), ((pressedkeys & KEY_FORWARD) ? "key_forward_inv.tga" : "key_forward.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos + eX * mySize_x * (2/3), ((pressedkeys & KEY_JUMP) ? "key_jump_inv.tga" : "key_jump.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos + eY * 0.5 * mySize_y, ((pressedkeys & KEY_LEFT) ? "key_left_inv.tga" : "key_left.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_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', panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_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', panel_fg_alpha, DRAWFLAG_NORMAL); } // Handle chat as a panel (#12) // void HUD_Chat(void) { - float id = HUD_PANEL_CHAT; + if(!autocvar_hud_panel_chat && !autocvar__hud_configure) + { + cvar_set("con_chatrect", "0"); + return; + } + + active_panel = HUD_PANEL_CHAT; + HUD_Panel_UpdateCvars(chat); + + if(autocvar__con_chat_maximized && !autocvar__hud_configure) // draw at full screen height if maximized + { + panel_pos_y = panel_bg_border; + panel_size_y = vid_conheight - panel_bg_border * 2; + if(panel_bg == "0") + panel_bg = "border"; // force a border when maximized + panel_bg_alpha = max(0.75, panel_bg_alpha); // force an alpha of at least 0.75 + } + vector pos, mySize; - pos = HUD_Panel_GetPos(id); - mySize = HUD_Panel_GetSize(id); + pos = panel_pos; + mySize = panel_size; + + HUD_Panel_DrawBg(1); - HUD_Panel_DrawBg(id, pos, mySize, 0); - float padding; - padding = HUD_Panel_GetPadding(id); - if(padding) + if(panel_bg_padding) { - pos += '1 1 0' * padding; - mySize -= '2 2 0' * padding; + pos += '1 1 0' * panel_bg_padding; + mySize -= '2 2 0' * panel_bg_padding; } cvar_set("con_chatrect", "1"); @@ -4179,7 +4259,7 @@ void HUD_Chat(void) cvar_set("con_chatwidth", ftos(mySize_x/vid_conwidth)); cvar_set("con_chat", ftos(floor(mySize_y/cvar("con_chatsize") - 0.5))); - if(hud_configure) + if(autocvar__hud_configure) { float chatsize; chatsize = cvar("con_chatsize"); @@ -4188,9 +4268,9 @@ void HUD_Chat(void) for(i = 0; i < cvar("con_chat"); ++i) { if(i == cvar("con_chat") - 1) - a = HUD_Panel_GetFgAlpha(id); + a = panel_fg_alpha; else - a = HUD_Panel_GetFgAlpha(id) * floor(((i + 1) * 7 + cvar("con_chattime"))/45); + a = panel_fg_alpha * floor(((i + 1) * 7 + cvar("con_chattime"))/45); drawcolorcodedstring(pos + eY * i * chatsize, textShortenToWidth("^3Player^7: This is the chat area.", mySize_x, '1 1 0' * chatsize, stringwidth_colors), '1 1 0' * chatsize, a, DRAWFLAG_NORMAL); } } @@ -4207,31 +4287,33 @@ float frametimeavg1; // 1 frame ago float frametimeavg2; // 2 frames ago void HUD_EngineInfo(void) { - float id = HUD_PANEL_ENGINEINFO; + if(!autocvar_hud_panel_engineinfo && !autocvar__hud_configure) + return; + + active_panel = HUD_PANEL_ENGINEINFO; + HUD_Panel_UpdateCvars(engineinfo); vector pos, mySize; - pos = HUD_Panel_GetPos(id); - mySize = HUD_Panel_GetSize(id); + pos = panel_pos; + mySize = panel_size; - HUD_Panel_DrawBg(id, pos, mySize, 0); - float padding; - padding = HUD_Panel_GetPadding(id); - if(padding) + HUD_Panel_DrawBg(1); + if(panel_bg_padding) { - pos += '1 1 0' * padding; - mySize -= '2 2 0' * padding; + pos += '1 1 0' * panel_bg_padding; + mySize -= '2 2 0' * panel_bg_padding; } - if(cvar("hud_engineinfo_framecounter_exponentialmovingaverage")) + if(cvar("hud_panel_engineinfo_framecounter_exponentialmovingaverage")) { frametimeavg = (frametimeavg + frametimeavg1 + frametimeavg2 + frametime)/4; // average three frametimes into framecounter for slightly more stable fps readings :P frametimeavg2 = frametimeavg1; frametimeavg1 = frametimeavg; float weight; - weight = cvar("hud_engineinfo_framecounter_exponentialmovingaverage_new_weight"); + weight = cvar("hud_panel_engineinfo_framecounter_exponentialmovingaverage_new_weight"); if(frametime > 0.0001) // filter out insane values which sometimes seem to occur and throw off the average? If you are getting 10,000 fps or more, then you don't need a framerate counter. { - if(fabs(prevfps - (1/frametimeavg)) > prevfps * cvar("hud_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold")) // if there was a big jump in fps, just force prevfps at current (1/frametime) to make big updates instant + if(fabs(prevfps - (1/frametimeavg)) > prevfps * cvar("hud_panel_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold")) // if there was a big jump in fps, just force prevfps at current (1/frametime) to make big updates instant prevfps = (1/frametime); prevfps = (1 - weight) * prevfps + weight * (1/frametimeavg); // framecounter just used so there's no need for a new variable, think of it as "frametime average" } @@ -4239,9 +4321,9 @@ void HUD_EngineInfo(void) else { framecounter += 1; - if(time - prevfps_time > cvar("hud_engineinfo_framecounter_time")) + if(time - prevfps_time > cvar("hud_panel_engineinfo_framecounter_time")) { - prevfps = framecounter/cvar("hud_engineinfo_framecounter_time"); + prevfps = framecounter/cvar("hud_panel_engineinfo_framecounter_time"); framecounter = 0; prevfps_time = time; } @@ -4249,8 +4331,227 @@ void HUD_EngineInfo(void) vector color; color = HUD_Get_Num_Color (prevfps, 100); - drawstring_aspect(pos, strcat("FPS: ", ftos_decimals(prevfps, cvar("hud_engineinfo_framecounter_decimals"))), mySize, mySize_y, color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL); + drawfont = hud_bigfont; + drawstring_aspect(pos, strcat("FPS: ", ftos_decimals(prevfps, cvar("hud_panel_engineinfo_framecounter_decimals"))), mySize, color, panel_fg_alpha, DRAWFLAG_NORMAL); + drawfont = hud_font; +} + +// Info messages panel (#14) +// +void HUD_InfoMessages(void) +{ + if(!autocvar_hud_panel_infomessages && !autocvar__hud_configure) + return; + + active_panel = HUD_PANEL_INFOMESSAGES; + HUD_Panel_UpdateCvars(infomessages); + vector pos, mySize; + pos = panel_pos; + mySize = panel_size; + + HUD_Panel_DrawBg(1); + if(panel_bg_padding) + { + pos += '1 1 0' * panel_bg_padding; + mySize -= '2 2 0' * panel_bg_padding; + } + + // always force 5:1 aspect + vector newSize; + if(mySize_x/mySize_y > 5) + { + newSize_x = 5 * mySize_y; + newSize_y = mySize_y; + + pos_x = pos_x + (mySize_x - newSize_x) / 2; + } + else + { + newSize_y = 1/5 * mySize_x; + newSize_x = mySize_x; + + pos_y = pos_y + (mySize_y - newSize_y) / 2; + } + + mySize = newSize; + entity tm; + vector o; + o = pos; + + vector fontsize; + fontsize = '0.20 0.20 0' * mySize_y; + + string s; + if(!autocvar__hud_configure) + { + if(spectatee_status && !intermission) + { + if(spectatee_status == -1) + s = "^1Observing"; + else + s = strcat("^1Spectating: ^7", GetPlayerName(spectatee_status - 1)); + + if(autocvar_hud_panel_infomessages_flip) + o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); + drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + o += eY * fontsize_y; + + if(spectatee_status == -1) + s = strcat("^1Press ^3", getcommandkey("primary fire", "+attack"), "^1 to spectate"); + else + s = strcat("^1Press ^3", getcommandkey("primary fire", "+attack"), "^1 for another player"); + if(autocvar_hud_panel_infomessages_flip) + o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); + drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + o += eY * fontsize_y; + + if(spectatee_status == -1) + s = strcat("^1Use ^3", getcommandkey("next weapon", "weapnext"), "^1 or ^3", getcommandkey("previous weapon", "weapprev"), "^1 to change the speed"); + else + s = strcat("^1Press ^3", getcommandkey("secondary fire", "+attack2"), "^1 to observe"); + if(autocvar_hud_panel_infomessages_flip) + o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); + drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + o += eY * fontsize_y; + + s = strcat("^1Press ^3", getcommandkey("server info", "+show_info"), "^1 for gamemode info"); + if(autocvar_hud_panel_infomessages_flip) + o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); + drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + o += eY * fontsize_y; + + if(gametype == GAME_ARENA) + s = "^1Wait for your turn to join"; + else if(gametype == GAME_LMS) + { + entity sk; + sk = playerslots[player_localentnum - 1]; + if(sk.(scores[ps_primary]) >= 666) + s = "^1Match has already begun"; + else if(sk.(scores[ps_primary]) > 0) + s = "^1You have no more lives left"; + else + s = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join"); + } + else + s = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join"); + if(autocvar_hud_panel_infomessages_flip) + o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); + drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + o += eY * fontsize_y; + + //show restart countdown: + if (time < getstatf(STAT_GAMESTARTTIME)) { + float countdown; + //we need to ceil, otherwise the countdown would be off by .5 when using round() + countdown = ceil(getstatf(STAT_GAMESTARTTIME) - time); + s = strcat("^1Game starts in ^3", ftos(countdown), "^1 seconds"); + drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + o += eY * fontsize_y; + } + } + if(warmup_stage && !intermission) + { + s = "^2Currently in ^1warmup^2 stage!"; + if(autocvar_hud_panel_infomessages_flip) + o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); + drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + o += eY * fontsize_y; + } + + string blinkcolor; + if(mod(time, 1) >= 0.5) + blinkcolor = "^1"; + else + blinkcolor = "^3"; + + if(ready_waiting && !intermission && !spectatee_status) + { + if(ready_waiting_for_me) + { + if(warmup_stage) + s = strcat(blinkcolor, "Press ^3", getcommandkey("ready", "ready"), blinkcolor, " to end warmup"); + else + s = strcat(blinkcolor, "Press ^3", getcommandkey("ready", "ready"), blinkcolor, " once you are ready"); + } + else + { + if(warmup_stage) + s = strcat("^2Waiting for others to ready up to end warmup..."); + else + s = strcat("^2Waiting for others to ready up..."); + } + if(autocvar_hud_panel_infomessages_flip) + o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); + drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + o += eY * fontsize_y; + } + else if(warmup_stage && !intermission && !spectatee_status) + { + s = strcat("^2Press ^3", getcommandkey("ready", "ready"), "^2 to end warmup"); + if(autocvar_hud_panel_infomessages_flip) + o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); + drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + o += eY * fontsize_y; + } + + if(teamplay && !intermission && !spectatee_status && gametype != GAME_CA && teamnagger) + { + float ts_min, ts_max; + tm = teams.sort_next; + if (tm) + { + for(; tm.sort_next; tm = tm.sort_next) + { + if(!tm.team_size || tm.team == COLOR_SPECTATOR) + continue; + if(!ts_min) ts_min = tm.team_size; + else ts_min = min(ts_min, tm.team_size); + if(!ts_max) ts_max = tm.team_size; + else ts_max = max(ts_max, tm.team_size); + } + if ((ts_max - ts_min) > 1) + { + s = strcat(blinkcolor, "Teamnumbers are unbalanced!"); + tm = GetTeam(myteam, false); + if (tm) + if (tm.team != COLOR_SPECTATOR) + if (tm.team_size == ts_max) + s = strcat(s, " Press ^3", getcommandkey("team menu", "menu_showteamselect"), blinkcolor, " to adjust"); + + if(autocvar_hud_panel_infomessages_flip) + o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); + drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + o += eY * fontsize_y; + } + } + } + } + else + { + s = "^7Press ^3ESC ^7to show HUD options."; + if(autocvar_hud_panel_infomessages_flip) + o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); + drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + o += eY * fontsize_y; + s = "^3Doubleclick ^7a panel for panel-specific options."; + if(autocvar_hud_panel_infomessages_flip) + o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); + drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + o += eY * fontsize_y; + s = "^3CTRL ^7to disable collision testing, ^3SHIFT ^7and"; + if(autocvar_hud_panel_infomessages_flip) + o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); + drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + o += eY * fontsize_y; + s = "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments."; + if(autocvar_hud_panel_infomessages_flip) + o_x = pos_x + mySize_x - stringwidth(s, TRUE, fontsize); + drawcolorcodedstring(o, s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + o += eY * fontsize_y; + } } + /* ================== Main HUD system @@ -4362,78 +4663,124 @@ void HUD_Reset (void) HUD_Mod_CTF_Reset(); } +#define HUD_DrawPanel(id)\ +switch (id) {\ + case (HUD_PANEL_RADAR):\ + HUD_Radar(); break;\ + case (HUD_PANEL_WEAPONS):\ + HUD_Weapons(); break;\ + case (HUD_PANEL_AMMO):\ + HUD_Ammo(); break;\ + case (HUD_PANEL_POWERUPS):\ + HUD_Powerups(); break;\ + case (HUD_PANEL_HEALTHARMOR):\ + HUD_HealthArmor(); break;\ + case (HUD_PANEL_NOTIFY):\ + HUD_Notify(); break;\ + case (HUD_PANEL_TIMER):\ + HUD_Timer(); break;\ + case (HUD_PANEL_SCORE):\ + HUD_Score(); break;\ + case (HUD_PANEL_RACETIMER):\ + HUD_RaceTimer(); break;\ + case (HUD_PANEL_VOTE):\ + HUD_VoteWindow(); break;\ + case (HUD_PANEL_MODICONS):\ + HUD_ModIcons(); break;\ + case (HUD_PANEL_PRESSEDKEYS):\ + HUD_DrawPressedKeys(); break;\ + case (HUD_PANEL_CHAT):\ + HUD_Chat(); break;\ + case (HUD_PANEL_ENGINEINFO):\ + HUD_EngineInfo(); break;\ + case (HUD_PANEL_INFOMESSAGES):\ + HUD_InfoMessages(); break;\ +} + void HUD_Main (void) { + hud_skin_path = strcat("gfx/hud/", autocvar_hud_skin); + if(disable_menu_alphacheck == 1) menu_fade_alpha = 1; else - menu_fade_alpha = (1 - cvar("_menu_alpha")); + menu_fade_alpha = (1 - autocvar__menu_alpha); hud_fg_alpha = cvar("hud_fg_alpha"); hud_border_thickness = bound(0, cvar("hud_border_thickness"), 5); hud_accuracy_border_thickness = bound(0, cvar_or("hud_accuracy_border_thickness", 1), 5); - hud_color_bg_team = cvar("hud_color_bg_team"); hud_fontsize = HUD_GetFontsize("hud_fontsize"); hud_fontsize_spec = HUD_GetFontsize("hud_fontsize_spec"); - hud_configure = cvar("_hud_configure"); - // Drawing stuff // HUD configure visible grid - if(hud_configure && cvar("hud_configure_grid") && cvar("hud_configure_grid_alpha")) + if(autocvar__hud_configure && autocvar_hud_configure_grid && autocvar_hud_configure_grid_alpha) { float i; // x-axis - for(i = 0; i < 1/bound(0.005, cvar("hud_configure_grid_x"), 0.2); ++i) + for(i = 0; i < 1/bound(0.005, autocvar_hud_configure_grid_xsize, 0.2); ++i) { - 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); + drawfill(eX * i * vid_conwidth * bound(0.005, autocvar_hud_configure_grid_xsize, 0.2), eX + eY * vid_conheight, '0.5 0.5 0.5', autocvar_hud_configure_grid_alpha, DRAWFLAG_NORMAL); } // y-axis - for(i = 0; i < 1/bound(0.005, cvar("hud_configure_grid_y"), 0.2); ++i) + for(i = 0; i < 1/bound(0.005, autocvar_hud_configure_grid_ysize, 0.2); ++i) { - 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); + drawfill(eY * i * vid_conheight * bound(0.005, autocvar_hud_configure_grid_ysize, 0.2), eY + eX * vid_conwidth, '0.5 0.5 0.5', autocvar_hud_configure_grid_alpha, DRAWFLAG_NORMAL); } } - if(cvar_string("hud_dock") != "") - 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)) - HUD_Radar(); - if(HUD_Panel_CheckActive(HUD_PANEL_WEAPONICONS) || hud_configure) - HUD_WeaponIcons(); - if(HUD_Panel_CheckActive(HUD_PANEL_INVENTORY) || hud_configure) - HUD_Inventory(); - if(HUD_Panel_CheckActive(HUD_PANEL_POWERUPS) || hud_configure) - HUD_Powerups(); - if(HUD_Panel_CheckActive(HUD_PANEL_HEALTHARMOR) || hud_configure) - HUD_HealthArmor(); - if(HUD_Panel_CheckActive(HUD_PANEL_NOTIFY) || hud_configure) - HUD_Notify(); - if(HUD_Panel_CheckActive(HUD_PANEL_TIMER) || hud_configure) - HUD_Timer(); - if(HUD_Panel_CheckActive(HUD_PANEL_SCORE) || hud_configure) - HUD_Score(); - if(HUD_Panel_CheckActive(HUD_PANEL_RACETIMER) || hud_configure) - if(gametype == GAME_RACE || gametype == GAME_CTS || hud_configure) - HUD_RaceTimer(); - if(HUD_Panel_CheckActive(HUD_PANEL_VOTE) || hud_configure) - HUD_VoteWindow(); - if(HUD_Panel_CheckActive(HUD_PANEL_MODICONS) || hud_configure) - HUD_ModIcons(); - // TODO hud'ify - if(HUD_Panel_CheckActive(HUD_PANEL_PRESSEDKEYS) || hud_configure) - if(spectatee_status > 0 || cvar("hud_pressedkeys") >= 2 || hud_configure) - HUD_DrawPressedKeys(); - if(HUD_Panel_CheckActive(HUD_PANEL_CHAT) || hud_configure) - HUD_Chat(); + float f; + vector color; + if((teamplay) && autocvar_hud_dock_color_team) { + f = stof(getplayerkey(player_localentnum - 1, "colors")); + color = colormapPaletteColor(mod(f, 16), 1) * autocvar_hud_dock_color_team; + } + else if(autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && autocvar_hud_dock_color_team) { + color = '1 0 0' * autocvar_hud_dock_color_team; + } + else if(autocvar_hud_dock_color == "shirt") { + f = stof(getplayerkey(player_localentnum - 1, "colors")); + color = colormapPaletteColor(floor(f / 16), 0); + } + else if(autocvar_hud_dock_color == "pants") { + f = stof(getplayerkey(player_localentnum - 1, "colors")); + color = colormapPaletteColor(mod(f, 16), 1); + } else - cvar_set("con_chatrect", "0"); - if(HUD_Panel_CheckActive(HUD_PANEL_ENGINEINFO) || hud_configure) - HUD_EngineInfo(); + color = stov(autocvar_hud_dock_color); + + // draw the dock + if(autocvar_hud_dock != "" && autocvar_hud_dock != "0") + { + string pic; + pic = strcat(hud_skin_path, "/", autocvar_hud_dock); + if(precache_pic(pic) == "") { + pic = "gfx/hud/default/dock"; + } + drawpic('0 0 0', pic, eX * vid_conwidth + eY * vid_conheight, color, autocvar_hud_dock_alpha * menu_fade_alpha, DRAWFLAG_NORMAL); // no aspect ratio forcing on dock... + } + + // cache the panel order into the panel_order array + if(autocvar__hud_panelorder != hud_panelorder_prev) { + if(hud_panelorder_prev) + strunzone(hud_panelorder_prev); + hud_panelorder_prev = strzone(autocvar__hud_panelorder); + tokenize_console(autocvar__hud_panelorder); + for(i = 0; i < HUD_PANEL_NUM; ++i) { + panel_order[i] = stof(argv(i)); + } + } + // draw panels in order specified by panel_order array + for(i = HUD_PANEL_NUM - 1; i >= 0; --i) { + if(i != HUD_PANEL_CHAT || !autocvar__con_chat_maximized) // don't draw maximized chat panel twice! + HUD_DrawPanel(panel_order[i]); + } + + // draw chat panel on top if it is maximized + if(autocvar__con_chat_maximized) + HUD_DrawPanel(HUD_PANEL_CHAT); // TODO hud_'ify these if (cvar("cl_showspeed")) @@ -4441,9 +4788,11 @@ void HUD_Main (void) if (cvar("cl_showacceleration")) HUD_ShowAcceleration(); - if (hud_configure && spectatee_status) // try to join if we are in hud_configure mode, but still spectating (in order to get rid of motd and such) + if (autocvar__hud_configure && spectatee_status && hud_configure_prev == -1) // try to join if we are in hud_configure mode, but still spectating, and in the first frame (in order to get rid of motd when launching a server via the menu "HUD Setup" button) localcmd("cmd selectteam auto; cmd join\n"); - if (!hud_configure) // hud config mode disabled, enable normal alpha stuff again + hud_configure_prev = autocvar__hud_configure; + + if (!autocvar__hud_configure) // hud config mode disabled, enable normal alpha stuff again disable_menu_alphacheck = 0; } diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh index 6768221a3a..11a039bec6 100644 --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@ -1,16 +1,25 @@ +float log(float f); + +float panel_order[HUD_PANEL_NUM]; +string hud_panelorder_prev; + vector mousepos; vector panel_click_distance; // mouse cursor distance from the top left corner of the panel (saved only upon a click) vector panel_click_resizeorigin; // coordinates for opposite point when resizing float resizeCorner; // 1 = topleft, 2 = topright, 3 = bottomleft, 4 = bottomright -float highlightedPanel; +var float highlightedPanel = -1; +var float highlightedPanel_prev = -1; float highlightedAction; // 0 = nothing, 1 = move, 2 = resize const float BORDER_MULTIPLIER = 0.25; -float hud_color_bg_team; float scoreboard_bottom; float weapon_hits[WEP_MAXCOUNT]; float weapon_fired[WEP_MAXCOUNT]; -float weapon_number; + +float complain_weapon; +string complain_weapon_name; +float complain_weapon_type; +float complain_weapon_time; float ps_primary, ps_secondary; float ts_primary, ts_secondary; @@ -24,7 +33,278 @@ float hud_accuracy_hud; float hud_border_thickness; float hud_accuracy_border_thickness; -float hud_configure; +float hud_configure_checkcollisions; +float hud_configure_prev; + +float hudShiftState; +const float S_SHIFT = 1; +const float S_CTRL = 2; +const float S_ALT = 4; float disable_menu_alphacheck; // 0 = enable alpha check, 1 = disable for entire hud, 2 = disable for one panel float menu_fade_alpha; + +string hud_skin_path; + +var vector progressbar_color; + +var float active_panel; // this panel has recently referred the UpdateCvars macro +var string panel_name; +var float panel_enabled; +var vector panel_pos; +var vector panel_size; +var string panel_bg; +var string panel_bg_str; // "_str" vars contain the raw value of the cvar, non-"_str" contains what hud.qc code should use +var vector panel_bg_color; +var string panel_bg_color_str; +var float panel_bg_color_team; +var string panel_bg_color_team_str; +var float panel_fg_alpha; +var float panel_bg_alpha; +var string panel_bg_alpha_str; +var float panel_bg_border; +var string panel_bg_border_str; +var float panel_bg_padding; +var string panel_bg_padding_str; +var float panel_accuracy_yellow; +var float panel_accuracy_onlycurrent; +var float panel_accuracy_flip; +var float panel_accuracy_iconalign; +var float panel_accuracy_baralign; +var float panel_accuracy_info_top; +var float panel_accuracy_foreground_alpha; +var float panel_accuracy_alreadyvoted_alpha; + +var string picpath; + +// Because calling lots of functions in QC apparently cuts fps in half on many machines: +// ---------------------- +// MACRO HELL STARTS HERE +// ---------------------- +// Little help for the poor people who have to make sense of this: Start from the bottom + +#define HUD_Panel_GetProgressBarColor(item) \ +switch(item) {\ + case "strength": progressbar_color = autocvar_hud_progressbar_strength_color; break;\ + case "shield": progressbar_color = autocvar_hud_progressbar_shield_color; break;\ + case "health": progressbar_color = autocvar_hud_progressbar_health_color; break;\ + case "armor": progressbar_color = autocvar_hud_progressbar_armor_color; break;\ + case "fuel": progressbar_color = autocvar_hud_progressbar_fuel_color; break;\ + case "nexball": progressbar_color = autocvar_hud_progressbar_nexball_color; break;\ +} + +// Get value for panel_bg: if "" fetch default, else use panel_bg_str +// comment on last line of macro: // we probably want to see a background in config mode at all times... +#define HUD_Panel_GetBg()\ +if(!autocvar__hud_configure && panel_bg_str == "0") {\ + panel_bg = "0";\ +} else {\ + if(panel_bg_str == "") {\ + panel_bg = autocvar_hud_panel_bg;\ + } else if(panel_bg_str == "0" && autocvar__hud_configure) {\ + panel_bg = autocvar_hud_panel_bg;\ + panel_bg_alpha_str = "0";\ + } else {\ + panel_bg = panel_bg_str;\ + }\ + panel_bg = strcat(hud_skin_path, "/", panel_bg);\ + if(precache_pic(panel_bg) == "") {\ + panel_bg = strcat(hud_skin_path, "/", "border");\ + if(precache_pic(panel_bg) == "") {\ + panel_bg = strcat("gfx/hud/default/", "border");\ + }\ + }\ +} + +// Get value for panel_bg_color: if "" fetch default, else use panel_bg_color. Convert pants, shirt or teamcolor into a vector. +#define HUD_Panel_GetColor()\ +if((teamplay) && panel_bg_color_team) {\ + panel_bg_color = colormapPaletteColor(mod(stof(getplayerkey(player_localentnum - 1, "colors")), 16), 1) * panel_bg_color_team;\ +} else if (autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && panel_bg_color_team) {\ + panel_bg_color = '1 0 0' * panel_bg_color_team;\ +} else {\ + if(panel_bg_color_str == "") {\ + panel_bg_color = autocvar_hud_panel_bg_color;\ + } else {\ + if(panel_bg_color_str == "shirt") {\ + panel_bg_color = colormapPaletteColor(floor(stof(getplayerkey(player_localentnum - 1, "colors")) / 16), 0);\ + } else if(panel_bg_color_str == "pants") {\ + panel_bg_color = colormapPaletteColor(mod(stof(getplayerkey(player_localentnum - 1, "colors")), 16), 1);\ + } else {\ + panel_bg_color = stov(panel_bg_color_str);\ + }\ + }\ +} + +// Get value for panel_bg_color_team: if "" fetch default, else use panel_bg_color_team_str +#define HUD_Panel_GetColorTeam()\ +if(panel_bg_color_team_str == "") {\ + panel_bg_color_team = autocvar_hud_panel_bg_color_team;\ +} else {\ + panel_bg_color_team = stof(panel_bg_color_team_str);\ +} + +// Get value for panel_bg_alpha: if "" fetch default, else use panel_bg_alpha. Also do various menu dialog fadeout/in checks, and minalpha checks +// comment on line 3 of macro: // do not set a minalpha cap when showing the config dialog for this panel +#define HUD_Panel_GetBgAlpha()\ +if(panel_bg_alpha_str == "") {\ + panel_bg_alpha_str = ftos(autocvar_hud_panel_bg_alpha);\ +}\ +panel_bg_alpha = stof(panel_bg_alpha_str);\ +if(autocvar__hud_configure && disable_menu_alphacheck == 2 && highlightedPanel == active_panel) {\ + panel_bg_alpha = (1 - autocvar__menu_alpha) * max(autocvar_hud_configure_bg_minalpha, panel_bg_alpha) + autocvar__menu_alpha * panel_bg_alpha;\ +} else if(autocvar__hud_configure) {\ + panel_bg_alpha = max(autocvar_hud_configure_bg_minalpha, panel_bg_alpha);\ +} if(autocvar__hud_configure && !panel_enabled) {\ + panel_bg_alpha = 0.25;\ +} if(!(disable_menu_alphacheck == 2 && highlightedPanel == active_panel)) {\ + panel_bg_alpha *= menu_fade_alpha;\ +} + +// Get value for panel_fg_alpha. Also do various minalpha checks +// comment on line 2 of macro: // ALWAYS show disabled panels at 0.25 alpha when in config mode +// comment on line 4 of macro: // don't fade this panel when showing the panel-specific menu dialog +#define HUD_Panel_GetFgAlpha()\ +panel_fg_alpha = autocvar_hud_panel_fg_alpha;\ +if(autocvar__hud_configure && !panel_enabled)\ + panel_fg_alpha = 0.25;\ +if(!(disable_menu_alphacheck == 2 && highlightedPanel == active_panel))\ + panel_fg_alpha *= menu_fade_alpha; + +// Get border. See comments above, it's similar. +#define HUD_Panel_GetBorder()\ +if(panel_bg_border_str == "") {\ + panel_bg_border = autocvar_hud_panel_bg_border;\ +} else {\ + panel_bg_border = stof(panel_bg_border_str);\ +} + +// Scale the pos and size vectors to absolute coordinates +#define HUD_Panel_GetScaledVectors()\ +panel_pos_x *= vid_conwidth;\ +panel_pos_y *= vid_conheight;\ +panel_size_x *= vid_conwidth;\ +panel_size_y *= vid_conheight; + +// Get padding. See comments above, it's similar. +// last line is a port of the old function, basically always make sure the panel contents are at least 5 pixels tall/wide, to disallow extreme padding values +#define HUD_Panel_GetPadding()\ +if(panel_bg_padding_str == "") {\ + panel_bg_padding = autocvar_hud_panel_bg_padding;\ +} else {\ + panel_bg_padding = stof(panel_bg_padding_str);\ +}\ +panel_bg_padding = min(min(panel_size_x, panel_size_y)/2 - 5, panel_bg_padding); + +// Point to the macros above (stupid max macro length) +#define HUD_Panel_StringVars()\ +HUD_Panel_GetBg()\ +HUD_Panel_GetColorTeam()\ +HUD_Panel_GetColor()\ +HUD_Panel_GetBgAlpha()\ +HUD_Panel_GetFgAlpha()\ +HUD_Panel_GetBorder()\ +HUD_Panel_GetScaledVectors()\ +HUD_Panel_GetPadding() + +// return smoothly faded pos of given panel when a dialog is active +var vector menu_enable_panelpos; +#define HUD_Panel_GetMenuPos() \ +if(panel_size_x > panel_size_y)\ + menu_enable_panelpos = eX * 0.5 * vid_conwidth - eX * 0.5 * panel_size_x + eY * 0.82 * vid_conheight;\ +else\ + menu_enable_panelpos = eY * 0.5 * vid_conheight - eY * 0.5 * panel_size_y + eX * 0.7 * vid_conwidth;\ +panel_pos = (1 - autocvar__menu_alpha) * panel_pos + (autocvar__menu_alpha) * menu_enable_panelpos; + +// return smoothly faded size of given panel when a dialog is active +var vector menu_enable_maxsize; +var vector menu_enable_size; +#define HUD_Panel_GetMenuSize()\ +menu_enable_maxsize_x = 0.3 * vid_conwidth;\ +menu_enable_maxsize_y = 0.18 * vid_conheight;\ +if(panel_size_x > panel_size_y)\ +{\ + if(panel_size_y > menu_enable_maxsize_y)\ + {\ + menu_enable_size_y = menu_enable_maxsize_y;\ + menu_enable_size_x = panel_size_x * (menu_enable_maxsize_y/panel_size_y);\ + panel_size = (1 - autocvar__menu_alpha) * panel_size + (autocvar__menu_alpha) * menu_enable_size;\ + }\ +}\ +else\ +{\ + if(panel_size_x > menu_enable_maxsize_x)\ + {\ + menu_enable_size_x = menu_enable_maxsize_x;\ + menu_enable_size_y = panel_size_y * (menu_enable_maxsize_x/panel_size_x);\ + panel_size = (1 - autocvar__menu_alpha) * panel_size + (autocvar__menu_alpha) * menu_enable_size;\ + }\ +} + +// Update all common cvars of given panel name +#define HUD_Panel_UpdateCvars(name) \ +panel_enabled = autocvar_hud_panel_##name; \ +panel_pos = autocvar_hud_panel_##name##_pos; \ +panel_size = autocvar_hud_panel_##name##_size; \ +panel_bg_str = autocvar_hud_panel_##name##_bg; \ +panel_bg_color_str = autocvar_hud_panel_##name##_bg_color; \ +panel_bg_color_team_str = autocvar_hud_panel_##name##_bg_color_team; \ +panel_bg_alpha_str = autocvar_hud_panel_##name##_bg_alpha; \ +panel_bg_border_str = autocvar_hud_panel_##name##_bg_border; \ +panel_bg_padding_str = autocvar_hud_panel_##name##_bg_padding; \ +HUD_Panel_StringVars()\ +if(disable_menu_alphacheck == 2 && active_panel == highlightedPanel) {\ + HUD_Panel_GetMenuSize()\ + HUD_Panel_GetMenuPos()\ +} + +// Update all common cvars of given panel id +#define HUD_Panel_UpdateCvarsForId(id) \ +switch(id) { \ + case HUD_PANEL_WEAPONS: HUD_Panel_UpdateCvars(weapons) break; \ + case HUD_PANEL_AMMO: HUD_Panel_UpdateCvars(ammo) break; \ + case HUD_PANEL_POWERUPS: HUD_Panel_UpdateCvars(powerups) break; \ + case HUD_PANEL_HEALTHARMOR: HUD_Panel_UpdateCvars(healtharmor) break; \ + case HUD_PANEL_NOTIFY: HUD_Panel_UpdateCvars(notify) break; \ + case HUD_PANEL_TIMER: HUD_Panel_UpdateCvars(timer) break; \ + case HUD_PANEL_RADAR: HUD_Panel_UpdateCvars(radar) break; \ + case HUD_PANEL_SCORE: HUD_Panel_UpdateCvars(score) break; \ + case HUD_PANEL_RACETIMER: HUD_Panel_UpdateCvars(racetimer) break; \ + case HUD_PANEL_VOTE: HUD_Panel_UpdateCvars(vote) break; \ + case HUD_PANEL_MODICONS: HUD_Panel_UpdateCvars(modicons) break; \ + case HUD_PANEL_PRESSEDKEYS: HUD_Panel_UpdateCvars(pressedkeys) break; \ + case HUD_PANEL_CHAT: HUD_Panel_UpdateCvars(chat) break; \ + case HUD_PANEL_ENGINEINFO: HUD_Panel_UpdateCvars(engineinfo) break; \ + case HUD_PANEL_INFOMESSAGES: HUD_Panel_UpdateCvars(infomessages) break; \ +} + +#define HUD_Panel_UpdatePosSize(name) \ +panel_pos = autocvar_hud_panel_##name##_pos; \ +panel_size = autocvar_hud_panel_##name##_size; \ +HUD_Panel_GetScaledVectors()\ +if(disable_menu_alphacheck == 2 && active_panel == highlightedPanel) {\ + HUD_Panel_GetMenuSize()\ + HUD_Panel_GetMenuPos()\ +}\ +panel_bg_border_str = autocvar_hud_panel_##name##_bg_border; \ +HUD_Panel_GetBorder() + +// Update pos and size of given panel id +#define HUD_Panel_UpdatePosSizeForId(id) \ +switch(id) { \ + case HUD_PANEL_WEAPONS: HUD_Panel_UpdatePosSize(weapons) break;\ + case HUD_PANEL_AMMO: HUD_Panel_UpdatePosSize(ammo) break;\ + case HUD_PANEL_POWERUPS: HUD_Panel_UpdatePosSize(powerups) break;\ + case HUD_PANEL_HEALTHARMOR: HUD_Panel_UpdatePosSize(healtharmor) break;\ + case HUD_PANEL_NOTIFY: HUD_Panel_UpdatePosSize(notify) break;\ + case HUD_PANEL_TIMER: HUD_Panel_UpdatePosSize(timer) break;\ + case HUD_PANEL_RADAR: HUD_Panel_UpdatePosSize(radar) break;\ + case HUD_PANEL_SCORE: HUD_Panel_UpdatePosSize(score) break;\ + case HUD_PANEL_RACETIMER: HUD_Panel_UpdatePosSize(racetimer) break;\ + case HUD_PANEL_VOTE: HUD_Panel_UpdatePosSize(vote) break;\ + case HUD_PANEL_MODICONS: HUD_Panel_UpdatePosSize(modicons) break;\ + case HUD_PANEL_PRESSEDKEYS: HUD_Panel_UpdatePosSize(pressedkeys) break;\ + case HUD_PANEL_CHAT: HUD_Panel_UpdatePosSize(chat) break;\ + case HUD_PANEL_ENGINEINFO: HUD_Panel_UpdatePosSize(engineinfo) break;\ + case HUD_PANEL_INFOMESSAGES: HUD_Panel_UpdatePosSize(infomessages)\ +} diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc index 74830223d9..c573fe3051 100644 --- a/qcsrc/client/miscfunctions.qc +++ b/qcsrc/client/miscfunctions.qc @@ -468,24 +468,64 @@ void drawpic_tiled(vector pos, string pic, vector sz, vector area, vector color, } } -void drawpic_expanding(vector position, string pic, vector scale, vector rgb, float alpha, float flag, float fadelerp) +// drawpic wrapper to draw an image as large as possible with preserved aspect ratio into a box +var float imgaspect; +var float aspect; +#define drawpic_aspect(pos,pic,mySize,color,alpha,drawflag)\ +do {\ + vector imgsize;\ + imgsize = drawgetimagesize(pic);\ + imgaspect = imgsize_x/imgsize_y;\ + vector oldsz, sz;\ + oldsz = sz = mySize;\ + aspect = sz_x/sz_y;\ + if(aspect > imgaspect) {\ + sz_x = sz_y * imgaspect;\ + drawpic(pos + eX * (oldsz_x - sz_x) * 0.5, pic, sz, color, alpha, drawflag);\ + } else {\ + sz_y = sz_x / imgaspect;\ + drawpic(pos + eY * (oldsz_y - sz_y) * 0.5, pic, sz, color, alpha, drawflag);\ + }\ +} while(0) + +// draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga +#define drawpic_aspect_skin(pos,pic,sz,color,alpha,drawflag)\ +do{\ + picpath = strcat(hud_skin_path, "/", pic);\ + if(precache_pic(picpath) == "") {\ + picpath = strcat("gfx/hud/default/", pic);\ + }\ + drawpic_aspect(pos, picpath, sz, color, alpha, drawflag);\ +} while(0) + +// draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga +#define drawpic_skin(pos,pic,sz,color,alpha,drawflag)\ +do{\ + picpath = strcat(hud_skin_path, "/", pic);\ + if(precache_pic(picpath) == "") {\ + picpath = strcat("gfx/hud/default/", pic);\ + }\ + drawpic(pos, picpath, sz, color, alpha, drawflag);\ +} while(0) + +void drawpic_aspect_skin_expanding(vector position, string pic, vector scale, vector rgb, float alpha, float flag, float fadelerp) { float sz; sz = expandingbox_sizefactor_from_fadelerp(fadelerp); - drawpic(position + expandingbox_resize_centered_box_offset(sz, scale, 1), pic, scale * sz, rgb, alpha * (1 - fadelerp), flag); + drawpic_skin(position + expandingbox_resize_centered_box_offset(sz, scale, 1), pic, scale * sz, rgb, alpha * (1 - fadelerp), flag); } -void drawpic_expanding_two(vector position, string pic, vector scale, vector rgb, float alpha, float flag, float fadelerp) +void drawpic_aspect_skin_expanding_two(vector position, string pic, vector scale, vector rgb, float alpha, float flag, float fadelerp) { - drawpic_expanding(position, pic, scale, rgb, alpha, flag, fadelerp); - drawpic(position, pic, scale, rgb, alpha * fadelerp, flag); + drawpic_aspect_skin_expanding(position, pic, scale, rgb, alpha, flag, fadelerp); + drawpic_skin(position, pic, scale, rgb, alpha * fadelerp, flag); } // drawstring wrapper to draw a string as large as possible with preserved aspect ratio into a box -void drawstring_aspect(vector pos, string text, vector sz, float fontsize, vector color, float alpha, float drawflag) { +void drawstring_aspect(vector pos, string text, vector sz, vector color, float alpha, float drawflag) { vector textsize; - textsize = eX * stringwidth(text, FALSE, '1 1 0' * fontsize) + eY * fontsize; + textsize = eX * stringwidth(text, FALSE, '1 1 1' * sz_y) + eY * sz_y; float textaspect; textaspect = textsize_x/textsize_y; @@ -504,6 +544,28 @@ void drawstring_aspect(vector pos, string text, vector sz, float fontsize, vecto } } +// drawstring wrapper to draw a colorcodedstring as large as possible with preserved aspect ratio into a box +void drawcolorcodedstring_aspect(vector pos, string text, vector sz, float alpha, float drawflag) { + vector textsize; + textsize = eX * stringwidth(text, TRUE, '1 1 1' * sz_y) + eY * sz_y; + + float textaspect; + textaspect = textsize_x/textsize_y; + + vector oldsz; + oldsz = sz; + float aspect; + aspect = sz_x/sz_y; + + if(aspect > textaspect) { + sz_x = sz_y * textaspect; + drawcolorcodedstring(pos + eX * (oldsz_x - sz_x) * 0.5, text, '1 1 0' * sz_y, alpha, drawflag); + } else { + sz_y = sz_x / textaspect; + drawcolorcodedstring(pos + eY * (oldsz_y - sz_y) * 0.5, text, '1 1 0' * sz_y, alpha, drawflag); + } +} + vector drawfontscale; void drawstring_expanding(vector position, string text, vector scale, vector rgb, float alpha, float flag, float fadelerp) { @@ -519,6 +581,28 @@ void drawstring_expanding(vector position, string text, vector scale, vector rgb drawfontscale = '1 1 0'; } +// drawstring wrapper to draw a string as large as possible with preserved aspect ratio into a box +void drawstring_aspect_expanding(vector pos, string text, vector sz, vector color, float alpha, float drawflag, float fadelerp) { + vector textsize; + textsize = eX * stringwidth(text, FALSE, '1 1 1' * sz_y) + eY * sz_y; + + float textaspect; + textaspect = textsize_x/textsize_y; + + vector oldsz; + oldsz = sz; + float aspect; + aspect = sz_x/sz_y; + + if(aspect > textaspect) { + sz_x = sz_y * textaspect; + drawstring_expanding(pos + eX * (oldsz_x - sz_x) * 0.5, text, '1 1 0' * sz_y, color, alpha, drawflag, fadelerp); + } else { + sz_y = sz_x / textaspect; + drawstring_expanding(pos + eY * (oldsz_y - sz_y) * 0.5, text, '1 1 0' * sz_y, color, alpha, drawflag, fadelerp); + } +} + void drawcolorcodedstring_expanding(vector position, string text, vector scale, float alpha, float flag, float fadelerp) { float sz; @@ -530,6 +614,27 @@ void drawcolorcodedstring_expanding(vector position, string text, vector scale, drawfontscale = '1 1 0'; } +void drawcolorcodedstring_aspect_expanding(vector pos, string text, vector sz, float alpha, float drawflag, float fadelerp) { + vector textsize; + textsize = eX * stringwidth(text, TRUE, '1 1 1' * sz_y) + eY * sz_y; + + float textaspect; + textaspect = textsize_x/textsize_y; + + vector oldsz; + oldsz = sz; + float aspect; + aspect = sz_x/sz_y; + + if(aspect > textaspect) { + sz_x = sz_y * textaspect; + drawcolorcodedstring_expanding(pos + eX * (oldsz_x - sz_x) * 0.5, text, '1 1 0' * sz_y, alpha, drawflag, fadelerp); + } else { + sz_y = sz_x / textaspect; + drawcolorcodedstring_expanding(pos + eY * (oldsz_y - sz_y) * 0.5, text, '1 1 0' * sz_y, alpha, drawflag, fadelerp); + } +} + // this draws the triangles of a model DIRECTLY. Don't expect high performance, really... void PolyDrawModel(entity e) { diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc index 36168ea2e7..5efa9118d6 100644 --- a/qcsrc/client/scoreboard.qc +++ b/qcsrc/client/scoreboard.qc @@ -297,6 +297,7 @@ void Cmd_HUD_SetFields(float argc) hud_num_fields = 0; drawfont = hud_font; + hud_fontsize = HUD_GetFontsize("hud_fontsize"); for(i = 0; i < argc - 1; ++i) { @@ -759,7 +760,7 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz tmp_y = 1.25 * hud_fontsize_y; // rounded header - drawpic(pos, "gfx/scoreboard/scoreboard_tableheader", tmp, (rgb * hud_color_bg_team) + '0.5 0.5 0.5', scoreboard_alpha_bg, DRAWFLAG_NORMAL); + drawpic(pos, "gfx/scoreboard/scoreboard_tableheader", tmp, (rgb * autocvar_hud_color_bg_team) + '0.5 0.5 0.5', scoreboard_alpha_bg, DRAWFLAG_NORMAL); // table border tmp_y += hud_border_thickness; @@ -775,7 +776,7 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz // table background tmp_y = body_table_height; - drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * hud_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL); + drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * autocvar_hud_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL); // anyway, apply some color //drawfill(pos, tmp + '2 0 0', rgb, 0.1, DRAWFLAG_NORMAL); @@ -831,7 +832,7 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz } tmp_x = stringwidth(hud_title[i], FALSE, hud_fontsize); - tmp_x = (hud_size[i] - tmp_x) * hud_fontsize_x; + tmp_x = (hud_size[i] - tmp_x); drawstring(pos + tmp, hud_title[i], hud_fontsize, rgb * 1.5, scoreboard_alpha_fg, DRAWFLAG_NORMAL); pos_x -= hud_fontsize_x; } @@ -870,7 +871,9 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz } float HUD_WouldDrawScoreboard() { - if (scoreboard_showscores) + if (autocvar__hud_configure) + return 0; + else if (scoreboard_showscores) return 1; else if (intermission == 1) return 1; @@ -890,7 +893,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) float i; float weapon_hit, weapon_damage, weapon_stats; float fontsize = 40 * 1/3; - float weapon_cnt = 12; + float weapon_cnt = WEP_COUNT - 3; // either minstanex/nex are hidden, no port-o-launch, no tuba float rows; if(cvar("scoreboard_accuracy_doublerows")) rows = 2; @@ -909,7 +912,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) tmp_x = sbwidth; tmp_y = height * rows; - drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * hud_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL); + drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * autocvar_hud_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL); drawborderlines(hud_accuracy_border_thickness, pos, tmp, '0 0 0', scoreboard_alpha_bg * 0.75, DRAWFLAG_NORMAL); // column highlighting @@ -940,7 +943,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) self = get_weaponinfo(i); if not(self.weapons) continue; - if ((i == WEP_NEX && g_minstagib) || i == WEP_PORTO || (i == WEP_MINSTANEX && !g_minstagib) || i == WEP_TUBA || i == WEP_FIREBALL) // skip port-o-launch, nex || minstanex, tuba and fireball + if ((i == WEP_NEX && g_minstagib) || i == WEP_PORTO || (i == WEP_MINSTANEX && !g_minstagib) || i == WEP_TUBA) // skip port-o-launch, nex || minstanex and tuba continue; weapon_hit = weapon_hits[i-WEP_FIRST]; weapon_damage = weapon_fired[i-WEP_FIRST]; @@ -954,7 +957,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) weapon_alpha = 0.2 * scoreboard_alpha_fg; // weapon icon - drawpic(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/weapon", self.netname), '1 0 0' * sbwidth * (1/weapon_cnt) + '0 1 0' * height * (2/3), '1 1 1', weapon_alpha, DRAWFLAG_NORMAL); + drawpic_aspect(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/weapon", self.netname), '1 0 0' * sbwidth * (1/weapon_cnt) + '0 1 0' * height * (2/3), '1 1 1', weapon_alpha, DRAWFLAG_NORMAL); // the accuracy if(weapon_damage) { weapons_with_stats += 1; @@ -966,7 +969,19 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) float padding; padding = ((sbwidth/weapon_cnt) - stringwidth(s, FALSE, '1 0 0' * fontsize)) / 2; // center the accuracy value - rgb = HUD_AccuracyColor(weapon_stats); + // yellow_accuracy = value at which accuracy becomes yellow + if(weapon_stats >= 100) { + rgb_x = 0; + rgb_y = 1; + } + else if(weapon_stats > autocvar_hud_panel_weapons_accuracy_yellow) { + rgb_x = 1 - (weapon_stats-autocvar_hud_panel_weapons_accuracy_yellow)/(100-autocvar_hud_panel_weapons_accuracy_yellow); // red value between 1 -> 0 + rgb_y = 1; + } else { + rgb_x = 1; + rgb_y = weapon_stats/autocvar_hud_panel_weapons_accuracy_yellow; // green value between 0 -> 1 + } + rgb_z = 0; drawstring(pos + '1 0 0' * padding + '0 1 0' * height * (2/3), s, '1 1 0' * fontsize, rgb, scoreboard_alpha_fg, DRAWFLAG_NORMAL); } pos_x += sbwidth/weapon_cnt * rows; @@ -1012,7 +1027,7 @@ vector HUD_DrawScoreboardRankings(vector pos, entity pl, vector rgb, vector bg_ tmp_x = sbwidth; tmp_y = hud_fontsize_y * RANKINGS_RECEIVED_CNT; - drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * hud_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL); + drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * autocvar_hud_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL); drawborderlines(hud_border_thickness, pos, tmp, '0 0 0', scoreboard_alpha_bg * 0.75, DRAWFLAG_NORMAL); // row highlighting @@ -1114,10 +1129,10 @@ void HUD_DrawScoreboard() continue; rgb = GetTeamRGB(tm.team); - HUD_DrawXNum(pos - '9.5 0 0' * hud_fontsize_y + '0 1 0' * hud_fontsize_y, tm.(teamscores[ts_primary]), 6, 0, hud_fontsize_y * 1.5, rgb, 0, 1, scoreboard_alpha_fg, DRAWFLAG_NORMAL); + drawstring(pos - '9.5 0 0' * hud_fontsize_y + '0 1 0' * hud_fontsize_y, ftos(tm.(teamscores[ts_primary])), '1 1 0' * hud_fontsize_y * 1.5, rgb, scoreboard_alpha_fg, DRAWFLAG_NORMAL); if(ts_primary != ts_secondary) - HUD_DrawXNum(pos - '7.5 0 0' * hud_fontsize_y + '0 2.5 0' * hud_fontsize_y, tm.(teamscores[ts_secondary]), 6, 0, hud_fontsize_y * 1, rgb, 0, 1, scoreboard_alpha_fg, DRAWFLAG_NORMAL); + drawstring(pos - '7.5 0 0' * hud_fontsize_y + '0 2.5 0' * hud_fontsize_y, ftos(tm.(teamscores[ts_secondary])), '1 1 0' * hud_fontsize_y * 1, rgb, scoreboard_alpha_fg, DRAWFLAG_NORMAL); pos = HUD_Scoreboard_MakeTable(pos, tm, rgb, bg_size); } diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc index 323db5e68c..062d1228fe 100644 --- a/qcsrc/client/teamradar.qc +++ b/qcsrc/client/teamradar.qc @@ -4,8 +4,8 @@ vector teamradar_origin2d; // 2D origin vector teamradar_size2d; // 2D size vector teamradar_extraclip_mins, teamradar_extraclip_maxs; // for non-centered radar display float teamradar_size; // 2D scale factor -float hud_radar_scale; // window size = ...qu -float hud_radar_nohudhack; +float hud_panel_radar_scale; // window size = ...qu +float hud_panel_radar_nohudhack; float v_flipped; float vlen2d(vector v) @@ -168,34 +168,34 @@ void draw_teamradar_link(vector start, vector end, float colors) R_EndPolygon(); } -float hud_radar_scale; -float hud_radar_background_alpha; -float hud_radar_foreground_alpha; -float hud_radar_rotation; -vector hud_radar_size; -vector hud_radar_position; -float hud_radar_zoommode; +float hud_panel_radar_scale; +float hud_panel_radar_background_alpha; +float hud_panel_radar_foreground_alpha; +float hud_panel_radar_rotation; +vector hud_panel_radar_size; +vector hud_panel_radar_position; +float hud_panel_radar_zoommode; void teamradar_loadcvars() { v_flipped = cvar("v_flipped"); - hud_radar_scale = cvar("hud_radar_scale"); - hud_radar_background_alpha = cvar("hud_radar_background_alpha") * hud_fg_alpha; - hud_radar_foreground_alpha = cvar("hud_radar_foreground_alpha") * hud_fg_alpha; - hud_radar_rotation = cvar("hud_radar_rotation"); - hud_radar_zoommode = cvar("hud_radar_zoommode"); + hud_panel_radar_scale = cvar("hud_panel_radar_scale"); + hud_panel_radar_background_alpha = cvar("hud_panel_radar_background_alpha") * hud_fg_alpha; + hud_panel_radar_foreground_alpha = cvar("hud_panel_radar_foreground_alpha") * hud_fg_alpha; + hud_panel_radar_rotation = cvar("hud_panel_radar_rotation"); + hud_panel_radar_zoommode = cvar("hud_panel_radar_zoommode"); // others default to 0 // match this to defaultXonotic.cfg! - if(!hud_radar_scale) hud_radar_scale = 4096; - if(!hud_radar_background_alpha) hud_radar_background_alpha = 0.4 * hud_fg_alpha; - if(!hud_radar_foreground_alpha) hud_radar_foreground_alpha = 0.8 * hud_fg_alpha; - if(!hud_radar_size_x) hud_radar_size_x = 128; - if(!hud_radar_size_y) hud_radar_size_y = hud_radar_size_x; - - hud_radar_size_z = 0; - hud_radar_nohudhack = hud_radar_position_z; - hud_radar_position_z = 0; + if(!hud_panel_radar_scale) hud_panel_radar_scale = 4096; + if(!hud_panel_radar_background_alpha) hud_panel_radar_background_alpha = 0.4 * hud_fg_alpha; + if(!hud_panel_radar_foreground_alpha) hud_panel_radar_foreground_alpha = 0.8 * hud_fg_alpha; + if(!hud_panel_radar_size_x) hud_panel_radar_size_x = 128; + if(!hud_panel_radar_size_y) hud_panel_radar_size_y = hud_panel_radar_size_x; + + hud_panel_radar_size_z = 0; + hud_panel_radar_nohudhack = hud_panel_radar_position_z; + hud_panel_radar_position_z = 0; } // radar links diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh index 29d2704fd4..d48cff2227 100644 --- a/qcsrc/common/constants.qh +++ b/qcsrc/common/constants.qh @@ -58,6 +58,7 @@ const float TE_CSQC_VOTERESET = 109; const float TE_CSQC_ANNOUNCE = 110; const float TE_CSQC_TARGET_MUSIC = 111; const float TE_CSQC_NOTIFY = 112; +const float TE_CSQC_WEAPONCOMPLAIN = 113; const float RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder const float RACE_NET_CHECKPOINT_CLEAR = 1; @@ -574,6 +575,7 @@ float INFO_GOTFLAG = 10319; float INFO_PICKUPFLAG = 10320; float INFO_LOSTFLAG = 10321; float INFO_RETURNFLAG = 10322; +float INFO_CAPTUREFLAG = 10323; // weapon requests float WR_SETUP = 1; // (SVQC) setup weapon data @@ -589,8 +591,8 @@ float WR_RESETPLAYER = 10; // (SVQC) does not need to do anything float WR_IMPACTEFFECT = 11; // (CSQC) impact effect -float HUD_PANEL_WEAPONICONS = 0; -float HUD_PANEL_INVENTORY = 1; +float HUD_PANEL_WEAPONS = 0; +float HUD_PANEL_AMMO = 1; float HUD_PANEL_POWERUPS = 2; float HUD_PANEL_HEALTHARMOR = 3; float HUD_PANEL_NOTIFY = 4; @@ -603,6 +605,23 @@ float HUD_PANEL_MODICONS = 10; float HUD_PANEL_PRESSEDKEYS = 11; float HUD_PANEL_CHAT = 12; float HUD_PANEL_ENGINEINFO = 13; -float HUD_PANEL_NUM = 14; // always last panel id + 1, please increment when adding a new panel +float HUD_PANEL_INFOMESSAGES = 14; +float HUD_PANEL_NUM = 15; // always last panel id + 1, please increment when adding a new panel + +string HUD_PANELNAME_WEAPONS = "weapons"; +string HUD_PANELNAME_AMMO = "ammo"; +string HUD_PANELNAME_POWERUPS = "powerups"; +string HUD_PANELNAME_HEALTHARMOR = "healtharmor"; +string HUD_PANELNAME_NOTIFY = "notify"; +string HUD_PANELNAME_TIMER = "timer"; +string HUD_PANELNAME_RADAR = "radar"; +string HUD_PANELNAME_SCORE = "score"; +string HUD_PANELNAME_RACETIMER = "racetimer"; +string HUD_PANELNAME_VOTE = "vote"; +string HUD_PANELNAME_MODICONS = "modicons"; +string HUD_PANELNAME_PRESSEDKEYS = "pressedkeys"; +string HUD_PANELNAME_CHAT = "chat"; +string HUD_PANELNAME_ENGINEINFO = "engineinfo"; +string HUD_PANELNAME_INFOMESSAGES = "infomessages"; float HUD_MENU_ENABLE = 0; diff --git a/qcsrc/common/items.qh b/qcsrc/common/items.qh index a410474eb5..62f2d8551e 100644 --- a/qcsrc/common/items.qh +++ b/qcsrc/common/items.qh @@ -49,6 +49,8 @@ float IT_AMMO = 8064; // IT_SHELLS | IT_NAILS | IT_ROCKETS | IT_CELLS | IT_S float IT_PICKUPMASK = 51; // IT_FUEL_REGEN | IT_JETPACK | IT_UNLIMITED_AMMO; // strength and invincible are handled separately float IT_UNLIMITED_AMMO = 3; // IT_UNLIMITED_SUPERWEAPONS | IT_UNLIMITED_WEAPON_AMMO; +float AMMO_COUNT = 4; // amount of ammo types to show in the inventory panel + // variables: string weaponorder_byid; string weaponorder_byimpulse; diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc index 08eaaeee74..9875529d3f 100644 --- a/qcsrc/common/util.qc +++ b/qcsrc/common/util.qc @@ -1948,25 +1948,3 @@ float get_model_parameters(string m, float sk) return 1; } - -// return name of given panel id -string HUD_Panel_GetName(float id) -{ - switch(id) { - case HUD_PANEL_WEAPONICONS: return "weaponicons"; break; - case HUD_PANEL_INVENTORY: return "inventory"; break; - case HUD_PANEL_POWERUPS: return "powerups"; break; - case HUD_PANEL_HEALTHARMOR: return "healtharmor"; break; - case HUD_PANEL_NOTIFY: return "notify"; break; - case HUD_PANEL_TIMER: return "timer"; break; - case HUD_PANEL_RADAR: return "radar"; break; - case HUD_PANEL_SCORE: return "score"; break; - case HUD_PANEL_RACETIMER: return "racetimer"; break; - case HUD_PANEL_VOTE: return "vote"; break; - case HUD_PANEL_MODICONS: return "modicons"; break; - case HUD_PANEL_PRESSEDKEYS: return "pressedkeys"; break; - case HUD_PANEL_CHAT: return "chat"; break; - case HUD_PANEL_ENGINEINFO: return "engineinfo"; break; - default: return ""; - } -} diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh index 2a57be0125..f2c2e6702a 100644 --- a/qcsrc/common/util.qh +++ b/qcsrc/common/util.qh @@ -211,4 +211,28 @@ float get_model_parameters_age; string get_model_parameters_desc; float get_model_parameters(string mod, float skn); // call with string_null to clear; skin -1 means mod is the filename of the txt file and is to be split -string HUD_Panel_GetName(float id) +// stupid stupid stupid FTEQCC has a max limit on macro sizes, let's work around by splitting the macro into two macros! :( +#define HUD_Panel_GetName_Part2(id) \ +switch(id) {\ + case HUD_PANEL_ENGINEINFO: panel_name = HUD_PANELNAME_ENGINEINFO; break; \ + case HUD_PANEL_INFOMESSAGES: panel_name = HUD_PANELNAME_INFOMESSAGES; break; \ +} + +// Get name of specified panel id +#define HUD_Panel_GetName(id) \ +switch(id) { \ + case HUD_PANEL_WEAPONS: panel_name = HUD_PANELNAME_WEAPONS; break; \ + case HUD_PANEL_AMMO: panel_name = HUD_PANELNAME_AMMO; break; \ + case HUD_PANEL_POWERUPS: panel_name = HUD_PANELNAME_POWERUPS; break; \ + case HUD_PANEL_HEALTHARMOR: panel_name = HUD_PANELNAME_HEALTHARMOR; break; \ + case HUD_PANEL_NOTIFY: panel_name = HUD_PANELNAME_NOTIFY; break; \ + case HUD_PANEL_TIMER: panel_name = HUD_PANELNAME_TIMER; break; \ + case HUD_PANEL_RADAR: panel_name = HUD_PANELNAME_RADAR; break; \ + case HUD_PANEL_SCORE: panel_name = HUD_PANELNAME_SCORE; break; \ + case HUD_PANEL_RACETIMER: panel_name = HUD_PANELNAME_RACETIMER; break; \ + case HUD_PANEL_VOTE: panel_name = HUD_PANELNAME_VOTE; break; \ + case HUD_PANEL_MODICONS: panel_name = HUD_PANELNAME_MODICONS; break; \ + case HUD_PANEL_PRESSEDKEYS: panel_name = HUD_PANELNAME_PRESSEDKEYS; break; \ + case HUD_PANEL_CHAT: panel_name = HUD_PANELNAME_CHAT; break; \ +}\ +HUD_Panel_GetName_Part2(id) diff --git a/qcsrc/menu/classes.c b/qcsrc/menu/classes.c index 719425ca85..c0568b1e56 100644 --- a/qcsrc/menu/classes.c +++ b/qcsrc/menu/classes.c @@ -41,6 +41,7 @@ #include "xonotic/slider.c" #include "xonotic/slider_resolution.c" #include "xonotic/checkbox.c" +#include "xonotic/checkbox_string.c" #include "xonotic/radiobutton.c" #include "xonotic/nexposee.c" #include "xonotic/rootdialog.c" @@ -81,11 +82,12 @@ #include "xonotic/dialog_multiplayer_demo.c" #include "xonotic/demolist.c" #include "xonotic/colorpicker.c" +#include "xonotic/colorpicker_string.c" #include "xonotic/cvarlist.c" #include "xonotic/dialog_settings_misc_cvars.c" #include "xonotic/dialog_hudsetup_exit.c" #include "xonotic/dialog_hudpanel_notification.c" -#include "xonotic/dialog_hudpanel_inventory.c" +#include "xonotic/dialog_hudpanel_ammo.c" #include "xonotic/dialog_hudpanel_healtharmor.c" #include "xonotic/dialog_hudpanel_powerups.c" #include "xonotic/dialog_hudpanel_racetimer.c" @@ -96,4 +98,6 @@ #include "xonotic/dialog_hudpanel_vote.c" #include "xonotic/dialog_hudpanel_modicons.c" #include "xonotic/dialog_hudpanel_chat.c" -#include "xonotic/dialog_hudpanel_weaponicons.c" +#include "xonotic/dialog_hudpanel_engineinfo.c" +#include "xonotic/dialog_hudpanel_infomessages.c" +#include "xonotic/dialog_hudpanel_weapons.c" diff --git a/qcsrc/menu/gamecommand.qc b/qcsrc/menu/gamecommand.qc index 4a89ab9bae..d2ef187664 100644 --- a/qcsrc/menu/gamecommand.qc +++ b/qcsrc/menu/gamecommand.qc @@ -64,9 +64,8 @@ void GameCommand(string theCommand) if(argv(0) == "directpanelhudmenu") { - highlightedPanel = stof(argv(1)); // switch to a menu item - m_goto(strcat("HUD", HUD_Panel_GetName(highlightedPanel))); + m_goto(strcat("HUD", argv(1))); return; } diff --git a/qcsrc/menu/menu.qh b/qcsrc/menu/menu.qh index de4224b934..903700d5d5 100644 --- a/qcsrc/menu/menu.qh +++ b/qcsrc/menu/menu.qh @@ -40,5 +40,3 @@ void SUB_Null(); float preMenuInit(); // you have to define this for pre-menu initialization. Return 0 if initialization needs to be retried a frame later, 1 if it succeeded. void preMenuDraw(); // this is run before the menu is drawn. You may put some stuff there that has to be done every frame. void postMenuDraw(); // this is run just after the menu is drawn (or not). Useful to draw something over everything else. - -float highlightedPanel; diff --git a/qcsrc/menu/xonotic/checkbox_string.c b/qcsrc/menu/xonotic/checkbox_string.c new file mode 100644 index 0000000000..3b6b36f4e2 --- /dev/null +++ b/qcsrc/menu/xonotic/checkbox_string.c @@ -0,0 +1,69 @@ +#ifdef INTERFACE +CLASS(XonoticCheckBoxString) EXTENDS(CheckBox) + METHOD(XonoticCheckBoxString, configureXonoticCheckBoxString, void(entity, string, string, string, string)) + METHOD(XonoticCheckBoxString, setChecked, void(entity, float)) + ATTRIB(XonoticCheckBoxString, fontSize, float, SKINFONTSIZE_NORMAL) + ATTRIB(XonoticCheckBoxString, image, string, SKINGFX_CHECKBOX) + ATTRIB(XonoticCheckBoxString, yesString, string, string_null) + ATTRIB(XonoticCheckBoxString, noString, string, string_null) + + ATTRIB(XonoticCheckBoxString, color, vector, SKINCOLOR_CHECKBOX_N) + ATTRIB(XonoticCheckBoxString, colorC, vector, SKINCOLOR_CHECKBOX_C) + ATTRIB(XonoticCheckBoxString, colorF, vector, SKINCOLOR_CHECKBOX_F) + ATTRIB(XonoticCheckBoxString, colorD, vector, SKINCOLOR_CHECKBOX_D) + + ATTRIB(XonoticCheckBoxString, cvarName, string, string_null) + METHOD(XonoticCheckBoxString, loadCvars, void(entity)) + METHOD(XonoticCheckBoxString, saveCvars, void(entity)) + + ATTRIB(XonoticCheckBoxString, alpha, float, SKINALPHA_TEXT) + ATTRIB(XonoticCheckBoxString, disabledAlpha, float, SKINALPHA_DISABLED) +ENDCLASS(XonoticCheckBoxString) +entity makeXonoticCheckBoxString(string, string, string, string); +#endif + +#ifdef IMPLEMENTATION +entity makeXonoticCheckBoxString(string theYesValue, string theNoValue, string theCvar, string theText) +{ + entity me; + me = spawnXonoticCheckBoxString(); + me.configureXonoticCheckBoxString(me, theYesValue, theNoValue, theCvar, theText); + return me; +} +void XonoticCheckBoxString_configureXonoticCheckBoxString(entity me, string theYesValue, string theNoValue, string theCvar, string theText) +{ + me.yesString = theYesValue; + me.noString = theNoValue; + me.checked = 0; + if(theCvar) + { + me.cvarName = theCvar; + me.tooltip = getZonedTooltipForIdentifier(theCvar); + me.loadCvars(me); + } + me.configureCheckBox(me, theText, me.fontSize, me.image); +} +void XonoticCheckBoxString_setChecked(entity me, float foo) +{ + me.checked = !me.checked; + me.saveCvars(me); +} +void XonoticCheckBoxString_loadCvars(entity me) +{ + if not(me.cvarName) + return; + + if(cvar_string(me.cvarName) == me.yesString) + me.checked = 1; +} +void XonoticCheckBoxString_saveCvars(entity me) +{ + if not(me.cvarName) + return; + + if(me.checked) + cvar_set(me.cvarName, me.yesString); + else + cvar_set(me.cvarName, me.noString); +} +#endif diff --git a/qcsrc/menu/xonotic/colorpicker_string.c b/qcsrc/menu/xonotic/colorpicker_string.c new file mode 100644 index 0000000000..f56cc74661 --- /dev/null +++ b/qcsrc/menu/xonotic/colorpicker_string.c @@ -0,0 +1,79 @@ +#ifdef INTERFACE +CLASS(XonoticColorpickerString) EXTENDS(Image) + METHOD(XonoticColorpickerString, configureXonoticColorpickerString, void(entity, string)) + METHOD(XonoticColorpickerString, mousePress, float(entity, vector)) + METHOD(XonoticColorpickerString, mouseRelease, float(entity, vector)) + METHOD(XonoticColorpickerString, mouseDrag, float(entity, vector)) + ATTRIB(XonoticColorpickerString, cvarName, string, string_null) + ATTRIB(XonoticColorpickerString, prevcoords, vector, '0 0 0') + ATTRIB(XonoticColorpickerString, image, string, SKINGFX_COLORPICKER) + ATTRIB(XonoticColorpickerString, imagemargin, vector, SKINMARGIN_COLORPICKER) + ATTRIB(XonoticColorpickerString, focusable, float, 1) + METHOD(XonoticColorpickerString, draw, void(entity)) + ATTRIB(XonoticColorpickerString, disabledAlpha, float, 0.3) +ENDCLASS(XonoticColorpickerString) +entity makeXonoticColorpickerString(string theCvar); +#endif + +#ifdef IMPLEMENTATION +entity makeXonoticColorpickerString(string theCvar) +{ + entity me; + me = spawnXonoticColorpickerString(); + me.configureXonoticColorpickerString(me, theCvar); + return me; +} + +void XonoticColorpickerString_configureXonoticColorpickerString(entity me, string theCvar) +{ + me.cvarName = theCvar; + me.configureImage(me, me.image); + me.prevcoords = '1 1 0'; +} + +float XonoticColorpickerString_mousePress(entity me, vector coords) +{ + me.mouseDrag(me, coords); + return 1; +} + +float XonoticColorpickerString_mouseDrag(entity me, vector coords) +{ + if(me.disabled) + return 0; + vector margin; + margin = me.imagemargin; + if(coords_x >= margin_x) + if(coords_y >= margin_y) + if(coords_x <= 1 - margin_x) + if(coords_y <= 1 - margin_y) + { + cvar_set(me.cvarName, sprintf("%v", hslimage_color(coords, margin))); + me.prevcoords = coords; + } + + return 1; +} + +float XonoticColorpickerString_mouseRelease(entity me, vector coords) +{ + me.mouseDrag(me, coords); + return 1; +} + +void XonoticColorpickerString_draw(entity me) +{ + float save; + save = draw_alpha; + if(me.disabled) + draw_alpha *= me.disabledAlpha; + + SUPER(XonoticColorpickerString).draw(me); + + if(me.disabled) + me.prevcoords = '1 1 0'; + else + draw_Picture(me.imgOrigin + me.prevcoords - '0.05 0.125 0', strcat(me.src, "_selected"), '0.1 0.25 0', '1 1 1', 1); + draw_alpha = save; +} +#endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_ammo.c b/qcsrc/menu/xonotic/dialog_hudpanel_ammo.c new file mode 100644 index 0000000000..1e0d4bf92d --- /dev/null +++ b/qcsrc/menu/xonotic/dialog_hudpanel_ammo.c @@ -0,0 +1,85 @@ +#ifdef INTERFACE +CLASS(XonoticHUDAmmoDialog) EXTENDS(XonoticRootDialog) + METHOD(XonoticHUDAmmoDialog, fill, void(entity)) + ATTRIB(XonoticHUDAmmoDialog, title, string, "Ammo Panel") + ATTRIB(XonoticHUDAmmoDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) + ATTRIB(XonoticHUDAmmoDialog, intendedWidth, float, 0.4) + ATTRIB(XonoticHUDAmmoDialog, rows, float, 15) + ATTRIB(XonoticHUDAmmoDialog, columns, float, 4) + ATTRIB(XonoticHUDAmmoDialog, name, string, "HUDammo") +ENDCLASS(XonoticHUDAmmoDialog) +#endif + +#ifdef IMPLEMENTATION +void XonoticHUDAmmoDialog_fill(entity me) +{ + entity e; + string panelname = "ammo"; + float i; + + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_ammo", "Enable panel")); + me.TR(me); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:")); + me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:")); + me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color")))); + setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), ""); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha")))); + e.addValue(e, "Default", ""); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.4); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding")))); + e.addValue(e, "Default", ""); + for(i = 0; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Ammunition display:")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "hud_panel_ammo_onlycurrent", "Show only current ammo type")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Align icon:")); + me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_panel_ammo_iconalign", "0", "Left")); + me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_panel_ammo_iconalign", "1", "Right")); +} +#endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_chat.c b/qcsrc/menu/xonotic/dialog_hudpanel_chat.c index cd9f3854b9..74fabe0518 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_chat.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_chat.c @@ -1,7 +1,7 @@ #ifdef INTERFACE CLASS(XonoticHUDChatDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticHUDChatDialog, fill, void(entity)) - ATTRIB(XonoticHUDChatDialog, title, string, "Chat Panel Setup") + ATTRIB(XonoticHUDChatDialog, title, string, "Chat Panel") ATTRIB(XonoticHUDChatDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDChatDialog, intendedWidth, float, 0.4) ATTRIB(XonoticHUDChatDialog, rows, float, 15) @@ -14,25 +14,75 @@ ENDCLASS(XonoticHUDChatDialog) void XonoticHUDChatDialog_fill(entity me) { entity e; + string panelname = "chat"; + float i; + + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_chat", "Enable panel")); + me.TR(me); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:")); + me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:")); + me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color")))); + setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), ""); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha")))); + e.addValue(e, "Default", ""); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.4); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding")))); + e.addValue(e, "Default", ""); + for(i = 0; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Chat entries:")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Chat size:")); + me.TD(me, 1, 2.6, e = makeXonoticSlider(6, 20, 1, "con_chatsize")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Chat lifetime:")); + me.TD(me, 1, 2.6, e = makeXonoticSlider(5, 60, 5, "con_chattime")); me.TR(me); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_chat", "On/Off")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_chat_bg_color_team")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_chat_bg_alpha")); - me.TR(me); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Font size:")); - me.TD(me, 1, 2, e = makeXonoticSlider(6, 16, 1, "con_chatsize")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Message lifetime:")); - me.TD(me, 1, 2, e = makeXonoticSlider(16, 40, 2, "con_chattime")); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "con_chatsound", "Message sound beep")); - //me.gotoRC(me, me.rows - 1, 0); - //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1)); + me.TDempty(me, 0.2); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "con_chatsound", "Chat beep sound")); } #endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.c b/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.c new file mode 100644 index 0000000000..8d359e9cf6 --- /dev/null +++ b/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.c @@ -0,0 +1,80 @@ +#ifdef INTERFACE +CLASS(XonoticHUDEngineInfoDialog) EXTENDS(XonoticRootDialog) + METHOD(XonoticHUDEngineInfoDialog, fill, void(entity)) + ATTRIB(XonoticHUDEngineInfoDialog, title, string, "Engine Info Panel") + ATTRIB(XonoticHUDEngineInfoDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) + ATTRIB(XonoticHUDEngineInfoDialog, intendedWidth, float, 0.4) + ATTRIB(XonoticHUDEngineInfoDialog, rows, float, 15) + ATTRIB(XonoticHUDEngineInfoDialog, columns, float, 4) + ATTRIB(XonoticHUDEngineInfoDialog, name, string, "HUDengineinfo") +ENDCLASS(XonoticHUDEngineInfoDialog) +#endif + +#ifdef IMPLEMENTATION +void XonoticHUDEngineInfoDialog_fill(entity me) +{ + entity e; + string panelname = "engineinfo"; + float i; + + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_engineinfo", "Enable panel")); + me.TR(me); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:")); + me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:")); + me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color")))); + setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), ""); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha")))); + e.addValue(e, "Default", ""); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.4); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding")))); + e.addValue(e, "Default", ""); + for(i = 0; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Engine info:")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_engineinfo_framecounter_exponentialmovingaverage", "Use an averaging algorithm for fps")); +} +#endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c b/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c index e2e896b384..b276045b63 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c @@ -1,7 +1,7 @@ #ifdef INTERFACE CLASS(XonoticHUDHealthArmorDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticHUDHealthArmorDialog, fill, void(entity)) - ATTRIB(XonoticHUDHealthArmorDialog, title, string, "Health/Armor Panel Setup") + ATTRIB(XonoticHUDHealthArmorDialog, title, string, "Health/Armor Panel") ATTRIB(XonoticHUDHealthArmorDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDHealthArmorDialog, intendedWidth, float, 0.4) ATTRIB(XonoticHUDHealthArmorDialog, rows, float, 15) @@ -14,26 +14,87 @@ ENDCLASS(XonoticHUDHealthArmorDialog) void XonoticHUDHealthArmorDialog_fill(entity me) { entity e; + string panelname = "healtharmor"; + float i; + me.TR(me); - me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Status:")); - me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_healtharmor")); - e.addValue(e, "Disabled", "0"); - e.addValue(e, "Enabled", "1"); - e.addValue(e, "Combined h/a", "2"); - e.configureXonoticTextSliderValues(e); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_healtharmor", "Enable panel")); me.TR(me); - + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:")); + me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:")); + me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color")))); + setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), ""); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha")))); + e.addValue(e, "Default", ""); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.4); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding")))); + e.addValue(e, "Default", ""); + for(i = 0; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_healtharmor_progressbar", "Enable status bar")); + me.TR(me); + me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Status bar alignment:")); + setDependent(e, "hud_panel_healtharmor_progressbar", 1, 1); me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_healtharmor_bg_color_team")); + me.TDempty(me, 0.2); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_panel_healtharmor_baralign", "0", "Left")); + setDependent(e, "hud_panel_healtharmor_progressbar", 1, 1); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_panel_healtharmor_baralign", "1", "Right")); + setDependent(e, "hud_panel_healtharmor_progressbar", 1, 1); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_panel_healtharmor_baralign", "3", "Inward")); + setDependent(e, "hud_panel_healtharmor_progressbar", 1, 1); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_panel_healtharmor_baralign", "4", "Outward")); + setDependent(e, "hud_panel_healtharmor_progressbar", 1, 1); me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_healtharmor_bg_alpha")); + me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Icon alignment:")); me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_healtharmor_flip", "Flip")); + me.TDempty(me, 0.2); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_panel_healtharmor_iconalign", "0", "Left")); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_panel_healtharmor_iconalign", "1", "Right")); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_panel_healtharmor_iconalign", "3", "Inward")); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_panel_healtharmor_iconalign", "4", "Outward")); me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_healtharmor_mirror", "Mirror")); - //me.gotoRC(me, me.rows - 1, 0); - //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1)); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_healtharmor_flip", "Flip health and armor positions")); } #endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.c b/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.c new file mode 100644 index 0000000000..56d4bf4636 --- /dev/null +++ b/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.c @@ -0,0 +1,80 @@ +#ifdef INTERFACE +CLASS(XonoticHUDInfoMessagesDialog) EXTENDS(XonoticRootDialog) + METHOD(XonoticHUDInfoMessagesDialog, fill, void(entity)) + ATTRIB(XonoticHUDInfoMessagesDialog, title, string, "Info Messages Panel") + ATTRIB(XonoticHUDInfoMessagesDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) + ATTRIB(XonoticHUDInfoMessagesDialog, intendedWidth, float, 0.4) + ATTRIB(XonoticHUDInfoMessagesDialog, rows, float, 15) + ATTRIB(XonoticHUDInfoMessagesDialog, columns, float, 4) + ATTRIB(XonoticHUDInfoMessagesDialog, name, string, "HUDinfomessages") +ENDCLASS(XonoticHUDInfoMessagesDialog) +#endif + +#ifdef IMPLEMENTATION +void XonoticHUDInfoMessagesDialog_fill(entity me) +{ + entity e; + string panelname = "infomessages"; + float i; + + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_infomessages", "Enable panel")); + me.TR(me); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:")); + me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:")); + me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color")))); + setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), ""); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha")))); + e.addValue(e, "Default", ""); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.4); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding")))); + e.addValue(e, "Default", ""); + for(i = 0; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Info messages:")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_infomessages_flip", "Flip align")); +} +#endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_inventory.c b/qcsrc/menu/xonotic/dialog_hudpanel_inventory.c deleted file mode 100644 index b67210a1e3..0000000000 --- a/qcsrc/menu/xonotic/dialog_hudpanel_inventory.c +++ /dev/null @@ -1,32 +0,0 @@ -#ifdef INTERFACE -CLASS(XonoticHUDInventoryDialog) EXTENDS(XonoticRootDialog) - METHOD(XonoticHUDInventoryDialog, fill, void(entity)) - ATTRIB(XonoticHUDInventoryDialog, title, string, "Inventory Panel Setup") - ATTRIB(XonoticHUDInventoryDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) - ATTRIB(XonoticHUDInventoryDialog, intendedWidth, float, 0.4) - ATTRIB(XonoticHUDInventoryDialog, rows, float, 15) - ATTRIB(XonoticHUDInventoryDialog, columns, float, 4) - ATTRIB(XonoticHUDInventoryDialog, name, string, "HUDinventory") -ENDCLASS(XonoticHUDInventoryDialog) -#endif - -#ifdef IMPLEMENTATION -void XonoticHUDInventoryDialog_fill(entity me) -{ - entity e; - me.TR(me); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "hud_inventory", "On/Off")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_inventory_bg_color_team")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_inventory_bg_alpha")); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_inventory_onlycurrent", "Show Current Ammo Only")); - me.TR(me); - //me.gotoRC(me, me.rows - 1, 0); - //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1)); -} -#endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_modicons.c b/qcsrc/menu/xonotic/dialog_hudpanel_modicons.c index 8635dae06c..ebd5f240be 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_modicons.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_modicons.c @@ -1,7 +1,7 @@ #ifdef INTERFACE CLASS(XonoticHUDModIconsDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticHUDModIconsDialog, fill, void(entity)) - ATTRIB(XonoticHUDModIconsDialog, title, string, "Mod Icons Panel Setup") + ATTRIB(XonoticHUDModIconsDialog, title, string, "Mod Icons Panel") ATTRIB(XonoticHUDModIconsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDModIconsDialog, intendedWidth, float, 0.4) ATTRIB(XonoticHUDModIconsDialog, rows, float, 15) @@ -14,17 +14,62 @@ ENDCLASS(XonoticHUDModIconsDialog) void XonoticHUDModIconsDialog_fill(entity me) { entity e; + string panelname = "modicons"; + float i; + + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_modicons", "Enable panel")); + me.TR(me); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:")); + me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:")); + me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color")))); + setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), ""); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha")))); + e.addValue(e, "Default", ""); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.4); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode")); me.TR(me); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_modicons", "On/Off")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_modicons_bg_color_team")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_modicons_bg_alpha")); - me.TR(me); - //me.gotoRC(me, me.rows - 1, 0); - //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1)); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding")))); + e.addValue(e, "Default", ""); + for(i = 0; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5))); + e.configureXonoticTextSliderValues(e); } #endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_notification.c b/qcsrc/menu/xonotic/dialog_hudpanel_notification.c index 503d50a47f..c811cb6283 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_notification.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_notification.c @@ -1,7 +1,7 @@ #ifdef INTERFACE CLASS(XonoticHUDNotificationDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticHUDNotificationDialog, fill, void(entity)) - ATTRIB(XonoticHUDNotificationDialog, title, string, "Notification Panel Setup") + ATTRIB(XonoticHUDNotificationDialog, title, string, "Notification Panel") ATTRIB(XonoticHUDNotificationDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDNotificationDialog, intendedWidth, float, 0.4) ATTRIB(XonoticHUDNotificationDialog, rows, float, 15) @@ -14,27 +14,78 @@ ENDCLASS(XonoticHUDNotificationDialog) void XonoticHUDNotificationDialog_fill(entity me) { entity e; + string panelname = "notify"; + float i; + + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_healtharmor", "Enable panel")); + me.TR(me); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:")); + me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:")); + me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color")))); + setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), ""); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha")))); + e.addValue(e, "Default", ""); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.4); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding")))); + e.addValue(e, "Default", ""); + for(i = 0; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Notifications:")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_notify_print", "Also print notifications to the console")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_notify_flip", "Flip notify order")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Entry lifetime:")); + me.TD(me, 1, 2.6, e = makeXonoticSlider(3, 15, 1, "hud_panel_notify_time")); me.TR(me); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_notify", "On/Off")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_notify_bg_color_team")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_notify_bg_alpha")); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_notify_flip", "Flip")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Message lifetime:")); - me.TD(me, 1, 2, e = makeXonoticSlider(3, 15, 1, "hud_notify_time")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Message fadetime:")); - me.TD(me, 1, 2, e = makeXonoticSlider(1, 5, 1, "hud_notify_fadetime")); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_notify_print", "Also print messages to console")); - me.TR(me); - //me.gotoRC(me, me.rows - 1, 0); - //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1)); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Entry fadetime:")); + me.TD(me, 1, 2.6, e = makeXonoticSlider(0.5, 5, 0.5, "hud_panel_notify_fadetime")); } #endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_powerups.c b/qcsrc/menu/xonotic/dialog_hudpanel_powerups.c index b6d42326de..14f4a19268 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_powerups.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_powerups.c @@ -1,7 +1,7 @@ #ifdef INTERFACE CLASS(XonoticHUDPowerupsDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticHUDPowerupsDialog, fill, void(entity)) - ATTRIB(XonoticHUDPowerupsDialog, title, string, "Powerups Panel Setup") + ATTRIB(XonoticHUDPowerupsDialog, title, string, "Powerups Panel") ATTRIB(XonoticHUDPowerupsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDPowerupsDialog, intendedWidth, float, 0.4) ATTRIB(XonoticHUDPowerupsDialog, rows, float, 15) @@ -14,21 +14,87 @@ ENDCLASS(XonoticHUDPowerupsDialog) void XonoticHUDPowerupsDialog_fill(entity me) { entity e; + string panelname = "powerups"; + float i; + + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_powerups", "Enable panel")); + me.TR(me); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:")); + me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:")); + me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color")))); + setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), ""); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha")))); + e.addValue(e, "Default", ""); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.4); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding")))); + e.addValue(e, "Default", ""); + for(i = 0; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_powerups_progressbar", "Enable status bar")); + me.TR(me); + me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Status bar alignment:")); + setDependent(e, "hud_panel_powerups_progressbar", 1, 1); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_panel_powerups_baralign", "0", "Left")); + setDependent(e, "hud_panel_powerups_progressbar", 1, 1); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_panel_powerups_baralign", "1", "Right")); + setDependent(e, "hud_panel_powerups_progressbar", 1, 1); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_panel_powerups_baralign", "3", "Inward")); + setDependent(e, "hud_panel_powerups_progressbar", 1, 1); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_panel_powerups_baralign", "4", "Outward")); + setDependent(e, "hud_panel_powerups_progressbar", 1, 1); + me.TR(me); + me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Icon alignment:")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_panel_powerups_iconalign", "0", "Left")); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_panel_powerups_iconalign", "1", "Right")); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_panel_powerups_iconalign", "3", "Inward")); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_panel_powerups_iconalign", "4", "Outward")); me.TR(me); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_powerups", "On/Off")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_powerups_bg_color_team")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_powerups_bg_alpha")); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_powerups_flip", "Flip")); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_powerups_mirror", "Mirror")); - me.TR(me); - //me.gotoRC(me, me.rows - 1, 0); - //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1)); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_powerups_flip", "Flip strength and shield positions")); } #endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c b/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c index 9b66fc3cba..0c83025600 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c @@ -1,7 +1,7 @@ #ifdef INTERFACE CLASS(XonoticHUDPressedKeysDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticHUDPressedKeysDialog, fill, void(entity)) - ATTRIB(XonoticHUDPressedKeysDialog, title, string, "Pressed Keys Panel Setup") + ATTRIB(XonoticHUDPressedKeysDialog, title, string, "Pressed Keys Panel") ATTRIB(XonoticHUDPressedKeysDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDPressedKeysDialog, intendedWidth, float, 0.4) ATTRIB(XonoticHUDPressedKeysDialog, rows, float, 15) @@ -14,17 +14,70 @@ ENDCLASS(XonoticHUDPressedKeysDialog) void XonoticHUDPressedKeysDialog_fill(entity me) { entity e; + string panelname = "pressedkeys"; + float i; + + me.TR(me); + me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_panel_pressedkeys")); + e.addValue(e, "Panel disabled", "0"); + e.addValue(e, "Panel enabled when spectating", "1"); + e.addValue(e, "Panel always enabled", "2"); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:")); + me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:")); + me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color")))); + setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), ""); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha")))); + e.addValue(e, "Default", ""); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.4); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding")))); + e.addValue(e, "Default", ""); + for(i = 0; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5))); + e.configureXonoticTextSliderValues(e); me.TR(me); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_pressedkeys", "On/Off")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_pressedkeys_bg_color_team")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_pressedkeys_bg_alpha")); - me.TR(me); - //me.gotoRC(me, me.rows - 1, 0); - //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1)); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Forced aspect:")); + me.TD(me, 1, 2.6, e = makeXonoticSlider(0.25, 4, 0.25, "hud_panel_pressedkeys_aspect")); } #endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.c b/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.c index 7fe0f682e9..febbd54497 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.c @@ -1,7 +1,7 @@ #ifdef INTERFACE CLASS(XonoticHUDRaceTimerDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticHUDRaceTimerDialog, fill, void(entity)) - ATTRIB(XonoticHUDRaceTimerDialog, title, string, "Race Timer Panel Setup") + ATTRIB(XonoticHUDRaceTimerDialog, title, string, "Race Timer Panel") ATTRIB(XonoticHUDRaceTimerDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDRaceTimerDialog, intendedWidth, float, 0.4) ATTRIB(XonoticHUDRaceTimerDialog, rows, float, 15) @@ -14,17 +14,62 @@ ENDCLASS(XonoticHUDRaceTimerDialog) void XonoticHUDRaceTimerDialog_fill(entity me) { entity e; + string panelname = "racetimer"; + float i; + + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_racetimer", "Enable panel")); + me.TR(me); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:")); + me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:")); + me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color")))); + setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), ""); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha")))); + e.addValue(e, "Default", ""); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.4); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode")); me.TR(me); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_racetimer", "On/Off")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_racetimer_bg_color_team")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_racetimer_bg_alpha")); - me.TR(me); - //me.gotoRC(me, me.rows - 1, 0); - //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1)); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding")))); + e.addValue(e, "Default", ""); + for(i = 0; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5))); + e.configureXonoticTextSliderValues(e); } #endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_radar.c b/qcsrc/menu/xonotic/dialog_hudpanel_radar.c index a0ead55ef9..90de04795a 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_radar.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_radar.c @@ -1,7 +1,7 @@ #ifdef INTERFACE CLASS(XonoticHUDRadarDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticHUDRadarDialog, fill, void(entity)) - ATTRIB(XonoticHUDRadarDialog, title, string, "Radar Panel Setup") + ATTRIB(XonoticHUDRadarDialog, title, string, "Radar Panel") ATTRIB(XonoticHUDRadarDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDRadarDialog, intendedWidth, float, 0.4) ATTRIB(XonoticHUDRadarDialog, rows, float, 15) @@ -14,37 +14,95 @@ ENDCLASS(XonoticHUDRadarDialog) void XonoticHUDRadarDialog_fill(entity me) { entity e; + string panelname = "radar"; + float i; + + me.TR(me); + me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_panel_radar")); + e.addValue(e, "Panel disabled", "0"); + e.addValue(e, "Panel enabled in teamgames", "1"); + e.addValue(e, "Panel always enabled", "2"); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:")); + me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:")); + me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color")))); + setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), ""); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha")))); + e.addValue(e, "Default", ""); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); me.TR(me); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_radar", "On/Off")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_radar_bg_color_team")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_radar_bg_alpha")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Foreground Alpha:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_radar_foreground_alpha")); - me.TR(me); - me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Rotation:")); - me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_radar_rotation")); - e.addValue(e, "Player", "0"); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.4); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding")))); + e.addValue(e, "Default", ""); + for(i = 0; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Radar:")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:")); + me.TD(me, 1, 2.6, e = makeXonoticSlider(0.1, 1, 0.1, "hud_panel_radar_foreground_alpha")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Rotation:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_panel_radar_rotation")); + e.addValue(e, "Forward", "0"); e.addValue(e, "West", "1"); e.addValue(e, "South", "2"); e.addValue(e, "East", "3"); e.addValue(e, "North", "4"); e.configureXonoticTextSliderValues(e); - me.TR(me); - me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Zoom:")); - me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_radar_zoommode")); - e.addValue(e, "Default", "0"); - e.addValue(e, "Zoomed", "1"); - e.addValue(e, "Always Zoomed", "2"); - e.addValue(e, "Zoomed Out", "3"); - e.configureXonoticTextSliderValues(e); me.TR(me); - //me.gotoRC(me, me.rows - 1, 0); - //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1)); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Scale:")); + me.TD(me, 1, 2.6, e = makeXonoticSlider(1024, 8192, 512, "hud_panel_radar_scale")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Zoom mode:")); + me.TD(me, 1, 1.6, e = makeXonoticTextSlider("hud_panel_radar_zoommode")); + e.addValue(e, "Zoomed in", "0"); + e.addValue(e, "Zoomed out", "1"); + e.addValue(e, "Always zoomed", "2"); + e.addValue(e, "Never zoomed", "3"); + e.configureXonoticTextSliderValues(e); } #endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_score.c b/qcsrc/menu/xonotic/dialog_hudpanel_score.c index 05fdb74f10..8c8561ea79 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_score.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_score.c @@ -1,7 +1,7 @@ #ifdef INTERFACE CLASS(XonoticHUDScoreDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticHUDScoreDialog, fill, void(entity)) - ATTRIB(XonoticHUDScoreDialog, title, string, "Score Panel Setup") + ATTRIB(XonoticHUDScoreDialog, title, string, "Score Panel") ATTRIB(XonoticHUDScoreDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDScoreDialog, intendedWidth, float, 0.4) ATTRIB(XonoticHUDScoreDialog, rows, float, 15) @@ -14,17 +14,62 @@ ENDCLASS(XonoticHUDScoreDialog) void XonoticHUDScoreDialog_fill(entity me) { entity e; + string panelname = "score"; + float i; + + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_score", "Enable panel")); + me.TR(me); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:")); + me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:")); + me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color")))); + setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), ""); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha")))); + e.addValue(e, "Default", ""); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.4); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode")); me.TR(me); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_score", "On/Off")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_score_bg_color_team")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_score_bg_alpha")); - me.TR(me); - //me.gotoRC(me, me.rows - 1, 0); - //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1)); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding")))); + e.addValue(e, "Default", ""); + for(i = 0; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5))); + e.configureXonoticTextSliderValues(e); } #endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_timer.c b/qcsrc/menu/xonotic/dialog_hudpanel_timer.c index 6bfa03b995..748d2911ec 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_timer.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_timer.c @@ -1,7 +1,7 @@ #ifdef INTERFACE CLASS(XonoticHUDTimerDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticHUDTimerDialog, fill, void(entity)) - ATTRIB(XonoticHUDTimerDialog, title, string, "Timer Panel Setup") + ATTRIB(XonoticHUDTimerDialog, title, string, "Timer Panel") ATTRIB(XonoticHUDTimerDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDTimerDialog, intendedWidth, float, 0.4) ATTRIB(XonoticHUDTimerDialog, rows, float, 15) @@ -14,17 +14,67 @@ ENDCLASS(XonoticHUDTimerDialog) void XonoticHUDTimerDialog_fill(entity me) { entity e; + string panelname = "timer"; + float i; + + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_timer", "Enable panel")); + me.TR(me); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:")); + me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:")); + me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color")))); + setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), ""); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha")))); + e.addValue(e, "Default", ""); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.4); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding")))); + e.addValue(e, "Default", ""); + for(i = 0; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Timer:")); me.TR(me); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_timer", "On/Off")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_timer_bg_color_team")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_timer_bg_alpha")); - me.TR(me); - //me.gotoRC(me, me.rows - 1, 0); - //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1)); + me.TDempty(me, 0.2); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_timer_increment", "Show elapsed time")); } #endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_vote.c b/qcsrc/menu/xonotic/dialog_hudpanel_vote.c index e96af574aa..6c935d9e7f 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_vote.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_vote.c @@ -1,7 +1,7 @@ #ifdef INTERFACE CLASS(XonoticHUDVoteDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticHUDVoteDialog, fill, void(entity)) - ATTRIB(XonoticHUDVoteDialog, title, string, "Vote Panel Setup") + ATTRIB(XonoticHUDVoteDialog, title, string, "Vote Panel") ATTRIB(XonoticHUDVoteDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDVoteDialog, intendedWidth, float, 0.4) ATTRIB(XonoticHUDVoteDialog, rows, float, 15) @@ -14,17 +14,65 @@ ENDCLASS(XonoticHUDVoteDialog) void XonoticHUDVoteDialog_fill(entity me) { entity e; + string panelname = "vote"; + float i; + + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_vote", "Enable panel")); + me.TR(me); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:")); + me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:")); + me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color")))); + setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), ""); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha")))); + e.addValue(e, "Default", ""); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.4); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding")))); + e.addValue(e, "Default", ""); + for(i = 0; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5))); + e.configureXonoticTextSliderValues(e); me.TR(me); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_vote", "On/Off")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_vote_bg_color_team")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_vote_bg_alpha")); - me.TR(me); - //me.gotoRC(me, me.rows - 1, 0); - //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1)); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Alpha after voting:")); + me.TD(me, 1, 2.6, e = makeXonoticSlider(0.1, 1, 0.1, "hud_panel_vote_alreadyvoted_alpha")); } #endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_weaponicons.c b/qcsrc/menu/xonotic/dialog_hudpanel_weaponicons.c deleted file mode 100644 index 1a55bced0b..0000000000 --- a/qcsrc/menu/xonotic/dialog_hudpanel_weaponicons.c +++ /dev/null @@ -1,32 +0,0 @@ -#ifdef INTERFACE -CLASS(XonoticHUDWeaponIconsDialog) EXTENDS(XonoticRootDialog) - METHOD(XonoticHUDWeaponIconsDialog, fill, void(entity)) - ATTRIB(XonoticHUDWeaponIconsDialog, title, string, "Weapon Icons Panel Setup") - ATTRIB(XonoticHUDWeaponIconsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) - ATTRIB(XonoticHUDWeaponIconsDialog, intendedWidth, float, 0.4) - ATTRIB(XonoticHUDWeaponIconsDialog, rows, float, 15) - ATTRIB(XonoticHUDWeaponIconsDialog, columns, float, 4) - ATTRIB(XonoticHUDWeaponIconsDialog, name, string, "HUDweaponicons") -ENDCLASS(XonoticHUDWeaponIconsDialog) -#endif - -#ifdef IMPLEMENTATION -void XonoticHUDWeaponIconsDialog_fill(entity me) -{ - entity e; - me.TR(me); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_weaponicons", "On/Off")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_weaponicons_bg_color_team")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_weaponicons_bg_alpha")); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "hud_weaponicons_number", "Show Weapon Number")); - me.TR(me); - //me.gotoRC(me, me.rows - 1, 0); - //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1)); -} -#endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_weapons.c b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.c new file mode 100644 index 0000000000..a32099d9d8 --- /dev/null +++ b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.c @@ -0,0 +1,98 @@ +#ifdef INTERFACE +CLASS(XonoticHUDWeaponsDialog) EXTENDS(XonoticRootDialog) + METHOD(XonoticHUDWeaponsDialog, fill, void(entity)) + ATTRIB(XonoticHUDWeaponsDialog, title, string, "Weapons Panel") + ATTRIB(XonoticHUDWeaponsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) + ATTRIB(XonoticHUDWeaponsDialog, intendedWidth, float, 0.4) + ATTRIB(XonoticHUDWeaponsDialog, rows, float, 15) + ATTRIB(XonoticHUDWeaponsDialog, columns, float, 4) + ATTRIB(XonoticHUDWeaponsDialog, name, string, "HUDweapons") +ENDCLASS(XonoticHUDWeaponsDialog) +#endif + +#ifdef IMPLEMENTATION +void XonoticHUDWeaponsDialog_fill(entity me) +{ + entity e; + string panelname = "weapons"; + float i; + + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_weapons", "Enable panel")); + me.TR(me); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:")); + me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:")); + me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color")))); + setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), ""); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha")))); + e.addValue(e, "Default", ""); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team")))); + e.addValue(e, "Default", ""); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.4); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding")))); + e.addValue(e, "Default", ""); + for(i = 0; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Weapon icons:")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Show weapon ID as:")); + me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_panel_weapons_label", "0", "None")); + me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_panel_weapons_label", "1", "Number")); + me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_panel_weapons_label", "2", "Bind")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "hud_panel_weapons_accuracy", "Show Accuracy")); + me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "hud_panel_weapons_ammo", "Show Ammo")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Ammo bar color:")); + me.TD(me, 2, 2.4, e = makeXonoticColorpickerString("hud_panel_weapons_ammo_color")); + setDependent(e, "hud_panel_weapons_ammo", 1, 1); + me.TR(me); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Ammo bar alpha:")); + me.TD(me, 1, 2.6, e = makeXonoticSlider(0.1, 1, 0.1, "hud_panel_weapons_ammo_alpha")); + setDependent(e, "hud_panel_weapons_ammo", 1, 1); +} +#endif diff --git a/qcsrc/menu/xonotic/dialog_hudsetup_exit.c b/qcsrc/menu/xonotic/dialog_hudsetup_exit.c index da75603f49..b72a30b1e7 100644 --- a/qcsrc/menu/xonotic/dialog_hudsetup_exit.c +++ b/qcsrc/menu/xonotic/dialog_hudsetup_exit.c @@ -1,10 +1,10 @@ #ifdef INTERFACE CLASS(XonoticHUDExitDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticHUDExitDialog, fill, void(entity)) - ATTRIB(XonoticHUDExitDialog, title, string, "HUD Setup") + ATTRIB(XonoticHUDExitDialog, title, string, "Panel HUD Setup") ATTRIB(XonoticHUDExitDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDExitDialog, intendedWidth, float, 0.4) - ATTRIB(XonoticHUDExitDialog, rows, float, 15) + ATTRIB(XonoticHUDExitDialog, rows, float, 20) ATTRIB(XonoticHUDExitDialog, columns, float, 4) ATTRIB(XonoticHUDExitDialog, name, string, "HUDExit") ENDCLASS(XonoticHUDExitDialog) @@ -15,43 +15,91 @@ ENDCLASS(XonoticHUDExitDialog) void XonoticHUDExitDialog_fill(entity me) { entity e; + float i; + + me.TR(me); + me.TD(me, 1, 4, makeXonoticTextLabel(0, "Panel background defaults:")); + me.TR(me); + me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:")); + me.TD(me, 2, 2.4, e = makeXonoticColorpickerString("hud_panel_bg_color")); + setDependentStringNotEqual(e, "hud_panel_bg_color", ""); + me.TR(me); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_panel_bg_border")); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2))); + e.configureXonoticTextSliderValues(e); me.TR(me); - me.TD(me, 1, 4, makeXonoticTextLabel(0, "Panel Defaults:")); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_bg", "Panel Background")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_bg_color_team")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_bg_alpha")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Foreground Alpha:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_fg_alpha")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Progress Bar Alpha:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_progressbar_alpha")); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_checkcollisions", "Collision Check")); - me.TR(me); - - me.TR(me); - me.TD(me, 1, 4, makeXonoticTextLabel(0, "Dock Settings:")); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_panel_bg_alpha")); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team color:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_panel_bg_color_team")); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.4); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_panel_bg_padding")); + for(i = 0; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5))); + e.configureXonoticTextSliderValues(e); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_dock_color_team")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Dock Alpha:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_dock_alpha")); me.TR(me); - + me.TD(me, 1, 4, makeXonoticTextLabel(0, "Dock settings:")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Alpha:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_dock_alpha")); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team color:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_dock_color_team")); + e.addValue(e, "Disable", "0"); + for(i = 1; i <= 10; ++i) + e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10))); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TD(me, 1, 4, makeXonoticTextLabel(0, "Grid settings:")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_grid", "Snap panels to grid")); me.TR(me); - me.TD(me, 1, 4, makeXonoticTextLabel(0, "Grid Settings:")); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Grid size:")); + me.TD(me, 1, 0.2, e = makeXonoticTextLabel(0, "X:")); + me.TD(me, 1, 1.1, e = makeXonoticTextSlider("hud_configure_grid_xsize")); + for(i = 1; i <= 14; ++i) + e.addValue(e, strzone(ftos_decimals(i/200, 3)), strzone(ftos(i/200))); + e.configureXonoticTextSliderValues(e); + setDependent(e, "hud_configure_grid", 1, 1); + me.TD(me, 1, 0.2, e = makeXonoticTextLabel(0, "Y:")); + me.TD(me, 1, 1.1, e = makeXonoticTextSlider("hud_configure_grid_ysize")); + for(i = 1; i <= 14; ++i) + e.addValue(e, strzone(ftos_decimals(i/200, 3)), strzone(ftos(i/200))); + e.configureXonoticTextSliderValues(e); + setDependent(e, "hud_configure_grid", 1, 1); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "hud_configure_grid", "Snap Panel to Grid")); - me.gotoRC(me, me.rows - 1, 0); - me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1)); + me.gotoRC(me, me.rows - 1, 0); + me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit setup", '0 0 0', "_hud_configure 0", 1)); } #endif diff --git a/qcsrc/menu/xonotic/mainwindow.c b/qcsrc/menu/xonotic/mainwindow.c index f1cbfffc75..72e5faac36 100644 --- a/qcsrc/menu/xonotic/mainwindow.c +++ b/qcsrc/menu/xonotic/mainwindow.c @@ -41,7 +41,7 @@ void MainWindow_configureMainWindow(entity me) i.configureDialog(i); me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z); - i = spawnXonoticHUDInventoryDialog(); + i = spawnXonoticHUDAmmoDialog(); i.configureDialog(i); me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z); @@ -85,7 +85,15 @@ void MainWindow_configureMainWindow(entity me) i.configureDialog(i); me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z); - i = spawnXonoticHUDWeaponIconsDialog(); + i = spawnXonoticHUDWeaponsDialog(); + i.configureDialog(i); + me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z); + + i = spawnXonoticHUDEngineInfoDialog(); + i.configureDialog(i); + me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z); + + i = spawnXonoticHUDInfoMessagesDialog(); i.configureDialog(i); me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z); diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc index 6ef8267944..a75537907d 100644 --- a/qcsrc/server/cheats.qc +++ b/qcsrc/server/cheats.qc @@ -653,7 +653,7 @@ float CheatCommand(float argc) if(self.movetype != MOVETYPE_FLY) { self.movetype = MOVETYPE_FLY; - sprint(self, "flmodey ON\n"); + sprint(self, "flymode ON\n"); DID_CHEAT(); } else diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 73c9169e5e..1543ac1561 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -2599,7 +2599,23 @@ void PlayerPreThink (void) if(frametime) { - self.glowmod = colormapPaletteColor(self.clientcolors & 0x0F, TRUE) * 2; + if(self.health <= 0 && cvar("g_deathglow")) + { + if(self.glowmod_x > 0) + self.glowmod_x -= cvar("g_deathglow") * frametime; + else + self.glowmod_x = -1; + if(self.glowmod_y > 0) + self.glowmod_y -= cvar("g_deathglow") * frametime; + else + self.glowmod_y = -1; + if(self.glowmod_z > 0) + self.glowmod_z -= cvar("g_deathglow") * frametime; + else + self.glowmod_z = -1; + } + else + self.glowmod = colormapPaletteColor(self.clientcolors & 0x0F, TRUE) * 2; player_powerups(); } @@ -2659,7 +2675,6 @@ void PlayerPreThink (void) FOR_EACH_PLAYER(other) if(self != other) { if(time > other.touchexplode_time) - if(other.classname == "player") if(other.deadflag == DEAD_NO) if not(IS_INDEPENDENT_PLAYER(other)) if(boxesoverlap(self.absmin, self.absmax, other.absmin, other.absmax)) diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc index ac67895867..70e702505c 100644 --- a/qcsrc/server/cl_physics.qc +++ b/qcsrc/server/cl_physics.qc @@ -16,6 +16,7 @@ float sv_maxairstrafespeed; float sv_airstrafeaccel_qw; float sv_aircontrol; float sv_aircontrol_power; +float sv_aircontrol_penalty; float sv_warsowbunny_airforwardaccel; float sv_warsowbunny_accel; float sv_warsowbunny_topspeed; @@ -470,7 +471,9 @@ void CPM_PM_Aircontrol(vector wishdir, float wishspeed) if(dot > 0) // we can't change direction while slowing down { - k *= fabs(sv_aircontrol)*pow(dot, sv_aircontrol_power)*frametime; + k *= pow(dot, sv_aircontrol_power)*frametime; + xyspeed = max(0, xyspeed - sv_aircontrol_penalty * sqrt(max(0, 1 - dot*dot)) * k/32); + k *= sv_aircontrol; self.velocity = normalize(self.velocity * xyspeed + wishdir * k); } @@ -1202,8 +1205,13 @@ void SV_PlayerPhysics() // CPM if(sv_airstopaccelerate) - if(self.velocity * wishdir < 0) - airaccel = sv_airstopaccelerate*maxspd_mod; + { + vector curdir; + curdir = self.velocity; + curdir_z = 0; + curdir = normalize(curdir); + airaccel = airaccel + (sv_airstopaccelerate*maxspd_mod - airaccel) * max(0, -(curdir * wishdir)); + } // note that for straight forward jumping: // step = accel * frametime * wishspeed0; // accel = bound(0, wishspeed - vel_xy_current, step) * accelqw + step * (1 - accelqw); diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc index 15898759ed..3f8581a432 100644 --- a/qcsrc/server/cl_weaponsystem.qc +++ b/qcsrc/server/cl_weaponsystem.qc @@ -907,6 +907,16 @@ void CL_SpawnWeaponentity() self.exteriorweaponentity.nextthink = time; }; +void Send_WeaponComplain (entity e, float wpn, string wpnname, float type) +{ + msg_entity = e; + WriteByte(MSG_ONE, SVC_TEMPENTITY); + WriteByte(MSG_ONE, TE_CSQC_WEAPONCOMPLAIN); + WriteByte(MSG_ONE, wpn); + WriteString(MSG_ONE, wpnname); + WriteByte(MSG_ONE, type); +} + .float hasweapon_complain_spam; float client_hasweapon(entity cl, float wpn, float andammo, float complain) @@ -949,6 +959,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain) { play2(cl, "weapons/unavailable.wav"); sprint(cl, strcat("You don't have any ammo for the ^2", W_Name(wpn), "\n")); + Send_WeaponComplain (cl, wpn, W_Name(wpn), 0); } return FALSE; } @@ -962,6 +973,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain) if(weaponsInMap & weaponbit) { sprint(cl, strcat("You do not have the ^2", W_Name(wpn), "\n") ); + Send_WeaponComplain (cl, wpn, W_Name(wpn), 1); if(cvar("g_showweaponspawns")) { @@ -989,7 +1001,10 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain) } } else + { + Send_WeaponComplain (cl, wpn, W_Name(wpn), 2); sprint(cl, strcat("The ^2", W_Name(wpn), "^7 is ^1NOT AVAILABLE^7 in this map\n") ); + } play2(cl, "weapons/unavailable.wav"); } diff --git a/qcsrc/server/ctf.qc b/qcsrc/server/ctf.qc index 4148136daf..6e314c88ef 100644 --- a/qcsrc/server/ctf.qc +++ b/qcsrc/server/ctf.qc @@ -473,7 +473,7 @@ void FlagTouch() h0 = strcat(h0, "^7's"); // h0: display text for previous netname if (flagcaptimerecord == 0) { - bprint(other.netname, "^7 captured the ", other.flagcarried.netname, " in ", s, " seconds\n"); + s = strcat(" in ", s, " seconds"); flagcaptimerecord = t; db_put(ServerProgsDB, strcat(GetMapname(), "/captimerecord/time"), ftos(t)); db_put(ServerProgsDB, strcat(GetMapname(), "/captimerecord/netname"), h1); @@ -481,7 +481,7 @@ void FlagTouch() } else if (t < flagcaptimerecord) { - bprint(other.netname, "^7 captured the ", other.flagcarried.netname, " in ", s, ", breaking ", strcat(h0, " previous record of ", s0, " seconds\n")); + s = strcat(" in ", s, " seconds, breaking ", h0, " previous record of ", s0, " seconds"); flagcaptimerecord = t; db_put(ServerProgsDB, strcat(GetMapname(), "/captimerecord/time"), ftos(t)); db_put(ServerProgsDB, strcat(GetMapname(), "/captimerecord/netname"), h1); @@ -489,11 +489,13 @@ void FlagTouch() } else { - bprint(other.netname, "^7 captured the ", other.flagcarried.netname, " in ", s, ", failing to break ", strcat(h0, " record of ", s0, " seconds\n")); + s = strcat(" in ", s, " seconds, failing to break ", h0, " record of ", s0, " seconds"); } } else - bprint(other.netname, "^7 captured the ", other.flagcarried.netname, "\n"); + s = ""; + + Send_KillNotification (other.netname, other.flagcarried.netname, s, INFO_CAPTUREFLAG, MSG_INFO); PlayerTeamScore_Add(other, SP_CTF_CAPS, ST_CTF_CAPS, 1); LogCTF("capture", other.flagcarried.team, other); diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 30e49cd56f..3b4386b57d 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -257,20 +257,21 @@ void Send_KillNotification (string s1, string s2, string s3, float msg, float ty WriteByte(MSG_ALL, type); } -// TODO: writespectatable? // Function is used to send a generic centerprint whose content CSQC gets to decide (gentle version or not in the below cases) void Send_CSQC_Centerprint(entity e, string s1, string s2, float msg, float type) { if (clienttype(e) == CLIENTTYPE_REAL) { msg_entity = e; - WriteByte(MSG_ONE, SVC_TEMPENTITY); - WriteByte(MSG_ONE, TE_CSQC_NOTIFY); - WriteByte(MSG_ONE, CSQC_CENTERPRINT); - WriteString(MSG_ONE, s1); - WriteString(MSG_ONE, s2); - WriteShort(MSG_ONE, msg); - WriteByte(MSG_ONE, type); + WRITESPECTATABLE_MSG_ONE({ + WriteByte(MSG_ONE, SVC_TEMPENTITY); + WriteByte(MSG_ONE, TE_CSQC_NOTIFY); + WriteByte(MSG_ONE, CSQC_CENTERPRINT); + WriteString(MSG_ONE, s1); + WriteString(MSG_ONE, s2); + WriteShort(MSG_ONE, msg); + WriteByte(MSG_ONE, type); + }); } } @@ -294,19 +295,6 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype) msg = ColoredTeamName(targ.team); // TODO: check if needed? Send_CSQC_Centerprint(targ, msg, "", deathtype, MSG_SUICIDE); - if(deathtype != DEATH_TEAMCHANGE && deathtype != DEATH_QUIET) - { - LogDeath("suicide", deathtype, targ, targ); - GiveFrags(attacker, targ, -1); - } - // TODO: hmm? - /* - if (targ.killcount > 2) - bprint ("^1",s,"^1 faded after a ",ftos(targ.killcount)," point spree\n"); - */ - - // TODO: wut is this? - // givefrags for logging apparently? if(deathtype != DEATH_TEAMCHANGE && deathtype != DEATH_QUIET) { LogDeath("suicide", deathtype, targ, targ); @@ -315,7 +303,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype) if (targ.killcount > 2) msg = ftos(targ.killcount); - if(teams_matter && attacker.team == targ.team) + if(teams_matter && deathtype == DEATH_MIRRORDAMAGE) { if(attacker.team == COLOR_TEAM1) deathtype = KILL_TEAM_RED; @@ -359,7 +347,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype) { checkrules_firstblood = TRUE; Send_KillNotification(a, "", "", KILL_FIRST_BLOOD, MSG_KILL); - // TODO: make these print at newline if they dont + // TODO: make these print a newline if they dont Send_CSQC_Centerprint(attacker, "", "", KILL_FIRST_BLOOD, MSG_KILL); Send_CSQC_Centerprint(targ, "", "", KILL_FIRST_VICTIM, MSG_KILL); } diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index a79f9a473b..44a47c95dc 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/sv_main.qc @@ -191,6 +191,7 @@ void StartFrame (void) sv_maxairstrafespeed = cvar("sv_maxairstrafespeed"); sv_airstrafeaccel_qw = cvar("sv_airstrafeaccel_qw"); sv_aircontrol = cvar("sv_aircontrol"); + sv_aircontrol_penalty = cvar("sv_aircontrol_penalty"); sv_aircontrol_power = cvar("sv_aircontrol_power"); sv_warsowbunny_airforwardaccel = cvar("sv_warsowbunny_airforwardaccel"); sv_warsowbunny_accel = cvar("sv_warsowbunny_accel"); diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index cb8f0b1025..c291e79a00 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -112,7 +112,7 @@ void Item_Show (entity e, float mode) e.model = e.mdl; e.solid = SOLID_NOT; e.colormod = stov(cvar_string("g_ghost_items_color")); - self.glowmod = self.colormod; + e.glowmod = e.colormod; e.alpha = g_ghost_items; e.customizeentityforclient = func_null; @@ -124,7 +124,7 @@ void Item_Show (entity e, float mode) e.model = string_null; e.solid = SOLID_NOT; e.colormod = stov(cvar_string("g_ghost_items_color")); - self.glowmod = self.colormod; + e.glowmod = e.colormod; e.alpha = 0; e.customizeentityforclient = func_null; @@ -291,7 +291,7 @@ float Item_GiveTo(entity item, entity player) // AnnounceTo(player, "ammo"); if (item.weapons & WEPBIT_MINSTANEX) - W_GiveWeapon (player, WEP_MINSTANEX, "Nex"); + W_GiveWeapon (player, WEP_MINSTANEX, item.netname); if (item.ammo_cells) player.ammo_cells = min (player.ammo_cells + cvar("g_minstagib_ammo_drop"), 999); player.health = 100; @@ -303,7 +303,7 @@ float Item_GiveTo(entity item, entity player) pickedup = TRUE; // sound not available // AnnounceTo(player, "_lives"); - player.armorvalue = player.armorvalue + cvar("g_minstagib_extralives"); + player.armorvalue = min(player.armorvalue + cvar("g_minstagib_extralives"), 999); sprint(player, "^3You picked up some extra lives\n"); } @@ -713,9 +713,6 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, return; } - itemid = self.items; - weaponid = self.weapons; - self.reset = Item_Reset; // it's a level item if(self.spawnflags & 1) @@ -798,8 +795,6 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, self.is_item = TRUE; } - weaponsInMap |= weaponid; - if(g_lms || g_ca) { startitem_failed = TRUE; @@ -829,17 +824,20 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, return; } + weaponsInMap |= weaponid; + precache_model (itemmodel); precache_sound (pickupsound); - precache_sound ("misc/itemrespawn.wav"); - precache_sound ("misc/itemrespawncountdown.wav"); - if(itemid == IT_STRENGTH) + precache_sound ("misc/itemrespawncountdown.wav"); + if(!g_minstagib && itemid == IT_STRENGTH) precache_sound ("misc/strength_respawn.wav"); - if(itemid == IT_INVINCIBLE) + else if(!g_minstagib && itemid == IT_INVINCIBLE) precache_sound ("misc/shield_respawn.wav"); + else + precache_sound ("misc/itemrespawn.wav"); - if((itemid & (IT_STRENGTH | IT_INVINCIBLE | IT_HEALTH | IT_ARMOR | IT_KEY1 | IT_KEY2)) || (weaponid & WEPBIT_ALL)) + if((itemflags & (FL_POWERUP | FL_WEAPON)) || (itemid & (IT_HEALTH | IT_ARMOR | IT_KEY1 | IT_KEY2))) self.target = "###item###"; // for finding the nearest item using find() } @@ -893,16 +891,6 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, */ void minstagib_items (float itemid) { - // we don't want to replace dropped weapons ;) - if (self.classname == "droppedweapon") - { - self.ammo_cells = 25; - StartItem ("models/weapons/g_nex.md3", - "weapons/weaponpickup.wav", 15, 0, - "MinstaNex", 0, WEPBIT_MINSTANEX, FL_WEAPON, generic_pickupevalfunc, 1000); - return; - } - local float rnd; self.classname = "minstagib"; @@ -912,7 +900,7 @@ void minstagib_items (float itemid) self.ammo_cells = 1; StartItem ("models/items/a_cells.md3", "misc/itempickup.wav", 45, 0, - "Nex Ammo", IT_CELLS, 0, 0, generic_pickupevalfunc, 100); + "MinstaNex Ammo", IT_CELLS, 0, 0, generic_pickupevalfunc, 100); return; } @@ -940,7 +928,6 @@ void minstagib_items (float itemid) StartItem ("models/items/g_h100.md3", "misc/megahealth.wav", g_pickup_respawntime_powerup, g_pickup_respawntimejitter_powerup, "Extralife", IT_NAILS, 0, FL_POWERUP, generic_pickupevalfunc, BOT_PICKUP_RATING_HIGH); - } // replace with speed if (itemid == IT_INVINCIBLE) @@ -950,7 +937,6 @@ void minstagib_items (float itemid) "misc/powerup_shield.wav", g_pickup_respawntime_powerup, g_pickup_respawntimejitter_powerup, "Speed", IT_INVINCIBLE, 0, FL_POWERUP, generic_pickupevalfunc, BOT_PICKUP_RATING_MID); } - } float minst_no_auto_cells; @@ -1138,7 +1124,7 @@ void spawnfunc_weapon_rocketlauncher (void) { if (g_minstagib) { - minstagib_items(IT_CELLS); + minstagib_items(IT_CELLS); // replace rocketlauncher with cells self.think = minst_remove_item; self.nextthink = time; return; @@ -1376,9 +1362,6 @@ void spawnfunc_target_items (void) if(!self.invincible_finished) self.invincible_finished = cvar("g_balance_powerup_invincible_time"); - precache_sound("misc/itempickup.wav"); - precache_sound("misc/itempickup.wav"); - precache_sound("misc/itempickup.wav"); precache_sound("misc/itempickup.wav"); precache_sound("misc/megahealth.wav"); precache_sound("misc/armor25.wav"); @@ -1774,6 +1757,12 @@ float GiveItems(entity e, float beginarg, float endarg) POSTGIVE_VALUE_ROT(e, armorvalue, 1, pauserotarmor_finished, cvar("g_balance_pause_armor_rot"), pauseregen_finished, cvar("g_balance_pause_health_regen"), "misc/armor25.wav", string_null); POSTGIVE_VALUE_ROT(e, health, 1, pauserothealth_finished, cvar("g_balance_pause_health_rot"), pauseregen_finished, cvar("g_balance_pause_health_regen"), "misc/megahealth.wav", string_null); + if (g_minstagib) + { + e.health = bound(0, e.health, 100); + e.armorvalue = bound(0, e.armorvalue, 999); + } + if(e.strength_finished <= 0) e.strength_finished = 0; else diff --git a/qcsrc/server/vote.qc b/qcsrc/server/vote.qc index 338d98476b..e67b537807 100644 --- a/qcsrc/server/vote.qc +++ b/qcsrc/server/vote.qc @@ -120,7 +120,7 @@ void VoteDialog_UpdateHighlight(float selected) { WriteByte(MSG_ONE, SVC_TEMPENTITY); WriteByte(MSG_ONE, TE_CSQC_VOTE); WriteByte(MSG_ONE, 1); - WriteShort(MSG_ONE, selected); + WriteByte(MSG_ONE, selected); } void VoteDialog_Reset() { @@ -545,9 +545,9 @@ void VoteDialog_Update(float msg, float vyes, float vno, float needed) { WriteByte(msg, SVC_TEMPENTITY); WriteByte(msg, TE_CSQC_VOTE); WriteByte(msg, 0); - WriteShort(msg, vyes); - WriteShort(msg, vno); - WriteShort(msg, needed); + WriteByte(msg, vyes); + WriteByte(msg, vno); + WriteByte(msg, needed); } void VoteCount() {