From: FruitieX Date: Wed, 17 Nov 2010 18:54:52 +0000 (+0200) Subject: Merge branch 'master' into fruitiex/gamemode_freezetag X-Git-Tag: xonotic-v0.1.0preview~86^2~2^2~21 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=21a6985a5568f9ade821c914c5d66595ddc4619d;hp=-c Merge branch 'master' into fruitiex/gamemode_freezetag --- 21a6985a5568f9ade821c914c5d66595ddc4619d diff --combined defaultXonotic.cfg index 61f88009db,6d8aca9fc7..21282a0bd1 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@@ -90,9 -90,7 +90,7 @@@ _cl_name Playe _cl_playermodel models/player/umbra.iqm _cl_playerskin 0 seta crosshair 3 - seta crosshair_color_red 0.6 - seta crosshair_color_green 0.8 - seta crosshair_color_blue 1 + seta crosshair_color "0.6 0.8 1" seta crosshair_alpha 1 seta crosshair_size 0.35 seta crosshair_dot 1 @@@ -102,121 -100,85 +100,86 @@@ seta crosshair_pickup 0.2 seta crosshair_pickup_speed 4 seta crosshair_per_weapon 0 "when 1, each gun will display a different crosshair" seta crosshair_color_override 0 "when 1, crosshair_color_* overrides the per-weapon color" + seta crosshair_color_per_weapon 1 "when 1, each gun will display a different colored crosshair" seta crosshair_effect_speed -1 "how fast (in seconds) some crosshair effects should take place, 0 = instant, -1 = 2x weapon switch time" seta crosshair_effect_scalefade 1 "use scaling and fading for crosshair effects" seta crosshair_hittest 1 "do a crosshair hit evaluation; also, the crosshair is scaled by the given number when aiming at an enemy, and blurred when aiming at a team mate" seta crosshair_hittest_blur 1 "blur the crosshair if the shot is obstructed" seta crosshair_hittest_showimpact 0 "move the crosshair to the actual impact location if obstructed" seta crosshair_laser "" "crosshair to display when wielding the laser" - seta crosshair_laser_color_red 1 "crosshair color red component to display when wielding the laser" - seta crosshair_laser_color_green 0.35 "crosshair color green component to display when wielding the laser" - seta crosshair_laser_color_blue 0.2 "crosshair color blue component to display when wielding the laser" + seta crosshair_laser_color "1 0.35 0.2" "crosshair color to display when wielding the laser" seta crosshair_laser_alpha 0.75 "crosshair alpha value to display when wielding the laser" seta crosshair_laser_size 0.4 "crosshair size when wielding the laser" seta crosshair_shotgun "" "crosshair to display when wielding the shotgun" - seta crosshair_shotgun_color_red 0.7 "crosshair color red component to display when wielding the shotgun" - seta crosshair_shotgun_color_green 0.7 "crosshair color green component to display when wielding the shotgun" - seta crosshair_shotgun_color_blue 0.7 "crosshair color blue component to display when wielding the shotgun" + seta crosshair_shotgun_color "0.7 0.7 0.7" "crosshair color to display when wielding the shotgun" seta crosshair_shotgun_alpha 1.1 "crosshair alpha value to display when wielding the shotgun" seta crosshair_shotgun_size 0.65 "crosshair size when wielding the shotgun" seta crosshair_uzi "" "crosshair to display when wielding the machinegun" - seta crosshair_uzi_color_red 0.4 "crosshair color red component to display when wielding the machinegun" - seta crosshair_uzi_color_green 0.9 "crosshair color green component to display when wielding the machinegun" - seta crosshair_uzi_color_blue 0.35 "crosshair color blue component to display when wielding the machinegun" + seta crosshair_uzi_color "0.4 0.9 0.35" "crosshair color to display when wielding the machinegun" seta crosshair_uzi_alpha 0.9 "crosshair alpha value to display when wielding the machinegun" seta crosshair_uzi_size 0.6 "crosshair size when wielding the machinegun" seta crosshair_grenadelauncher "" "crosshair to display when wielding the mortar" - seta crosshair_grenadelauncher_color_red 1 "crosshair color red component to display when wielding the mortar" - seta crosshair_grenadelauncher_color_green 0.15 "crosshair color green component to display when wielding the mortar" - seta crosshair_grenadelauncher_color_blue 0 "crosshair color blue component to display when wielding the mortar" + seta crosshair_grenadelauncher_color "1 0.15 0" "crosshair color to display when wielding the mortar" seta crosshair_grenadelauncher_alpha 1.15 "crosshair alpha value to display when wielding the mortar" seta crosshair_grenadelauncher_size 0.7 "crosshair size when wielding the mortar" seta crosshair_minelayer "" "crosshair to display when wielding the mortar" - seta crosshair_minelayer_color_red 0.75 "crosshair color red component to display when wielding the mortar" - seta crosshair_minelayer_color_green 0.75 "crosshair color green component to display when wielding the mortar" - seta crosshair_minelayer_color_blue 0 "crosshair color blue component to display when wielding the mortar" + seta crosshair_minelayer_color "0.75 0.75 0" "crosshair color to display when wielding the mortar" seta crosshair_minelayer_alpha 1.15 "crosshair alpha value to display when wielding the mortar" seta crosshair_minelayer_size 0.9 "crosshair size when wielding the mortar" seta crosshair_electro "" "crosshair to display when wielding the electro" - seta crosshair_electro_color_red 0.35 "crosshair color red component to display when wielding the electro" - seta crosshair_electro_color_green 0.5 "crosshair color green component to display when wielding the electro" - seta crosshair_electro_color_blue 1 "crosshair color blue component to display when wielding the electro" + seta crosshair_electro_color "0.35 0.5 1" "crosshair color to display when wielding the electro" seta crosshair_electro_alpha 1 "crosshair alpha value to display when wielding the electro" seta crosshair_electro_size 0.5 "crosshair size when wielding the electro" seta crosshair_crylink "" "crosshair to display when wielding the crylink" - seta crosshair_crylink_color_red 0.85 "crosshair color red component to display when wielding the crylink" - seta crosshair_crylink_color_green 0.25 "crosshair color green component to display when wielding the crylink" - seta crosshair_crylink_color_blue 1 "crosshair color blue component to display when wielding the crylink" + seta crosshair_crylink_color "0.85 0.25 1" "crosshair color to display when wielding the crylink" seta crosshair_crylink_alpha 0.85 "crosshair alpha value to display when wielding the crylink" seta crosshair_crylink_size 0.4 "crosshair size when wielding the crylink" seta crosshair_nex "" "crosshair to display when wielding the nex gun" - seta crosshair_nex_color_red 0 "crosshair color red component to display when wielding the nex gun" - seta crosshair_nex_color_green 0.9 "crosshair color green component to display when wielding the nex gun" - seta crosshair_nex_color_blue 1 "crosshair color blue component to display when wielding the nex gun" + seta crosshair_nex_color "0 0.9 1" "crosshair color to display when wielding the nex gun" seta crosshair_nex_alpha 0.85 "crosshair alpha value to display when wielding the nex gun" seta crosshair_nex_size 0.65 "crosshair size when wielding the nex gun" seta crosshair_hagar "" "crosshair to display when wielding the hagar" - seta crosshair_hagar_color_red 0.85 "crosshair color red component to display when wielding the hagar" - seta crosshair_hagar_color_green 0.5 "crosshair color green component to display when wielding the hagar" - seta crosshair_hagar_color_blue 0.35 "crosshair color blue component to display when wielding the hagar" + seta crosshair_hagar_color "0.85 0.5 0.35" "crosshair color to display when wielding the hagar" seta crosshair_hagar_alpha 1 "crosshair alpha value to display when wielding the hagar" seta crosshair_hagar_size 0.8 "crosshair size when wielding the hagar" seta crosshair_rocketlauncher "" "crosshair to display when wielding the rocketlauncher" - seta crosshair_rocketlauncher_color_red 1 "crosshair color red component to display when wielding the rocketlauncher" - seta crosshair_rocketlauncher_color_green 0.75 "crosshair color green component to display when wielding the rocketlauncher" - seta crosshair_rocketlauncher_color_blue 0.2 "crosshair color blue component to display when wielding the rocketlauncher" + seta crosshair_rocketlauncher_color "1 0.75 0.2" "crosshair color to display when wielding the rocketlauncher" seta crosshair_rocketlauncher_alpha 1 "crosshair alpha value to display when wielding the rocketlauncher" seta crosshair_rocketlauncher_size 0.5875 "crosshair size when wielding the rocketlauncher" seta crosshair_porto "" "crosshair to display when wielding the porto" - seta crosshair_porto_color_red 0.5 "crosshair color red component to display when wielding the porto" - seta crosshair_porto_color_green 1 "crosshair color green component to display when wielding the porto" - seta crosshair_porto_color_blue 0.5 "crosshair color blue component to display when wielding the porto" + seta crosshair_porto_color "0.5 1 0.5" "crosshair color to display when wielding the porto" seta crosshair_porto_alpha 0.85 "crosshair alpha value to display when wielding the porto" seta crosshair_porto_size 0.6 "crosshair size when wielding the porto" seta crosshair_minstanex "" "crosshair to display when wielding the minstanex gun" - seta crosshair_minstanex_color_red 0.65 "crosshair color red component to display when wielding the minstanex gun" - seta crosshair_minstanex_color_green 0.65 "crosshair color green component to display when wielding the minstanex gun" - seta crosshair_minstanex_color_blue 1 "crosshair color blue component to display when wielding the minstanex gun" + seta crosshair_minstanex_color "0.65 0.65 1" "crosshair color to display when wielding the minstanex gun" seta crosshair_minstanex_alpha 1 "crosshair alpha value to display when wielding the minstanex gun" seta crosshair_minstanex_size 0.4 "crosshair size when wielding the minstanex gun" seta crosshair_hook "" "crosshair to display when wielding the hook" - seta crosshair_hook_color_red 0.65 "crosshair color red component to display when wielding the hook" - seta crosshair_hook_color_green 1 "crosshair color green component to display when wielding the hook" - seta crosshair_hook_color_blue 0.85 "crosshair color blue component to display when wielding the hook" + seta crosshair_hook_color "0.65 1 0.85" "crosshair color to display when wielding the hook" seta crosshair_hook_alpha 0.85 "crosshair alpha value to display when wielding the hook" seta crosshair_hook_size 0.5 "crosshair size when wielding the hook" seta crosshair_hlac "" "crosshair to display when wielding the H.L.A.C" - seta crosshair_hlac_color_red 1 "crosshair color red component to display when wielding the H.L.A.C." - seta crosshair_hlac_color_green 0.65 "crosshair color green component to display when wielding the H.L.A.C." - seta crosshair_hlac_color_blue 0.2 "crosshair color blue component to display when wielding the H.L.A.C." + seta crosshair_hlac_color "1 0.65 0.2" "crosshair color to display when wielding the H.L.A.C." seta crosshair_hlac_alpha 1 "crosshair alpha value to display when wielding the H.L.A.C." seta crosshair_hlac_size 0.6 "crosshair size when wielding the H.L.A.C." seta crosshair_seeker "" "crosshair to display when wielding the TAG Seeker" - seta crosshair_seeker_color_red 1 "crosshair color red component to display when wielding the TAG seeker" - seta crosshair_seeker_color_green 0.35 "crosshair color green component to display when wielding the TAG seeker" - seta crosshair_seeker_color_blue 0.35 "crosshair color blue component to display when wielding the TAG seeker" + seta crosshair_seeker_color "1 0.35 0.35" "crosshair color to display when wielding the TAG seeker" seta crosshair_seeker_alpha 0.9 "crosshair alpha value to display when wielding the TAG seeker" seta crosshair_seeker_size 0.8 "crosshair size when wielding the TAG seeker" seta crosshair_campingrifle "" "crosshair to display when wielding the campingrifle" - seta crosshair_campingrifle_color_red 0.85 "crosshair color red component to display when wielding the campingrifle" - seta crosshair_campingrifle_color_green 0.5 "crosshair color green component to display when wielding the campingrifle" - seta crosshair_campingrifle_color_blue 0.25 "crosshair color blue component to display when wielding the campingrifle" + seta crosshair_campingrifle_color "0.85 0.5 0.25" "crosshair color to display when wielding the campingrifle" seta crosshair_campingrifle_alpha 1 "crosshair alpha value to display when wielding the campingrifle" seta crosshair_campingrifle_size 0.65 "crosshair size when wielding the campingrifle" seta crosshair_tuba "" "crosshair to display when wielding the tuba" - seta crosshair_tuba_color_red 0.85 "crosshair color red component to display when wielding the tuba" - seta crosshair_tuba_color_green 0.5 "crosshair color green component to display when wielding the tuba" - seta crosshair_tuba_color_blue 0.25 "crosshair color blue component to display when wielding the tuba" + seta crosshair_tuba_color "0.85 0.5 0.25" "crosshair color to display when wielding the tuba" seta crosshair_tuba_alpha 1 "crosshair alpha value to display when wielding the tuba" seta crosshair_tuba_size 1 "crosshair size when wielding the tuba" seta crosshair_fireball "" "crosshair to display when wielding the fireball" - seta crosshair_fireball_color_red 0.2 "crosshair color red component to display when wielding the fireball" - seta crosshair_fireball_color_green 1.0 "crosshair color green component to display when wielding the fireball" - seta crosshair_fireball_color_blue 0.2 "crosshair color blue component to display when wielding the fireball" + seta crosshair_fireball_color "0.2 1.0 0.2" "crosshair color to display when wielding the fireball" seta crosshair_fireball_alpha 1 "crosshair alpha value to display when wielding the fireball" seta crosshair_fireball_size 1 "crosshair size when wielding the fireball" seta crosshair_ring_size 2 "bullet counter ring size for Rifle, velocity ring for Nex" +seta crosshair_ring_alpha 0.2 "ring alpha" seta crosshair_campingrifle_bulletcounter_alpha 0.15 seta crosshair_nexvelocity_alpha 0.15 @@@ -603,14 -565,6 +566,14 @@@ seta g_nexball_goalleadlimit -1 "Nexbal seta g_ctf_win_mode 0 "0: captures only, 1: captures, then points, 2: points only" seta g_ctf_ignore_frags 0 "1: regular frags give no points" +set g_freezetag 0 "Freeze Tag: Freeze the opposing team(s) to win, unfreeze teammates by standing next to them" +seta g_freezetag_warmup 5 "Time players get to run around before the round starts" +seta g_freezetag_point_limit -1 "Freeze Tag point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" +seta g_freezetag_point_leadlimit -1 "Freeze Tag point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" +seta g_freezetag_revive_time 3 "Time it takes to revive a frozen teammate" +seta g_freezetag_revive_extra_size 100 "Distance in qu that you can stand from a frozen teammate to keep reviving him" +seta g_freezetag_frozen_force 0.6 "How much to multiply the force on a frozen player with" + // 50% of the spawns shall be far away from any players set g_spawn_furthest 0.5 // respawn delay @@@ -650,8 -604,6 +613,8 @@@ set g_cts_respawn_waves set g_cts_respawn_delay 0.25 set g_cts_selfdamage 1 "0 = disable all selfdamage and falldamage in cts" set g_cts_finish_kill_delay 10 "prevent cheating by running back to the start line, and starting out with more speed than otherwise possible" +set g_freezetag_respawn_waves 0 +set g_freezetag_respawn_delay 0.25 // overtime seta timelimit_overtime 2 "duration in minutes of one added overtime, added to the timelimit" @@@ -804,10 -756,10 +767,10 @@@ set g_ca_warmup 10 "how long the player // onslaught set g_onslaught 0 "Onslaught: take control points towards the enemy generator and then destroy it" - set g_onslaught_gen_health 5000 + set g_onslaught_gen_health 2500 set g_onslaught_cp_health 1000 set g_onslaught_cp_buildhealth 100 - set g_onslaught_cp_buildtime 10 + set g_onslaught_cp_buildtime 5 set g_onslaught_cp_regen 20 // assault @@@ -1387,11 -1339,7 +1350,7 @@@ seta sbar_info_pos 0 "Y-axis distance f 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_accuracy 1 "show accuracy color as the weapon icon background; colors can be configured with accuracy_color* cvars" seta hud_panel_weapons_ammo 1 "show ammo as a status bar" seta hud_panel_weapons_ammo_full_shells 50 "show 100% of the status bar at this ammo count" seta hud_panel_weapons_ammo_full_nails 200 "show 100% of the status bar at this ammo count" @@@ -1420,14 -1368,12 +1379,14 @@@ seta hud_panel_engineinfo_framecounter_ seta hud_showbinds 1 "the way to show the keys to press in HUD messages: 0 displays commands, 1 bound keys, 2 both" seta hud_showbinds_limit 2 "maximum number of bound keys to show for a command. 0 for unlimited" +seta hud_colorflash_alpha 0.5 "starting alpha of the color flash" + // scoreboard seta scoreboard_columns default seta scoreboard_border_thickness 1 "scoreboard border thickness" seta scoreboard_accuracy_border_thickness 1 "accuracy stats border thickness" seta scoreboard_accuracy_doublerows 0 "use two rows instead of one" - seta scoreboard_accuracy 1 "show weapon accuracy stats panel on scoreboard" + seta scoreboard_accuracy 1 "show weapon accuracy stats panel on scoreboard; colors can be configured with accuracy_color* cvars" seta scoreboard_color_bg_r 0 "red color component of the scoreboard background" seta scoreboard_color_bg_g 0.4 "green color component of the scoreboard background" seta scoreboard_color_bg_b 0.6 "blue color component of the scoreboard background" @@@ -1445,6 -1391,11 +1404,11 @@@ seta scoreboard_offset_left 0.04 "how m seta scoreboard_offset_right 0.148 "how many pixels the scoreboard is offset from the right screen edge" seta scoreboard_bg_scale 0.25 "scale for the tiled scoreboard background" + seta accuracy_color_levels "0 20 100" "accuracy values at which a specified color (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 accuracy_color0 "1 0 0" + seta accuracy_color1 "1 1 0" + seta accuracy_color2 "0 1 0" + // for menu server list (eventually make them have engine support?) seta menu_slist_showfull 1 "show servers even if they are full and have no slots to join" seta menu_slist_showempty 1 "show servers even if they are no empty and have no opponents to play against" diff --combined qcsrc/client/View.qc index 09061eb9c6,119941ad2c..12ed7222b5 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@@ -695,17 -695,6 +695,17 @@@ void CSQC_UpdateView(float w, float h CSQC_RAPTOR_HUD(); else { + if(gametype == GAME_FREEZETAG) + { + if(getstati(STAT_FROZEN)) + drawfill('0 0 0', eX * vid_conwidth + eY * vid_conheight, '0.25 0.90 1', cvar_or("hud_colorflash_alpha", 0.5), DRAWFLAG_ADDITIVE); + if(getstatf(STAT_REVIVE_PROGRESS)) + { + DrawCircleClippedPic(eX * 0.5 * vid_conwidth + eY * 0.6 * vid_conheight, 0.1 * vid_conheight, "gfx/crosshair_ring.tga", getstatf(STAT_REVIVE_PROGRESS), '0.25 0.90 1', cvar("hud_colorflash_alpha"), DRAWFLAG_ADDITIVE); + drawstring_aspect(eY * 0.64 * vid_conheight, "Revival progress", eX * vid_conwidth + eY * 0.025 * vid_conheight, '1 1 1', 1, DRAWFLAG_NORMAL); + } + } + if(cvar("r_letterbox") == 0) if(cvar("viewsize") < 120) CSQC_common_hud(); @@@ -753,33 -742,30 +753,30 @@@ string wcross_wep, wcross_name; float wcross_scale, wcross_blur; - wcross_color_x = cvar("crosshair_color_red"); - wcross_color_y = cvar("crosshair_color_green"); - wcross_color_z = cvar("crosshair_color_blue"); - if (cvar("crosshair_per_weapon")) { + if (cvar("crosshair_per_weapon") || cvar("crosshair_color_per_weapon")) { e = get_weaponinfo(activeweapon); if (e && e.netname != "") { wcross_wep = e.netname; - wcross_resolution *= cvar(strcat("crosshair_", wcross_wep, "_size")); - if (wcross_resolution == 0) - return; - wcross_alpha *= cvar(strcat("crosshair_", wcross_wep, "_alpha")); - if (wcross_alpha == 0) - return; - - wcross_style = cvar_string(strcat("crosshair_", wcross_wep)); - if(wcross_style == "") - wcross_style = e.netname; - - if(!cvar("crosshair_color_override")) + if(cvar("crosshair_per_weapon")) { - wcross_color_x = cvar(strcat("crosshair_", wcross_wep, "_color_red")); - wcross_color_y = cvar(strcat("crosshair_", wcross_wep, "_color_green")); - wcross_color_z = cvar(strcat("crosshair_", wcross_wep, "_color_blue")); + wcross_resolution *= cvar(strcat("crosshair_", wcross_wep, "_size")); + if (wcross_resolution == 0) + return; + wcross_alpha *= cvar(strcat("crosshair_", wcross_wep, "_alpha")); + if (wcross_alpha == 0) + return; + + wcross_style = cvar_string(strcat("crosshair_", wcross_wep)); + if(wcross_style == "" || wcross_style == "0") + wcross_style = wcross_wep; } } } + if(wcross_wep != "" && cvar("crosshair_color_per_weapon")) + wcross_color = stov(cvar_string(strcat("crosshair_", wcross_wep, "_color"))); + else + wcross_color = stov(cvar_string("crosshair_color")); wcross_name = strcat("gfx/crosshair", wcross_style); @@@ -1307,18 -1293,22 +1304,22 @@@ void CSQC_common_hud(void case HUD_NORMAL: // do some accuracy var caching float i; - if(cvar_string("hud_panel_weapons_accuracy_color_levels") != acc_color_levels) if(!(gametype == GAME_RACE || gametype == GAME_CTS)) { - if(acc_color_levels) - strunzone(acc_color_levels); - acc_color_levels = strzone(cvar_string("hud_panel_weapons_accuracy_color_levels")); - acc_levels = tokenize(acc_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)); + if(cvar_string("accuracy_color_levels") != acc_color_levels) + { + if(acc_color_levels) + strunzone(acc_color_levels); + acc_color_levels = strzone(cvar_string("accuracy_color_levels")); + acc_levels = tokenize(acc_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)); + } + // let know that acc_col[] needs to be loaded + acc_col_x[0] = -1; } HUD_Main(); // always run these functions for alpha checks diff --combined qcsrc/client/hud.qc index 855cec4de6,f77f1c1c1a..93d4359244 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@@ -412,48 -412,55 +412,55 @@@ HUD panel ================== */ + #define HUD_Write(s) fputs(fh, s) + // q: quoted, n: not quoted + #define HUD_Write_Cvar_n(cvar) HUD_Write(strcat("seta ", cvar, " ", cvar_string(cvar), "\n")) + #define HUD_Write_Cvar_q(cvar) HUD_Write(strcat("seta ", cvar, " \"", cvar_string(cvar), "\"\n")) + #define HUD_Write_PanelCvar_n(cvar_suf) HUD_Write_Cvar_n(strcat("hud_panel_", panel_name, cvar_suf)) + #define HUD_Write_PanelCvar_q(cvar_suf) HUD_Write_Cvar_q(strcat("hud_panel_", panel_name, cvar_suf)) // Save the config void HUD_Panel_ExportCfg(string cfgname) { float fh; - fh = fopen(strcat("hud_", autocvar_hud_skin, "_", cfgname, ".cfg"), FILE_WRITE); + string filename = strcat("hud_", cvar_string("hud_skin"), "_", cfgname, ".cfg"); + fh = fopen(filename, FILE_WRITE); if(fh >= 0) { - fputs(fh, strcat("seta hud_skin \"", cvar_string("hud_skin"), "\"", "\n")); - fputs(fh, strcat("seta hud_panel_bg \"", cvar_string("hud_panel_bg"), "\"", "\n")); - fputs(fh, strcat("seta hud_panel_bg_color \"", cvar_string("hud_panel_bg_color"), "\"", "\n")); - fputs(fh, strcat("seta hud_panel_bg_color_team \"", cvar_string("hud_panel_bg_color_team"), "\"", "\n")); - fputs(fh, strcat("seta hud_panel_bg_alpha \"", cvar_string("hud_panel_bg_alpha"), "\"", "\n")); - fputs(fh, strcat("seta hud_panel_bg_border \"", cvar_string("hud_panel_bg_border"), "\"", "\n")); - fputs(fh, strcat("seta hud_panel_bg_padding \"", cvar_string("hud_panel_bg_padding"), "\"", "\n")); - fputs(fh, strcat("seta hud_panel_fg_alpha \"", cvar_string("hud_panel_fg_alpha"), "\"", "\n")); - fputs(fh, "\n"); - - 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 \"", cvar_string("hud_dock_alpha"), "\"", "\n")); - fputs(fh, "\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")); - fputs(fh, strcat("seta hud_progressbar_armor_color \"", cvar_string("hud_progressbar_armor_color"), "\"", "\n")); - fputs(fh, strcat("seta hud_progressbar_fuel_color \"", cvar_string("hud_progressbar_fuel_color"), "\"", "\n")); - 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"); - - fputs(fh, strcat("seta scr_centerpos \"", cvar_string("scr_centerpos"), "\"", "\n")); - fputs(fh, "\n"); + HUD_Write_Cvar_q("hud_skin"); + HUD_Write_Cvar_q("hud_panel_bg"); + HUD_Write_Cvar_q("hud_panel_bg_color"); + HUD_Write_Cvar_q("hud_panel_bg_color_team"); + HUD_Write_Cvar_q("hud_panel_bg_alpha"); + HUD_Write_Cvar_q("hud_panel_bg_border"); + HUD_Write_Cvar_q("hud_panel_bg_padding"); + HUD_Write_Cvar_q("hud_panel_fg_alpha"); + HUD_Write("\n"); + + HUD_Write_Cvar_q("hud_dock"); + HUD_Write_Cvar_q("hud_dock_color"); + HUD_Write_Cvar_q("hud_dock_color_team"); + HUD_Write_Cvar_q("hud_dock_alpha"); + HUD_Write("\n"); + + HUD_Write_Cvar_q("hud_progressbar_alpha"); + HUD_Write_Cvar_q("hud_progressbar_strength_color"); + HUD_Write_Cvar_q("hud_progressbar_shield_color"); + HUD_Write_Cvar_q("hud_progressbar_health_color"); + HUD_Write_Cvar_q("hud_progressbar_armor_color"); + HUD_Write_Cvar_q("hud_progressbar_fuel_color"); + HUD_Write_Cvar_q("hud_progressbar_nexball_color"); + HUD_Write("\n"); + + HUD_Write_Cvar_q("_hud_panelorder"); + HUD_Write("\n"); + + HUD_Write_Cvar_q("hud_configure_grid"); + HUD_Write_Cvar_q("hud_configure_grid_xsize"); + HUD_Write_Cvar_q("hud_configure_grid_ysize"); + HUD_Write("\n"); + + HUD_Write_Cvar_q("scr_centerpos"); + HUD_Write("\n"); // common cvars for all panels float i; @@@ -461,66 -468,68 +468,68 @@@ { 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")); + HUD_Write_PanelCvar_n(""); + HUD_Write_PanelCvar_q("_pos"); + HUD_Write_PanelCvar_q("_size"); + HUD_Write_PanelCvar_q("_bg"); + HUD_Write_PanelCvar_q("_bg_color"); + HUD_Write_PanelCvar_q("_bg_color_team"); + HUD_Write_PanelCvar_q("_bg_alpha"); + HUD_Write_PanelCvar_q("_bg_border"); + HUD_Write_PanelCvar_q("_bg_padding"); switch(i) { 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, "_aspect")), "\"", "\n")); + HUD_Write_PanelCvar_q("_complainbubble"); + HUD_Write_PanelCvar_q("_complainbubble_padding"); + HUD_Write_PanelCvar_q("_complainbubble_color_outofammo"); + HUD_Write_PanelCvar_q("_complainbubble_color_donthave"); + HUD_Write_PanelCvar_q("_complainbubble_color_unavailable"); + HUD_Write_PanelCvar_q("_ammo_color"); + HUD_Write_PanelCvar_q("_ammo_alpha"); + HUD_Write_PanelCvar_q("_aspect"); break; 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")); + HUD_Write_PanelCvar_q("_onlycurrent"); + HUD_Write_PanelCvar_q("_iconalign"); break; 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")); + HUD_Write_PanelCvar_q("_flip"); + HUD_Write_PanelCvar_q("_iconalign"); + HUD_Write_PanelCvar_q("_baralign"); + HUD_Write_PanelCvar_q("_progressbar"); break; 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")); + HUD_Write_PanelCvar_q("_flip"); + HUD_Write_PanelCvar_q("_iconalign"); + HUD_Write_PanelCvar_q("_baralign"); + HUD_Write_PanelCvar_q("_progressbar"); break; 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")); + HUD_Write_PanelCvar_q("_flip"); + HUD_Write_PanelCvar_q("_print"); break; case HUD_PANEL_RADAR: - fputs(fh, strcat("seta hud_panel_", panel_name, "_foreground_alpha \"", cvar_string(strcat("hud_panel_", panel_name, "_foreground_alpha")), "\"", "\n")); + HUD_Write_PanelCvar_q("_foreground_alpha"); 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")); + HUD_Write_PanelCvar_q("_alreadyvoted_alpha"); break; case HUD_PANEL_PRESSEDKEYS: - fputs(fh, strcat("seta hud_panel_", panel_name, "_aspect \"", cvar_string(strcat("hud_panel_", panel_name, "_aspect")), "\"", "\n")); + HUD_Write_PanelCvar_q("_aspect"); break; case HUD_PANEL_INFOMESSAGES: - fputs(fh, strcat("seta hud_panel_", panel_name, "_flip \"", cvar_string(strcat("hud_panel_", panel_name, "_flip")), "\"", "\n")); + HUD_Write_PanelCvar_q("_flip"); break; } - fputs(fh, "\n"); + HUD_Write("\n"); } - fputs(fh, strcat("menu_sync", "\n")); // force the menu to reread the cvars, so that the dialogs are updated + HUD_Write("menu_sync\n"); // force the menu to reread the cvars, so that the dialogs are updated - print("^2Successfully exported to hud_", autocvar_hud_skin, "_", cfgname, ".cfg! (Note: It's saved in data/data/)\n"); + print("^2Successfully exported to ", filename, "! (Note: It's saved in data/data/)\n"); + fclose(fh); } - fclose(fh); + else + print("^1Couldn't write to ", filename, "\n"); } const float hlBorderSize = 4; @@@ -656,8 -665,8 +665,8 @@@ vector HUD_Panel_CheckMove(vector myPos else // push it downwards 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); + //if(cvar("hud_configure_checkcollisions_debug")) + //drawfill(panel_pos, panel_size, '1 1 0', .3, DRAWFLAG_NORMAL); } return myTarget; @@@ -669,8 -678,8 +678,8 @@@ void HUD_Panel_SetPos(vector pos vector mySize; mySize = panel_size; - if(cvar("hud_configure_checkcollisions_debug")) - drawfill(pos, mySize, '1 1 1', .2, DRAWFLAG_NORMAL); + //if(cvar("hud_configure_checkcollisions_debug")) + //drawfill(pos, mySize, '1 1 1', .2, DRAWFLAG_NORMAL); if(autocvar_hud_configure_grid) { @@@ -795,8 -804,8 +804,8 @@@ vector HUD_Panel_CheckResize(vector myS else mySize_y = min(mySize_y, dist_y); } - if(cvar("hud_configure_checkcollisions_debug")) - drawfill(panel_pos, panel_size, '1 1 0', .3, DRAWFLAG_NORMAL); + //if(cvar("hud_configure_checkcollisions_debug")) + //drawfill(panel_pos, panel_size, '1 1 0', .3, DRAWFLAG_NORMAL); } return mySize; @@@ -849,8 -858,8 +858,8 @@@ void HUD_Panel_SetPosSize(vector mySize if(myPos_y + mySize_y > vid_conheight) mySize_y = vid_conheight - myPos_y; - if(cvar("hud_configure_checkcollisions_debug")) - drawfill(myPos, mySize, '1 1 1', .2, DRAWFLAG_NORMAL); + //if(cvar("hud_configure_checkcollisions_debug")) + //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(autocvar_hud_configure_grid) @@@ -881,8 -890,8 +890,8 @@@ myPos_y = resizeorigin_y; } - if(cvar("hud_configure_checkcollisions_debug")) - drawfill(myPos, mySize, '0 1 0', .3, DRAWFLAG_NORMAL); + //if(cvar("hud_configure_checkcollisions_debug")) + //drawfill(myPos, mySize, '0 1 0', .3, DRAWFLAG_NORMAL); HUD_Panel_GetName(highlightedPanel); string s; @@@ -1356,7 -1365,7 +1365,7 @@@ void HUD_Panel_Mouse( if (prev_pos != panel_pos || prev_size != panel_size) { - hud_configure_checkcollisions = (!(hudShiftState & S_CTRL) && autocvar_hud_configure_checkcollisions); + hud_configure_checkcollisions = (!(hudShiftState & S_CTRL) && cvar("hud_configure_checkcollisions")); // backup! panel_pos_backup = prev_pos; panel_size_backup = prev_size; @@@ -1580,7 -1589,7 +1589,7 @@@ void HUD_Weapons(void } } - float i, weapid, fade, weapon_stats, weapon_number, weapon_cnt; + float i, weapid, wpnalpha, weapon_cnt; weapon_cnt = 0; for(i = WEP_FIRST; i <= WEP_LAST; ++i) { @@@ -1623,57 -1632,96 +1632,96 @@@ panel_size -= '2 2 0' * panel_bg_padding; } - // hits - weapon_stats = getstati(STAT_DAMAGE_HITS); - weapon_number = weapon_stats & 63; - weapon_hits[weapon_number-WEP_FIRST] = floor(weapon_stats / 64); - // fired - weapon_stats = getstati(STAT_DAMAGE_FIRED); - weapon_number = weapon_stats & 63; - weapon_fired[weapon_number-WEP_FIRST] = floor(weapon_stats / 64); - if(cvar_or("hud_panel_weapons_fade", 1)) { - fade = 3.2 - 2 * (time - weapontime); - fade = bound(0.7, fade, 1); + wpnalpha = 3.2 - 2 * (time - weapontime); + wpnalpha = bound(0.7, wpnalpha, 1) * panel_fg_alpha; } else - fade = 1; + wpnalpha = panel_fg_alpha; HUD_Weapons_Clear(); float rows, columns; + float aspect = cvar("hud_panel_weapons_aspect"); rows = panel_size_y/panel_size_x; - rows = bound(1, floor((sqrt(4 * autocvar_hud_panel_weapons_aspect * rows * WEP_COUNT + rows * rows) + rows + 0.5) / 2), WEP_COUNT); + rows = bound(1, floor((sqrt(4 * 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; + when = cvar("hud_panel_weapons_complainbubble_time"); float fadetime; - fadetime = autocvar_hud_panel_weapons_complainbubble_fadetime; + fadetime = cvar("hud_panel_weapons_complainbubble_fadetime"); vector color; vector wpnpos; vector wpnsize; + + float fullammo_shells, fullammo_nails, fullammo_rockets, fullammo_cells, fullammo_fuel; + vector ammo_color; + float ammo_alpha; + wpnsize = eX * panel_size_x*(1/columns) + eY * panel_size_y*(1/rows); + float barsize_x, barsize_y, baroffset_x, baroffset_y; + float show_ammo = cvar("hud_panel_weapons_ammo"); + if (show_ammo) + { + fullammo_shells = cvar("hud_panel_weapons_ammo_full_shells"); + fullammo_nails = cvar("hud_panel_weapons_ammo_full_nails"); + fullammo_rockets = cvar("hud_panel_weapons_ammo_full_rockets"); + fullammo_cells = cvar("hud_panel_weapons_ammo_full_cells"); + fullammo_fuel = cvar("hud_panel_weapons_ammo_full_fuel"); + ammo_color = stov(cvar_string("hud_panel_weapons_ammo_color")); + ammo_alpha = panel_fg_alpha * cvar("hud_panel_weapons_ammo_alpha"); + + + if(wpnsize_x/wpnsize_y > aspect) + { + barsize_x = aspect * wpnsize_y; + barsize_y = wpnsize_y; + baroffset_x = (wpnsize_x - barsize_x) / 2; + } + else + { + barsize_y = 1/aspect * wpnsize_x; + barsize_x = wpnsize_x; + baroffset_y = (wpnsize_y - barsize_y) / 2; + } + } float show_accuracy; - if(autocvar_hud_panel_weapons_accuracy && acc_levels) + float weapon_stats, weapon_number; + if(cvar("hud_panel_weapons_accuracy") && acc_levels) + { show_accuracy = true; + // hits + weapon_stats = getstati(STAT_DAMAGE_HITS); + weapon_number = weapon_stats & 63; + weapon_hits[weapon_number-WEP_FIRST] = floor(weapon_stats / 64); + // fired + weapon_stats = getstati(STAT_DAMAGE_FIRED); + weapon_number = weapon_stats & 63; + weapon_fired[weapon_number-WEP_FIRST] = floor(weapon_stats / 64); + if (acc_col_x[0] == -1) + for (i = 0; i < acc_levels; ++i) + acc_col[i] = stov(cvar_string(strcat("accuracy_color", ftos(i)))); + } + + float weapons_st = getstati(STAT_WEAPONS); + float label = cvar("hud_panel_weapons_label"); for(i = 0; i < weapon_cnt; ++i) { - wpnpos = panel_pos + eX * column * panel_size_x*(1/columns) + eY * row * panel_size_y*(1/rows); - wpnsize = eX * panel_size_x*(1/columns) + eY * panel_size_y*(1/rows); + wpnpos = panel_pos + eX * column * wpnsize_x + eY * row * wpnsize_y; self = weaponorder[i]; weapid = self.impulse; // draw background behind currently selected weapon if(self.weapon == activeweapon) - drawpic_aspect_skin(wpnpos, "weapon_current_bg", wpnsize, '1 1 1', fade * panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(wpnpos, "weapon_current_bg", wpnsize, '1 1 1', wpnalpha, DRAWFLAG_NORMAL); // draw the weapon accuracy if(show_accuracy) @@@ -1684,36 -1732,35 +1732,35 @@@ { 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; + // 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); + // 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_col[j]; + color = color + factor * (acc_col[j+1] - color); - if(weapon_damage) drawpic_aspect_skin(wpnpos, "weapon_accuracy", wpnsize, color, panel_fg_alpha, DRAWFLAG_NORMAL); + } } // draw the weapon icon - if((self.impulse >= 0) && (getstati(STAT_WEAPONS) & self.weapons)) + if((weapid >= 0) && (weapons_st & self.weapons)) { - drawpic_aspect_skin(wpnpos, strcat("weapon", self.netname), wpnsize, '1 1 1', fade * panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(wpnpos, strcat("weapon", self.netname), wpnsize, '1 1 1', wpnalpha, DRAWFLAG_NORMAL); - if(autocvar_hud_panel_weapons_label == 1) // weapon number - drawstring(wpnpos, ftos(weapid), '1 1 0' * 0.5 * panel_size_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 * panel_size_y*(1/rows), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + if(label == 1) // weapon number + drawstring(wpnpos, ftos(weapid), '1 1 0' * 0.5 * wpnsize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + else if(label == 2) // bind + drawstring(wpnpos, getcommandkey(ftos(weapid), strcat("impulse ", ftos(weapid))), '1 1 0' * 0.5 * wpnsize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); // draw ammo status bar - if(autocvar_hud_panel_weapons_ammo && weapid != WEP_TUBA && weapid != WEP_LASER && weapid != WEP_PORTO) + if(show_ammo && weapid != WEP_TUBA && weapid != WEP_LASER && weapid != WEP_PORTO) { a = 0; type = GetAmmoTypeForWep(weapid); @@@ -1723,38 -1770,20 +1770,20 @@@ 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; + case 0: fullammo = fullammo_shells; break; + case 1: fullammo = fullammo_nails; break; + case 2: fullammo = fullammo_rockets; break; + case 3: fullammo = fullammo_cells; break; + case 4: fullammo = fullammo_fuel; break; default: fullammo = 60; } - float barsize_x, barsize_y, barpos_x, barpos_y; - 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, + wpnpos_x + baroffset_x, + wpnpos_y + baroffset_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); + drawpic_aspect_skin(wpnpos, "weapon_ammo", wpnsize, ammo_color, ammo_alpha, DRAWFLAG_NORMAL); drawresetcliparea(); } } @@@ -1767,7 -1796,7 +1796,7 @@@ } // draw the complain message - if(time - complain_weapon_time < when + fadetime && self.weapon == complain_weapon && autocvar_hud_panel_weapons_complainbubble) + if(time - complain_weapon_time < when + fadetime && self.weapon == complain_weapon && cvar("hud_panel_weapons_complainbubble")) { if(fadetime) { @@@ -1787,18 -1816,19 +1816,19 @@@ string s; if(complain_weapon_type == 0) { s = "Out of ammo"; - color = autocvar_hud_panel_weapons_complainbubble_color_outofammo; + color = stov(cvar_string("hud_panel_weapons_complainbubble_color_outofammo")); } else if(complain_weapon_type == 1) { s = "Don't have"; - color = autocvar_hud_panel_weapons_complainbubble_color_donthave; + color = stov(cvar_string("hud_panel_weapons_complainbubble_color_donthave")); } else { s = "Unavailable"; - color = autocvar_hud_panel_weapons_complainbubble_color_unavailable; + color = stov(cvar_string("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); + float padding = cvar("hud_panel_weapons_complainbubble_padding"); + drawpic_aspect_skin(wpnpos + '1 1 0' * padding, "weapon_complainbubble", wpnsize - '2 2 0' * padding, color, a * panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(wpnpos + '1 1 0' * padding, s, wpnsize - '2 2 0' * padding, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); } ++row; @@@ -1843,9 -1873,13 +1873,13 @@@ string GetAmmoPicture(float i void DrawAmmoItem(vector myPos, vector mySize, float itemcode, float currently_selected) { float a; - a = getstati(GetAmmoStat(itemcode)); // how much ammo do we have of type itemcode? if(autocvar__hud_configure) + { + currently_selected = (itemcode == 2); //rockets always selected a = 100; + } + else + a = getstati(GetAmmoStat(itemcode)); // how much ammo do we have of type itemcode? vector color; if(a < 10) @@@ -1859,49 -1893,29 +1893,29 @@@ 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; + numpos = myPos; + picpos = myPos + eX * 2 * mySize_y; } else { - numpos = newPos + eX * newSize_y; - picpos = newPos; + numpos = myPos + eX * mySize_y; + picpos = myPos; } if (currently_selected) - drawpic_aspect_skin(newPos, "ammo_current_bg", newSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(myPos, "ammo_current_bg", mySize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawfont = hud_bigfont; if(a > 0) - drawstring_aspect(numpos, ftos(a), eX * (2/3) * newSize_x + eY * newSize_y, color, panel_fg_alpha * alpha, DRAWFLAG_NORMAL); + drawstring_aspect(numpos, ftos(a), eX * (2/3) * mySize_x + eY * mySize_y, color, panel_fg_alpha * alpha, DRAWFLAG_NORMAL); else // "ghost" ammo count - drawstring_aspect(numpos, ftos(a), eX * (2/3) * newSize_x + eY * newSize_y, '0 0 0', panel_fg_alpha * alpha * 0.5, DRAWFLAG_NORMAL); - drawfont = hud_font; + drawstring_aspect(numpos, ftos(a), eX * (2/3) * mySize_x + eY * mySize_y, '0 0 0', panel_fg_alpha * alpha * 0.5, DRAWFLAG_NORMAL); if(a > 0) - drawpic_aspect_skin(picpos, GetAmmoPicture(itemcode), '1 1 0' * newSize_y, '1 1 1', panel_fg_alpha * alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(picpos, GetAmmoPicture(itemcode), '1 1 0' * mySize_y, '1 1 1', panel_fg_alpha * alpha, DRAWFLAG_NORMAL); else // "ghost" ammo icon - drawpic_aspect_skin(picpos, GetAmmoPicture(itemcode), '1 1 0' * newSize_y, '0 0 0', panel_fg_alpha * alpha * 0.5, DRAWFLAG_NORMAL); + drawpic_aspect_skin(picpos, GetAmmoPicture(itemcode), '1 1 0' * mySize_y, '0 0 0', panel_fg_alpha * alpha * 0.5, DRAWFLAG_NORMAL); } void HUD_Ammo(void) @@@ -1911,8 -1925,6 +1925,6 @@@ active_panel = HUD_PANEL_AMMO; HUD_Panel_UpdateCvars(ammo); - float i, currently_selected; - vector pos, mySize; pos = panel_pos; mySize = panel_size; @@@ -1924,35 -1936,71 +1936,71 @@@ 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 + float rows, columns, row, column; + vector ammo_size; + if (autocvar_hud_panel_ammo_onlycurrent) + ammo_size = mySize; + else + { + 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); + columns = ceil(AMMO_COUNT/rows); - float row, column; - // ammo - 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 (currently_selected || autocvar__hud_configure) - { - DrawAmmoItem(pos, mySize, i, currently_selected); - break; - } - } else { - 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) + ammo_size = eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows); + } + + vector offset; + float newSize; + if(ammo_size_x/ammo_size_y > 3) + { + newSize = 3 * ammo_size_y; + offset_x = ammo_size_x - newSize; + pos_x += offset_x/2; + ammo_size_x = newSize; + } + else + { + newSize = 1/3 * ammo_size_x; + offset_y = ammo_size_y - newSize; + pos_y += offset_y/2; + ammo_size_y = newSize; + } + + drawfont = hud_bigfont; + float i, stat_items, currently_selected; + if (autocvar_hud_panel_ammo_onlycurrent) + { + if(autocvar__hud_configure) + { + DrawAmmoItem(pos, ammo_size, 2, true); //show rockets + return; + } + stat_items = getstati(STAT_ITEMS); + for (i = 0; i < AMMO_COUNT; ++i) { + currently_selected = stat_items & GetAmmoItemCode(i); + if (currently_selected) { - row = 0; - column = column + 1; + DrawAmmoItem(pos, ammo_size, i, true); + return; } } + return; // nothing to display } + + stat_items = getstati(STAT_ITEMS); + for (i = 0; i < AMMO_COUNT; ++i) { + currently_selected = stat_items & GetAmmoItemCode(i); + DrawAmmoItem(pos + eX * column * (ammo_size_x + offset_x) + eY * row * (ammo_size_y + offset_y), ammo_size, i, currently_selected); + ++row; + if(row >= rows) + { + row = 0; + column = column + 1; + } + } + drawfont = hud_font; } void DrawNumIcon(float iconalign, vector myPos, vector mySize, float x, string icon, float left, vector color, float alpha) @@@ -2024,21 -2072,17 +2072,17 @@@ void HUD_Powerups(void) 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(!autocvar__hud_configure) { - if not(stat_items & IT_STRENGTH) - if not(stat_items & IT_INVINCIBLE) - return; + if not(getstati(STAT_ITEMS) & (IT_STRENGTH | IT_INVINCIBLE)) + return; if (getstati(STAT_HEALTH) <= 0) return; } + active_panel = HUD_PANEL_POWERUPS; + HUD_Panel_UpdateCvars(powerups); vector pos, mySize; pos = panel_pos; mySize = panel_size; @@@ -2069,7 -2113,8 +2113,8 @@@ string leftname, rightname; float leftcnt, rightcnt; float leftexact, rightexact; - if (autocvar_hud_panel_powerups_flip) { + float flip = cvar("hud_panel_powerups_flip"); + if (flip) { leftname = "strength"; leftcnt = ceil(strength_time); leftexact = strength_time; @@@ -2088,11 -2133,14 +2133,14 @@@ } drawfont = hud_bigfont; + float baralign = cvar("hud_panel_powerups_baralign"); + float iconalign = cvar("hud_panel_powerups_iconalign"); + float progressbar = cvar("hud_panel_powerups_progressbar"); if (mySize_x/mySize_y > 4) { if(leftcnt) { - if(autocvar_hud_panel_powerups_baralign == 1 || autocvar_hud_panel_powerups_baralign == 3) { // right align + if(baralign == 1 || 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; } else { // left align @@@ -2100,20 -2148,20 +2148,20 @@@ barsize = eX * 0.5 * mySize_x * min(1, leftcnt/30) + eY * mySize_y; } - if(autocvar_hud_panel_powerups_progressbar) + if(progressbar) { HUD_Panel_GetProgressBarColorForString(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); + DrawNumIcon(iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, '1 1 1', 1); if(leftcnt <= 5) - 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)); + DrawNumIcon_expanding(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) { - if(autocvar_hud_panel_powerups_baralign == 0 || autocvar_hud_panel_powerups_baralign == 3) { // left align + if(baralign == 0 || baralign == 3) { // left align barpos = pos + eX * 0.5 * mySize_x; barsize = eX * 0.5 * mySize_x * min(1, rightcnt/30) + eY * mySize_y; } else { // right align @@@ -2121,22 -2169,22 +2169,22 @@@ barsize = eX * 0.5 * mySize_x * min(1, rightcnt/30) + eY * mySize_y; } - if(autocvar_hud_panel_powerups_progressbar) + if(progressbar) { HUD_Panel_GetProgressBarColorForString(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); + 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(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); + DrawNumIcon(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) - 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)); + DrawNumIcon_expanding(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) { - if(autocvar_hud_panel_powerups_baralign == 1 || autocvar_hud_panel_powerups_baralign == 3) { // right align + if(baralign == 1 || 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; } else { // left align @@@ -2144,20 -2192,20 +2192,20 @@@ barsize = eX * mySize_x * min(1, leftcnt/30) + eY * 0.5 * mySize_y; } - if(autocvar_hud_panel_powerups_progressbar) + if(progressbar) { HUD_Panel_GetProgressBarColorForString(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); + 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 * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, '1 1 1', 1); + DrawNumIcon(iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, '1 1 1', 1); if(leftcnt <= 5) - 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)); + DrawNumIcon_expanding(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) { - if(autocvar_hud_panel_powerups_baralign == 0 || autocvar_hud_panel_powerups_baralign == 3) { // left align + if(baralign == 0 || baralign == 3) { // left align barpos = pos + eY * 0.5 * mySize_y; barsize = eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y; } else { // right align @@@ -2165,22 -2213,22 +2213,22 @@@ barsize = eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y; } - if(autocvar_hud_panel_powerups_progressbar) + if(progressbar) { HUD_Panel_GetProgressBarColorForString(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); + 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(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); + DrawNumIcon(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) - 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)); + DrawNumIcon_expanding(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) { - if(autocvar_hud_panel_powerups_baralign == 1 || autocvar_hud_panel_powerups_baralign == 3) { // down align + if(baralign == 1 || 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 @@@ -2188,7 -2236,7 +2236,7 @@@ 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 + if(iconalign == 1 || 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 @@@ -2196,10 -2244,10 +2244,10 @@@ numpos = pos + eY * 0.4 * mySize_x; } - if(autocvar_hud_panel_powerups_progressbar) + if(progressbar) { HUD_Panel_GetProgressBarColorForString(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); + HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); } if(leftcnt <= 5) 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)); @@@ -2210,7 -2258,7 +2258,7 @@@ if(rightcnt) { - if(autocvar_hud_panel_powerups_baralign == 0 || autocvar_hud_panel_powerups_baralign == 3) { // up align + if(baralign == 0 || baralign == 3) { // up align barpos = pos + eX * 0.5 * mySize_x; barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/30); } else { // down align @@@ -2218,7 -2266,7 +2266,7 @@@ barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/30); } - if(autocvar_hud_panel_powerups_iconalign == 0 || autocvar_hud_panel_powerups_iconalign == 3) { // up align + if(iconalign == 0 || 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 @@@ -2226,10 -2274,10 +2274,10 @@@ numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x + eX * 0.5 * mySize_x; } - if(autocvar_hud_panel_powerups_progressbar) + if(progressbar) { HUD_Panel_GetProgressBarColorForString(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); + HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * bound(0, max(strength_time, shield_time), 1), DRAWFLAG_NORMAL); } if(rightcnt <= 5) 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)); @@@ -2281,6 -2329,9 +2329,9 @@@ void HUD_HealthArmor(void vector numpos; drawfont = hud_bigfont; + float baralign = cvar("hud_panel_healtharmor_baralign"); + float iconalign = cvar("hud_panel_healtharmor_iconalign"); + float progressbar = cvar("hud_panel_healtharmor_progressbar"); if(autocvar_hud_panel_healtharmor == 2) // combined health and armor display { vector v; @@@ -2289,7 -2340,7 +2340,7 @@@ float x; x = floor(v_x + 1); - if(autocvar_hud_panel_healtharmor_baralign == 1 || autocvar_hud_panel_healtharmor_baralign == 3) { // right align + if(baralign == 1 || 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; } else { // left align @@@ -2301,7 -2352,7 +2352,7 @@@ if(v_z) // NOT fully armored { biggercount = "health"; - if(autocvar_hud_panel_healtharmor_progressbar) + if(progressbar) { HUD_Panel_GetProgressBarColor(health); HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); @@@ -2312,7 -2363,7 +2363,7 @@@ else { biggercount = "armor"; - if(autocvar_hud_panel_healtharmor_progressbar) + if(progressbar) { HUD_Panel_GetProgressBarColor(armor); HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); @@@ -2320,12 -2371,12 +2371,12 @@@ 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); } - DrawNumIcon(autocvar_hud_panel_healtharmor_iconalign, pos, mySize, x, biggercount, 1, HUD_Get_Num_Color(x, 2 * 200), 1); + DrawNumIcon(iconalign, pos, mySize, x, biggercount, 1, HUD_Get_Num_Color(x, 2 * 200), 1); // fuel if(fuel) { - if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align + if(baralign == 0 || 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 { @@@ -2342,7 -2393,8 +2393,8 @@@ float leftcnt, rightcnt; float leftactive, rightactive; float leftalpha, rightalpha; - if (autocvar_hud_panel_healtharmor_flip) { // old style layout with armor left/top of health + float flip = cvar("hud_panel_healtharmor_flip"); + if (flip) { // old style layout with armor left/top of health leftname = "armor"; leftcnt = armor; if(leftcnt) @@@ -2370,7 -2422,7 +2422,7 @@@ { if(leftactive) { - if(autocvar_hud_panel_healtharmor_baralign == 1 || autocvar_hud_panel_healtharmor_baralign == 3) { // right align + if(baralign == 1 || 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; } else { // left align @@@ -2378,17 -2430,17 +2430,17 @@@ barsize = eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y; } - if(autocvar_hud_panel_healtharmor_progressbar) + if(progressbar) { HUD_Panel_GetProgressBarColorForString(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); + DrawNumIcon(iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, 200), 1); } if(rightactive) { - if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align + if(baralign == 0 || baralign == 3) { // left align barpos = pos + eX * 0.5 * mySize_x; barsize = eX * 0.5 * mySize_x * min(1, rightcnt/200) + eY * mySize_y; } else { // right align @@@ -2396,17 -2448,17 +2448,17 @@@ barsize = eX * 0.5 * mySize_x * min(1, rightcnt/200) + eY * mySize_y; } - if(autocvar_hud_panel_healtharmor_progressbar) + if(progressbar) { HUD_Panel_GetProgressBarColorForString(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); + DrawNumIcon(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(fuel) { - if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align + if(baralign == 0 || 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 { @@@ -2421,7 -2473,7 +2473,7 @@@ { if(leftactive) { - if(autocvar_hud_panel_healtharmor_baralign == 1 || autocvar_hud_panel_healtharmor_baralign == 3) { // right align + if(baralign == 1 || 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; } else { // left align @@@ -2429,17 -2481,17 +2481,17 @@@ barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y; } - if(autocvar_hud_panel_healtharmor_progressbar) + if(progressbar) { HUD_Panel_GetProgressBarColorForString(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); + DrawNumIcon(iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, 200), 1); } if(rightactive) { - if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align + if(baralign == 0 || baralign == 3) { // left align barpos = pos + eY * 0.5 * mySize_y; barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; } else { // right align @@@ -2447,17 -2499,17 +2499,17 @@@ barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; } - if(autocvar_hud_panel_healtharmor_progressbar) + if(progressbar) { HUD_Panel_GetProgressBarColorForString(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); + DrawNumIcon(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(fuel) { - if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align + if(baralign == 0 || 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 { @@@ -2472,7 -2524,7 +2524,7 @@@ { if(leftactive) { - if(autocvar_hud_panel_healtharmor_baralign == 1 || autocvar_hud_panel_healtharmor_baralign == 3) { // down align + if(baralign == 1 || 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 @@@ -2480,7 -2532,7 +2532,7 @@@ 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 + if(iconalign == 1 || 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 @@@ -2488,7 -2540,7 +2540,7 @@@ numpos = pos + eY * 0.4 * mySize_x; } - if(autocvar_hud_panel_healtharmor_progressbar) + if(progressbar) { HUD_Panel_GetProgressBarColorForString(leftname); HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); @@@ -2499,7 -2551,7 +2551,7 @@@ if(rightactive) { - if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // up align + if(baralign == 0 || baralign == 3) { // up align barpos = pos + eX * 0.5 * mySize_x; barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/200); } else { // down align @@@ -2507,7 -2559,7 +2559,7 @@@ barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/200); } - if(autocvar_hud_panel_healtharmor_iconalign == 0 || autocvar_hud_panel_healtharmor_iconalign == 3) { // up align + if(iconalign == 0 || 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 @@@ -2515,7 -2567,7 +2567,7 @@@ numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x + eX * 0.5 * mySize_x; } - if(autocvar_hud_panel_healtharmor_progressbar) + if(progressbar) { HUD_Panel_GetProgressBarColorForString(rightname); HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); @@@ -2526,7 -2578,7 +2578,7 @@@ if(fuel) { - if(autocvar_hud_panel_healtharmor_baralign == 0 || autocvar_hud_panel_healtharmor_baralign == 3) { // left align + if(baralign == 0 || baralign == 3) { // left align barpos = pos; barsize = eX * 0.05 * mySize_x + eY * mySize_y * min(1, fuel/100); } else { @@@ -2558,42 -2610,35 +2610,35 @@@ string Weapon_KillMessage(float deathty return w_deathtypestring; } - float killnotify_times[10]; - float killnotify_deathtype[10]; - float killnotify_actiontype[10]; // 0 = "Y [used by] X", 1 = "X [did action to] Y" - string killnotify_attackers[10]; - string killnotify_victims[10]; + #define KN_MAX_ENTRIES 10 + float kn_index; + float killnotify_times[KN_MAX_ENTRIES]; + float killnotify_deathtype[KN_MAX_ENTRIES]; + float killnotify_actiontype[KN_MAX_ENTRIES]; // 0 = "Y [used by] X", 1 = "X [did action to] Y" + string killnotify_attackers[KN_MAX_ENTRIES]; + string killnotify_victims[KN_MAX_ENTRIES]; void HUD_KillNotify_Push(string attacker, string victim, float actiontype, float wpn) { - float i; - for (i = 9; i > 0; --i) { - killnotify_times[i] = killnotify_times[i-1]; - killnotify_deathtype[i] = killnotify_deathtype[i-1]; - killnotify_actiontype[i] = killnotify_actiontype[i-1]; - if(killnotify_attackers[i]) - strunzone(killnotify_attackers[i]); - killnotify_attackers[i] = strzone(killnotify_attackers[i-1]); - if(killnotify_victims[i]) - strunzone(killnotify_victims[i]); - killnotify_victims[i] = strzone(killnotify_victims[i-1]); - } - killnotify_times[0] = time; - killnotify_deathtype[0] = wpn; - killnotify_actiontype[0] = actiontype; - if(killnotify_attackers[0]) - strunzone(killnotify_attackers[0]); - killnotify_attackers[0] = strzone(attacker); - if(killnotify_victims[0]) - strunzone(killnotify_victims[0]); - killnotify_victims[0] = strzone(victim); + --kn_index; + if (kn_index == -1) + kn_index = KN_MAX_ENTRIES-1; + killnotify_times[kn_index] = time; + killnotify_deathtype[kn_index] = wpn; + killnotify_actiontype[kn_index] = actiontype; + if(killnotify_attackers[kn_index]) + strunzone(killnotify_attackers[kn_index]); + killnotify_attackers[kn_index] = strzone(attacker); + if(killnotify_victims[kn_index]) + strunzone(killnotify_victims[kn_index]); + killnotify_victims[kn_index] = strzone(victim); } void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s1 = attacker, s2 = victim { float w; 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); + alsoprint = (cvar("hud_panel_notify_print") || !panel_enabled); // print message to console if: notify panel disabled, or cvar to do so enabled + gentle = (cvar("cl_gentle") || cvar("cl_gentle_messages")); if ((msg == MSG_SUICIDE || msg == MSG_KILL || msg == MSG_KILL_ACTION) && gametype == GAME_CTS) // selfkill isn't interesting in CTS and only spams up the notify panel return; @@@ -2643,14 -2688,13 +2688,13 @@@ } else if(msg == MSG_KILL) { w = DEATH_WEAPONOF(type); if(WEP_VALID(w)) { - if(type & HITTYPE_HEADSHOT) + if((w == WEP_CAMPINGRIFLE || w == WEP_MINSTANEX) && type & HITTYPE_HEADSHOT) // all headshot weapons go here HUD_KillNotify_Push(s1, s2, 1, DEATH_HEADSHOT); else - { HUD_KillNotify_Push(s1, s2, 1, type); - if (alsoprint) - print("^1", sprintf(Weapon_KillMessage(type), strcat(s2, "^1"), strcat(s1, "^1")), "\n"); // default order: victim, killer - } + + if (alsoprint) + print("^1", sprintf(Weapon_KillMessage(type), strcat(s2, "^1"), strcat(s1, "^1")), "\n"); // default order: victim, killer } else if(type == KILL_TEAM_RED || type == KILL_TEAM_BLUE || type == KILL_TEAM_SPREE) { HUD_KillNotify_Push(s1, s2, 1, type); @@@ -2950,7 -2994,7 +2994,7 @@@ void HUD_Centerprint(string s1, string s2, float type, float msg) { float gentle; - gentle = (autocvar_cl_gentle || autocvar_cl_gentle_messages); + gentle = (cvar("cl_gentle") || cvar("cl_gentle_messages")); if(msg == MSG_SUICIDE) { if (type == DEATH_TEAMCHANGE) { centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "You are now on: ", s1)); @@@ -3053,7 -3097,7 +3097,7 @@@ void HUD_Notify (void } float entries, height; - entries = bound(1, floor(10 * mySize_y/mySize_x), 10); + entries = bound(1, floor(KN_MAX_ENTRIES * mySize_y/mySize_x), KN_MAX_ENTRIES); height = mySize_y/entries; vector fontsize; @@@ -3061,9 -3105,9 +3105,9 @@@ float a; float when; - when = autocvar_hud_panel_notify_time; + when = cvar("hud_panel_notify_time"); float fadetime; - fadetime = autocvar_hud_panel_notify_fadetime; + fadetime = cvar("hud_panel_notify_fadetime"); string s; @@@ -3072,42 -3116,63 +3116,63 @@@ float width_attacker; string attacker, victim; - float i, j, w; - for(j = 0; j < entries; ++j) + float i, j, w, step, limit; + if(cvar("hud_panel_notify_flip")) //order items from the top down { - s = ""; - if(autocvar_hud_panel_notify_flip) - i = j; - else // rather nasty hack for ordering items from the bottom up - i = entries - j - 1; + i = 0; + step = +1; + limit = entries; + } + else //order items from the bottom up + { + i = entries - 1; + step = -1; + limit = -1; + } - if(fadetime) + for(j = kn_index; i != limit; i += step, ++j) + { + if(autocvar__hud_configure) { - if(killnotify_times[j] + when > time) - a = 1; - else - a = bound(0, (killnotify_times[j] + when + fadetime - time) / fadetime, 1); + if (step == +1) + a = i; + else // inverse order + a = entries - 1 - i; + attacker = textShortenToWidth(strcat("Player", ftos(a+1)), 0.48 * mySize_x - height, fontsize, stringwidth_colors); + victim = textShortenToWidth(strcat("Player", ftos(a+2)), 0.48 * mySize_x - height, fontsize, stringwidth_colors); + s = strcat("weapon", get_weaponinfo(WEP_FIRST + mod(floor(a*2.4), WEP_LAST)).netname); + a = bound(0, (when - a) / 4, 1); + goto hud_config_notifyprint; + } + + if (j == KN_MAX_ENTRIES) + j = 0; + + if(killnotify_times[j] + when > time) + a = 1; + else if(fadetime) + { + a = bound(0, (killnotify_times[j] + when + fadetime - time) / fadetime, 1); + if(!a) + { + break; + } } else { - if(killnotify_times[j] + when > time) - a = 1; - else - a = 0; + break; } + s = ""; + w = -1; w = DEATH_WEAPONOF(killnotify_deathtype[j]); // TODO: maybe print in team colors? // // Y [used by] X - if(killnotify_actiontype[j] == 0 && !autocvar__hud_configure) + if(killnotify_actiontype[j] == 0) { - 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; - if(killnotify_deathtype[j] == DEATH_GENERIC) { s = "notify_death"; @@@ -3200,7 -3265,11 +3265,11 @@@ s = "notify_blue_captured"; } } - if(s != "" && a) + 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; + + if(s != "") { 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); @@@ -3209,27 -3278,7 +3278,7 @@@ // X [did action to] Y else { - if(autocvar__hud_configure) - { - 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.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); - 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(autocvar__hud_configure) // example actions for config mode - { - s = "weaponelectro"; - } - else if(killnotify_deathtype[j] & HITTYPE_SECONDARY && w == WEP_LASER) + if(killnotify_deathtype[j] & HITTYPE_SECONDARY && w == WEP_LASER) { s = "notify_melee_laser"; } @@@ -3298,7 -3347,16 +3347,16 @@@ { s = "race_newfail"; } - if(s != "" && a) + + 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); + :hud_config_notifyprint + width_attacker = stringwidth(attacker, TRUE, fontsize); + 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(s != "") { 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); @@@ -3800,21 -3858,10 +3858,10 @@@ void HUD_VoteWindow(void if(!autocvar_hud_panel_vote && !autocvar__hud_configure) return; - active_panel = HUD_PANEL_VOTE; - HUD_Panel_UpdateCvars(vote); - if(autocvar_cl_allow_uid2name == -1 && (gametype == GAME_CTS || gametype == GAME_RACE)) - { - panel_pos = eX * 0.3 * vid_conwidth + eY * 0.1 * vid_conheight; - panel_size = eX * 0.4 * vid_conwidth + eY * 0.3 * vid_conheight; - } - vector pos, mySize; - pos = panel_pos; - mySize = panel_size; - if(!autocvar__hud_configure) { panel_fg_alpha = autocvar_hud_panel_fg_alpha; - panel_bg_alpha_str = autocvar_hud_panel_vote_bg_alpha; + panel_bg_alpha_str = cvar_string("hud_panel_vote_bg_alpha"); if(panel_bg_alpha_str == "") { panel_bg_alpha_str = ftos(autocvar_hud_panel_bg_alpha); @@@ -3844,9 -3891,22 +3891,22 @@@ if(!vote_alpha) return; - a = panel_bg_alpha * vote_alpha * bound(autocvar_hud_panel_vote_alreadyvoted_alpha, 1 - vote_highlighted, 1); + active_panel = HUD_PANEL_VOTE; + HUD_Panel_UpdateCvars(vote); + vector pos, mySize; + pos = panel_pos; + mySize = panel_size; + + if(autocvar_cl_allow_uid2name == -1 && (gametype == GAME_CTS || gametype == GAME_RACE)) + { + panel_pos = eX * 0.3 * vid_conwidth + eY * 0.1 * vid_conheight; + panel_size = eX * 0.4 * vid_conwidth + eY * 0.3 * vid_conheight; + } + + a = vote_alpha * bound(cvar("hud_panel_vote_alreadyvoted_alpha"), 1 - vote_highlighted, 1); HUD_Panel_DrawBg(a); - a = panel_fg_alpha * vote_alpha * bound(autocvar_hud_panel_vote_alreadyvoted_alpha, 1 - vote_highlighted, 1); + a = panel_fg_alpha * a; + if(panel_bg_padding) { pos += '1 1 0' * panel_bg_padding; @@@ -4455,7 -4515,7 +4515,7 @@@ void HUD_ModIcons(void 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 && gametype != GAME_CA && !autocvar__hud_configure) + if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && gametype != GAME_CA && gametype != GAME_FREEZETAG && !autocvar__hud_configure) return; active_panel = HUD_PANEL_MODICONS; @@@ -4492,7 -4552,7 +4552,7 @@@ HUD_Mod_NexBall(pos, mySize); else if(gametype == GAME_CTS || gametype == GAME_RACE) HUD_Mod_Race(pos, mySize); - else if(gametype == GAME_CA) + else if(gametype == GAME_CA || gametype == GAME_FREEZETAG) HUD_Mod_CA(pos, mySize); } @@@ -4520,19 -4580,20 +4580,20 @@@ void HUD_DrawPressedKeys(void } // force custom aspect - if(autocvar_hud_panel_pressedkeys_aspect) + float aspect = cvar("hud_panel_pressedkeys_aspect"); + if(aspect) { vector newSize; - if(mySize_x/mySize_y > autocvar_hud_panel_pressedkeys_aspect) + if(mySize_x/mySize_y > aspect) { - newSize_x = autocvar_hud_panel_pressedkeys_aspect * mySize_y; + newSize_x = 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_y = 1/aspect * mySize_x; newSize_x = mySize_x; pos_y = pos_y + (mySize_y - newSize_y) / 2; @@@ -5016,9 -5077,6 +5077,6 @@@ switch (id) { void HUD_Main (void) { float i; - - hud_skin_path = strcat("gfx/hud/", autocvar_hud_skin); - // global hud alpha fade if(menu_enabled == 1) hud_fade_alpha = 1; @@@ -5039,6 -5097,12 +5097,12 @@@ return; // Drawing stuff + if (hud_skin_path != cvar_string("hud_skin")) + { + if (hud_skin_path) + strunzone(hud_skin_path); + hud_skin_path = strzone(strcat("gfx/hud/", cvar_string("hud_skin"))); + } // HUD configure visible grid if(autocvar__hud_configure && autocvar_hud_configure_grid && autocvar_hud_configure_grid_alpha) @@@ -5060,23 -5124,28 +5124,28 @@@ { 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") { + float hud_dock_color_team = cvar("hud_dock_color_team"); + if((teamplay) && hud_dock_color_team) { f = stof(getplayerkey(player_localentnum - 1, "colors")); - color = colormapPaletteColor(floor(f / 16), 0); + color = colormapPaletteColor(mod(f, 16), 1) * hud_dock_color_team; } - else if(autocvar_hud_dock_color == "pants") { - f = stof(getplayerkey(player_localentnum - 1, "colors")); - color = colormapPaletteColor(mod(f, 16), 1); + else if(autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && hud_dock_color_team) { + color = '1 0 0' * hud_dock_color_team; } else - color = stov(autocvar_hud_dock_color); + { + string hud_dock_color = cvar_string("hud_dock_color"); + if(hud_dock_color == "shirt") { + f = stof(getplayerkey(player_localentnum - 1, "colors")); + color = colormapPaletteColor(floor(f / 16), 0); + } + else if(hud_dock_color == "pants") { + f = stof(getplayerkey(player_localentnum - 1, "colors")); + color = colormapPaletteColor(mod(f, 16), 1); + } + else + color = stov(hud_dock_color); + } string pic; pic = strcat(hud_skin_path, "/", autocvar_hud_dock); @@@ -5086,7 -5155,7 +5155,7 @@@ pic = "gfx/hud/default/dock_medium"; } } - drawpic('0 0 0', pic, eX * vid_conwidth + eY * vid_conheight, color, autocvar_hud_dock_alpha * hud_fade_alpha, DRAWFLAG_NORMAL); // no aspect ratio forcing on dock... + drawpic('0 0 0', pic, eX * vid_conwidth + eY * vid_conheight, color, cvar("hud_dock_alpha") * hud_fade_alpha, DRAWFLAG_NORMAL); // no aspect ratio forcing on dock... } // cache the panel order into the panel_order array diff --combined qcsrc/common/util.qc index 2618d09fd6,8c87b7fdad..85f2e0c47d --- a/qcsrc/common/util.qc +++ b/qcsrc/common/util.qc @@@ -439,7 -439,6 +439,7 @@@ string GametypeNameFromType(float g else if (g == GAME_RACE) return "rc"; else if (g == GAME_NEXBALL) return "nexball"; else if (g == GAME_CTS) return "cts"; + else if (g == GAME_FREEZETAG) return "freezetag"; return "dm"; } @@@ -1941,3 -1940,54 +1941,54 @@@ vector NearestPointOnBox(entity box, ve return nearest; } #endif + + float vercmp_recursive(string v1, string v2) + { + float dot1, dot2; + string s1, s2; + float r; + + dot1 = strstrofs(v1, ".", 0); + dot2 = strstrofs(v2, ".", 0); + if(dot1 == -1) + s1 = v1; + else + s1 = substring(v1, 0, dot1); + if(dot2 == -1) + s2 = v2; + else + s2 = substring(v2, 0, dot2); + + r = stof(s1) - stof(s2); + if(r != 0) + return r; + + r = strcasecmp(s1, s2); + if(r != 0) + return r; + + if(dot1 == -1) + if(dot2 == -1) + return 0; + else + return -1; + else + if(dot2 == -1) + return 1; + else + return vercmp_recursive(substring(v1, dot1 + 1, 999), substring(v2, dot2 + 1, 999)); + } + + float vercmp(string v1, string v2) + { + if(strcasecmp(v1, v2) == 0) // early out check + return 0; + + // "git" beats all + if(v1 == "git") + return 1; + if(v2 == "git") + return -1; + + return vercmp_recursive(v1, v2); + } diff --combined qcsrc/menu/xonotic/dialog_multiplayer_create.c index 5dd8402689,4fb8ac0ca5..792be64779 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create.c @@@ -39,22 -39,18 +39,20 @@@ void XonoticServerCreateTab_fill(entit if(e.checked) e0 = NULL; me.TD(me, 1, me.columns / n, e = makeXonoticGametypeButton(1, "g_arena", "Arena")); if(e.checked) e0 = NULL; - me.TD(me, 1, me.columns / n, e = makeXonoticGametypeButton(1, "g_runematch", "Runematch")); - if(e.checked) e0 = NULL; me.TD(me, 1, me.columns / n, e = makeXonoticGametypeButton(1, "g_race", "Race")); if(e.checked) e0 = NULL; me.TD(me, 1, me.columns / n, e = makeXonoticGametypeButton(1, "g_cts", "Race CTS")); if(e.checked) e0 = NULL; me.TR(me); - n = 8; + n = 9; me.TD(me, 1, me.columns / n, e = makeXonoticGametypeButton(1, "g_tdm", "TDM")); if(e.checked) e0 = NULL; me.TD(me, 1, me.columns / n, e = makeXonoticGametypeButton(1, "g_ctf", "CTF")); if(e.checked) e0 = NULL; me.TD(me, 1, me.columns / n, e = makeXonoticGametypeButton(1, "g_ca", "CA")); if(e.checked) e0 = NULL; + me.TD(me, 1, me.columns / n, e = makeXonoticGametypeButton(1, "g_freezetag", "Freeze Tag")); + if(e.checked) e0 = NULL; me.TD(me, 1, me.columns / n, e = makeXonoticGametypeButton(1, "g_domination", "Domination")); if(e.checked) e0 = NULL; me.TD(me, 1, me.columns / n, e = makeXonoticGametypeButton(1, "g_keyhunt", "Key Hunt")); diff --combined qcsrc/server/cl_physics.qc index 2492f764b4,efc9118ea8..3455fde9a3 --- a/qcsrc/server/cl_physics.qc +++ b/qcsrc/server/cl_physics.qc @@@ -46,9 -46,6 +46,9 @@@ When you press the jump ke */ void PlayerJump (void) { + if(g_freezetag && self.freezetag_frozen) + return; // no jumping in freezetag when frozen + float mjumpheight; float doublejump; @@@ -1320,7 -1317,7 +1320,7 @@@ void SV_PlayerPhysics( rr = RACE_RECORD; race_send_speedaward(MSG_ALL); speedaward_lastsent = speedaward_speed; - if (speedaward_speed > speedaward_alltimebest) { + if (speedaward_speed > speedaward_alltimebest && speedaward_uid != "") { speedaward_alltimebest = speedaward_speed; speedaward_alltimebest_holder = speedaward_holder; speedaward_alltimebest_uid = speedaward_uid;