From: FruitieX Date: Wed, 7 Jul 2010 12:29:13 +0000 (+0300) Subject: Merge branch 'master' into fruitiex/newpanelhud X-Git-Tag: xonotic-v0.1.0preview~457^2~2^2~28 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=6701ba40024db6ca89585abfc9f091bada9c7992;hp=7f5b01d9a5483027bf93505c17e8842da5674792 Merge branch 'master' into fruitiex/newpanelhud --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 307f58fa78..6aeb7e9339 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1327,8 +1327,8 @@ set _hud_configure 0 "1 = configure the HUD" 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_xsize 0.01 "snap to X * vid_conwidth" +seta hud_configure_grid_ysize 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" 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_captured.tga b/gfx/hud/default/flag_blue_captured.tga new file mode 100644 index 0000000000..7cff17eed2 Binary files /dev/null and b/gfx/hud/default/flag_blue_captured.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_returned.tga b/gfx/hud/default/flag_blue_returned.tga new file mode 100644 index 0000000000..8e8b67ffda Binary files /dev/null and b/gfx/hud/default/flag_blue_returned.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_captured.tga b/gfx/hud/default/flag_red_captured.tga new file mode 100644 index 0000000000..72814ecc69 Binary files /dev/null and b/gfx/hud/default/flag_red_captured.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_returned.tga b/gfx/hud/default/flag_red_returned.tga new file mode 100644 index 0000000000..deee4686d0 Binary files /dev/null and b/gfx/hud/default/flag_red_returned.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_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_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_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_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.tga b/gfx/hud/default/notify_teamkill.tga new file mode 100644 index 0000000000..a40920b204 Binary files /dev/null and b/gfx/hud/default/notify_teamkill.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_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/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/flag_blue_captured.tga b/gfx/hud/wickedhud/flag_blue_captured.tga new file mode 100644 index 0000000000..7cff17eed2 Binary files /dev/null and b/gfx/hud/wickedhud/flag_blue_captured.tga differ diff --git a/gfx/hud/wickedhud/flag_blue_carrying.tga b/gfx/hud/wickedhud/flag_blue_carrying.tga index 0700cd5bc7..ace6a5f2c3 100644 Binary files a/gfx/hud/wickedhud/flag_blue_carrying.tga and b/gfx/hud/wickedhud/flag_blue_carrying.tga differ diff --git a/gfx/hud/wickedhud/flag_blue_lost.tga b/gfx/hud/wickedhud/flag_blue_lost.tga index f0bb89d2ee..67d894d82d 100644 Binary files a/gfx/hud/wickedhud/flag_blue_lost.tga and b/gfx/hud/wickedhud/flag_blue_lost.tga differ diff --git a/gfx/hud/wickedhud/flag_blue_returned.tga b/gfx/hud/wickedhud/flag_blue_returned.tga new file mode 100644 index 0000000000..8e8b67ffda Binary files /dev/null and b/gfx/hud/wickedhud/flag_blue_returned.tga differ diff --git a/gfx/hud/wickedhud/flag_blue_shielded.tga b/gfx/hud/wickedhud/flag_blue_shielded.tga index e385437f1c..a8993f6b2c 100644 Binary files a/gfx/hud/wickedhud/flag_blue_shielded.tga and b/gfx/hud/wickedhud/flag_blue_shielded.tga differ diff --git a/gfx/hud/wickedhud/flag_blue_taken.tga b/gfx/hud/wickedhud/flag_blue_taken.tga index e51e297bab..6847e7cc19 100644 Binary files a/gfx/hud/wickedhud/flag_blue_taken.tga and b/gfx/hud/wickedhud/flag_blue_taken.tga differ diff --git a/gfx/hud/wickedhud/flag_red_captured.tga b/gfx/hud/wickedhud/flag_red_captured.tga new file mode 100644 index 0000000000..72814ecc69 Binary files /dev/null and b/gfx/hud/wickedhud/flag_red_captured.tga differ diff --git a/gfx/hud/wickedhud/flag_red_carrying.tga b/gfx/hud/wickedhud/flag_red_carrying.tga index c28cea877c..3393083323 100644 Binary files a/gfx/hud/wickedhud/flag_red_carrying.tga and b/gfx/hud/wickedhud/flag_red_carrying.tga differ diff --git a/gfx/hud/wickedhud/flag_red_lost.tga b/gfx/hud/wickedhud/flag_red_lost.tga index 93d55793e9..f96e02147e 100644 Binary files a/gfx/hud/wickedhud/flag_red_lost.tga and b/gfx/hud/wickedhud/flag_red_lost.tga differ diff --git a/gfx/hud/wickedhud/flag_red_returned.tga b/gfx/hud/wickedhud/flag_red_returned.tga new file mode 100644 index 0000000000..deee4686d0 Binary files /dev/null and b/gfx/hud/wickedhud/flag_red_returned.tga differ diff --git a/gfx/hud/wickedhud/flag_red_shielded.tga b/gfx/hud/wickedhud/flag_red_shielded.tga index ed9994ac40..e7ec491fd6 100644 Binary files a/gfx/hud/wickedhud/flag_red_shielded.tga and b/gfx/hud/wickedhud/flag_red_shielded.tga differ diff --git a/gfx/hud/wickedhud/flag_red_taken.tga b/gfx/hud/wickedhud/flag_red_taken.tga index f999476d23..bf71977e14 100644 Binary files a/gfx/hud/wickedhud/flag_red_taken.tga and b/gfx/hud/wickedhud/flag_red_taken.tga differ diff --git a/gfx/hud/wickedhud/notify_teamkill.tga b/gfx/hud/wickedhud/notify_teamkill.tga index 0f28ebb36e..a40920b204 100644 Binary files a/gfx/hud/wickedhud/notify_teamkill.tga and b/gfx/hud/wickedhud/notify_teamkill.tga differ diff --git a/gfx/hud/wickedhud/num_leading.tga b/gfx/hud/wickedhud/num_leading.tga new file mode 100644 index 0000000000..f2f59d3b02 Binary files /dev/null and b/gfx/hud/wickedhud/num_leading.tga 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/voteprogress_back.tga b/gfx/hud/wickedhud/voteprogress_back.tga index fc031ce0b2..2348be8251 100644 Binary files a/gfx/hud/wickedhud/voteprogress_back.tga and b/gfx/hud/wickedhud/voteprogress_back.tga differ diff --git a/gfx/hud/wickedhud/voteprogress_prog.tga b/gfx/hud/wickedhud/voteprogress_prog.tga index 9f3f614870..574d5d70a6 100644 Binary files a/gfx/hud/wickedhud/voteprogress_prog.tga and b/gfx/hud/wickedhud/voteprogress_prog.tga differ diff --git a/gfx/hud/wickedhud/voteprogress_voted.tga b/gfx/hud/wickedhud/voteprogress_voted.tga index a21fe6a4b8..ffc90a255c 100644 Binary files a/gfx/hud/wickedhud/voteprogress_voted.tga and b/gfx/hud/wickedhud/voteprogress_voted.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_wickedhud_default.cfg b/hud_wickedhud_default.cfg index 62d9d11b31..4f0af352bb 100644 --- a/hud_wickedhud_default.cfg +++ b/hud_wickedhud_default.cfg @@ -20,11 +20,17 @@ seta hud_progressbar_armor_color "0 0.6 0" "R G B vector of the progress bar bac 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_panelorder "6 0 1 2 3 4 5 7 8 9 10 11 12 13 14" "contains order in which panels are to be drawn" + 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_number 1 "1 = show number of weapon, 2 = show bound key of weapon" seta hud_weaponicons_accuracy_yellow 40 "percentage at which the accuracy color is yellow" +seta hud_weaponicons_complainbubble 1 "complain bubble (out of ammo, weapon not available etc)" +seta hud_weaponicons_complainbubble_time 1 "time that a new entry stays until it fades out" +seta hud_weaponicons_complainbubble_padding -10 "padding for the complainbubble" +seta hud_weaponicons_complainbubble_fadetime 0.25 "fade out time" 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" @@ -36,6 +42,7 @@ 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_iconalign 0 "0 = align icons to the left, 1 = align icons to the right" 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" @@ -47,7 +54,8 @@ 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_baralign 0 "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_powerups_iconalign 0 "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_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" @@ -59,7 +67,8 @@ seta hud_healtharmor 1 "enable/disable this panel, 2 = combined health/armor dis 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_baralign 0 "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_healtharmor_iconalign 0 "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_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" @@ -80,7 +89,6 @@ 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" @@ -183,3 +191,14 @@ 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" + +seta hud_infomessages 1 "enable/disable this panel +seta hud_infomessages_pos "0.020000 0.680000" "position of this base of the panel" +seta hud_infomessages_size "0.320000 0.090000" "size of this panel" +seta hud_infomessages_bg "border_modicons" "if set to something else than \"\" = override default background" +seta hud_infomessages_bg_color "" "if set to something else than \"\" = override default panel background color" +seta hud_infomessages_bg_color_team "" "override panel color with team color in team based games" +seta hud_infomessages_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha" +seta hud_infomessages_bg_border "" "if set to something else than \"\" = override default size of border around the background" +seta hud_infomessages_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" +seta hud_infomessages_flip 0 "1 = align the items to the right" diff --git a/hud_wickedhud_minimalistic.cfg b/hud_wickedhud_minimalistic.cfg new file mode 100644 index 0000000000..ad2ae8796c --- /dev/null +++ b/hud_wickedhud_minimalistic.cfg @@ -0,0 +1,173 @@ +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 "" +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.040000" +seta hud_weaponicons_size "0.060000 0.630000" +seta hud_weaponicons_bg "0" +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 0.810000" +seta hud_inventory_size "0.090000 0.190000" +seta hud_inventory_bg "0" +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 "0" +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.100000 0.920000" +seta hud_healtharmor_size "0.560000 0.080000" +seta hud_healtharmor_bg "0" +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 1 + +seta hud_notify 1 +seta hud_notify_pos "0.670000 0.680000" +seta hud_notify_size "0.330000 0.230000" +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.940000 0" +seta hud_timer_size "0.060000 0.030000" +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 0 +seta hud_radar_pos "0 0" +seta hud_radar_size "0.190000 0.230000" +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.830000 0.920000" +seta hud_score_size "0.170000 0.060000" +seta hud_score_bg "0" +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.690000 0" +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.700000 0.920000" +seta hud_modicons_size "0.120000 0.080000" +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 0 +seta hud_pressedkeys_pos "0 0" +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.100000 0.790000" +seta hud_chat_size "0.560000 0.120000" +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 0 +seta hud_engineinfo_pos "0 0" +seta hud_engineinfo_size "0.130000 0.034667" +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/qcsrc/client/Main.qc b/qcsrc/client/Main.qc index 1a6996ce66..7d218cb654 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) @@ -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..a686ac5dcd 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -5,3 +5,208 @@ 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__menu_alpha; + +var float autocvar__hud_configure; +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 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_bg; +var vector autocvar_hud_bg_color; +var float autocvar_hud_bg_color_team; +var float autocvar_hud_bg_alpha; +var float autocvar_hud_bg_border; +var float autocvar_hud_bg_padding; +var float autocvar_hud_fg_alpha; + +var float autocvar_hud_weaponicons; +var vector autocvar_hud_weaponicons_pos; +var vector autocvar_hud_weaponicons_size; +var string autocvar_hud_weaponicons_bg; +var string autocvar_hud_weaponicons_bg_color; +var string autocvar_hud_weaponicons_bg_color_team; +var string autocvar_hud_weaponicons_bg_alpha; +var string autocvar_hud_weaponicons_bg_border; +var string autocvar_hud_weaponicons_bg_padding; +var float autocvar_hud_weaponicons_accuracy_yellow; +var float autocvar_hud_weaponicons_number; +var float autocvar_hud_weaponicons_complainbubble; +var float autocvar_hud_weaponicons_complainbubble_padding; +var float autocvar_hud_weaponicons_complainbubble_time; +var float autocvar_hud_weaponicons_complainbubble_fadetime; + +var float autocvar_hud_inventory; +var vector autocvar_hud_inventory_pos; +var vector autocvar_hud_inventory_size; +var string autocvar_hud_inventory_bg; +var string autocvar_hud_inventory_bg_color; +var string autocvar_hud_inventory_bg_color_team; +var string autocvar_hud_inventory_bg_alpha; +var string autocvar_hud_inventory_bg_border; +var string autocvar_hud_inventory_bg_padding; +var float autocvar_hud_inventory_onlycurrent; +var float autocvar_hud_inventory_iconalign; + +var float autocvar_hud_powerups; +var vector autocvar_hud_powerups_pos; +var vector autocvar_hud_powerups_size; +var string autocvar_hud_powerups_bg; +var string autocvar_hud_powerups_bg_color; +var string autocvar_hud_powerups_bg_color_team; +var string autocvar_hud_powerups_bg_alpha; +var string autocvar_hud_powerups_bg_border; +var string autocvar_hud_powerups_bg_padding; +var float autocvar_hud_powerups_flip; +var float autocvar_hud_powerups_iconalign; +var float autocvar_hud_powerups_baralign; + +var float autocvar_hud_healtharmor; +var vector autocvar_hud_healtharmor_pos; +var vector autocvar_hud_healtharmor_size; +var string autocvar_hud_healtharmor_bg; +var string autocvar_hud_healtharmor_bg_color; +var string autocvar_hud_healtharmor_bg_color_team; +var string autocvar_hud_healtharmor_bg_alpha; +var string autocvar_hud_healtharmor_bg_border; +var string autocvar_hud_healtharmor_bg_padding; +var float autocvar_hud_healtharmor_flip; +var float autocvar_hud_healtharmor_iconalign; +var float autocvar_hud_healtharmor_baralign; + +var float autocvar_hud_notify; +var vector autocvar_hud_notify_pos; +var vector autocvar_hud_notify_size; +var string autocvar_hud_notify_bg; +var string autocvar_hud_notify_bg_color; +var string autocvar_hud_notify_bg_color_team; +var string autocvar_hud_notify_bg_alpha; +var string autocvar_hud_notify_bg_border; +var string autocvar_hud_notify_bg_padding; +var float autocvar_hud_notify_print; +var float autocvar_hud_notify_time; +var float autocvar_hud_notify_fadetime; +var float autocvar_hud_notify_flip; + +var float autocvar_hud_timer; +var vector autocvar_hud_timer_pos; +var vector autocvar_hud_timer_size; +var string autocvar_hud_timer_bg; +var string autocvar_hud_timer_bg_color; +var string autocvar_hud_timer_bg_color_team; +var string autocvar_hud_timer_bg_alpha; +var string autocvar_hud_timer_bg_border; +var string autocvar_hud_timer_bg_padding; +var float autocvar_hud_timer_increment; + +var float autocvar_hud_radar; +var vector autocvar_hud_radar_pos; +var vector autocvar_hud_radar_size; +var string autocvar_hud_radar_bg; +var string autocvar_hud_radar_bg_color; +var string autocvar_hud_radar_bg_color_team; +var string autocvar_hud_radar_bg_alpha; +var string autocvar_hud_radar_bg_border; +var string autocvar_hud_radar_bg_padding; + +var float autocvar_hud_score; +var vector autocvar_hud_score_pos; +var vector autocvar_hud_score_size; +var string autocvar_hud_score_bg; +var string autocvar_hud_score_bg_color; +var string autocvar_hud_score_bg_color_team; +var string autocvar_hud_score_bg_alpha; +var string autocvar_hud_score_bg_border; +var string autocvar_hud_score_bg_padding; + +var float autocvar_hud_racetimer; +var vector autocvar_hud_racetimer_pos; +var vector autocvar_hud_racetimer_size; +var string autocvar_hud_racetimer_bg; +var string autocvar_hud_racetimer_bg_color; +var string autocvar_hud_racetimer_bg_color_team; +var string autocvar_hud_racetimer_bg_alpha; +var string autocvar_hud_racetimer_bg_border; +var string autocvar_hud_racetimer_bg_padding; + +var float autocvar_hud_vote; +var vector autocvar_hud_vote_pos; +var vector autocvar_hud_vote_size; +var string autocvar_hud_vote_bg; +var string autocvar_hud_vote_bg_color; +var string autocvar_hud_vote_bg_color_team; +var string autocvar_hud_vote_bg_alpha; +var string autocvar_hud_vote_bg_border; +var string autocvar_hud_vote_bg_padding; +var float autocvar_hud_vote_alreadyvoted_alpha; + +var float autocvar_hud_modicons; +var vector autocvar_hud_modicons_pos; +var vector autocvar_hud_modicons_size; +var string autocvar_hud_modicons_bg; +var string autocvar_hud_modicons_bg_color; +var string autocvar_hud_modicons_bg_color_team; +var string autocvar_hud_modicons_bg_alpha; +var string autocvar_hud_modicons_bg_border; +var string autocvar_hud_modicons_bg_padding; + +var float autocvar_hud_pressedkeys; +var vector autocvar_hud_pressedkeys_pos; +var vector autocvar_hud_pressedkeys_size; +var string autocvar_hud_pressedkeys_bg; +var string autocvar_hud_pressedkeys_bg_color; +var string autocvar_hud_pressedkeys_bg_color_team; +var string autocvar_hud_pressedkeys_bg_alpha; +var string autocvar_hud_pressedkeys_bg_border; +var string autocvar_hud_pressedkeys_bg_padding; + +var float autocvar_hud_chat; +var vector autocvar_hud_chat_pos; +var vector autocvar_hud_chat_size; +var string autocvar_hud_chat_bg; +var string autocvar_hud_chat_bg_color; +var string autocvar_hud_chat_bg_color_team; +var string autocvar_hud_chat_bg_alpha; +var string autocvar_hud_chat_bg_border; +var string autocvar_hud_chat_bg_padding; + +var float autocvar_hud_engineinfo; +var vector autocvar_hud_engineinfo_pos; +var vector autocvar_hud_engineinfo_size; +var string autocvar_hud_engineinfo_bg; +var string autocvar_hud_engineinfo_bg_color; +var string autocvar_hud_engineinfo_bg_color_team; +var string autocvar_hud_engineinfo_bg_alpha; +var string autocvar_hud_engineinfo_bg_border; +var string autocvar_hud_engineinfo_bg_padding; + +var float autocvar_hud_infomessages; +var vector autocvar_hud_infomessages_pos; +var vector autocvar_hud_infomessages_size; +var string autocvar_hud_infomessages_bg; +var string autocvar_hud_infomessages_bg_color; +var string autocvar_hud_infomessages_bg_color_team; +var string autocvar_hud_infomessages_bg_alpha; +var string autocvar_hud_infomessages_bg_border; +var string autocvar_hud_infomessages_bg_padding; +var float autocvar_hud_infomessages_flip; diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 1b8b2366e0..0d7489d83a 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; @@ -76,167 +83,54 @@ 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); - } -} +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 -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); -} +#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) -// 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; -} +// 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) -// 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; +// TODO: aspect! +void drawpic_aspect_skin_expanding(vector pos, string pic, vector sz, vector rgb, float alpha, float flag, float fadelerp) { + return; + //drawpic_aspect_expanding(pos, strcat("gfx/hud/", autocvar_hud_skin, "/", pic), sz, rgb, alpha, flag, fadelerp); } -// 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; - } +void drawpic_aspect_skin_expanding_two(vector pos, string pic, vector sz, vector rgb, float alpha, float flag, float fadelerp) { + return; + //drawpic_aspect_expanding_two(pos, strcat("gfx/hud/", autocvar_hud_skin, "/", pic), sz, rgb, alpha, flag, fadelerp); } vector HUD_Get_Num_Color (float x, float maxvalue) @@ -274,13 +168,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) { @@ -582,7 +469,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 +485,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,65 +497,68 @@ 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"); + // 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_name, " ", cvar_string(strcat("hud_", panel_name)), "\n")); + fputs(fh, strcat("seta hud_", panel_name, "_pos \"", cvar_string(strcat("hud_", panel_name, "_pos")), "\"", "\n")); + fputs(fh, strcat("seta hud_", panel_name, "_size \"", cvar_string(strcat("hud_", panel_name, "_size")), "\"", "\n")); + fputs(fh, strcat("seta hud_", panel_name, "_bg \"", cvar_string(strcat("hud_", panel_name, "_bg")), "\"", "\n")); + fputs(fh, strcat("seta hud_", panel_name, "_bg_color \"", cvar_string(strcat("hud_", panel_name, "_bg_color")), "\"", "\n")); + fputs(fh, strcat("seta hud_", panel_name, "_bg_color_team \"", cvar_string(strcat("hud_", panel_name, "_bg_color_team")), "\"", "\n")); + fputs(fh, strcat("seta hud_", panel_name, "_bg_alpha \"", cvar_string(strcat("hud_", panel_name, "_bg_alpha")), "\"", "\n")); + fputs(fh, strcat("seta hud_", panel_name, "_bg_border \"", cvar_string(strcat("hud_", panel_name, "_bg_border")), "\"", "\n")); + fputs(fh, strcat("seta hud_", panel_name, "_bg_padding \"", cvar_string(strcat("hud_", 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_WEAPONICONS: + fputs(fh, strcat("seta hud_", panel_name, "_accuracy_yellow \"", cvar_string(strcat("hud_", panel_name, "_accuracy_yellow")), "\"", "\n")); + fputs(fh, strcat("seta hud_", panel_name, "_complainbubble \"", cvar_string(strcat("hud_", panel_name, "_complainbubble")), "\"", "\n")); + fputs(fh, strcat("seta hud_", panel_name, "_complainbubble_size \"", cvar_string(strcat("hud_", panel_name, "_complainbubble_size")), "\"", "\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_INVENTORY: + fputs(fh, strcat("seta hud_", panel_name, "_onlycurrent \"", cvar_string(strcat("hud_", panel_name, "_onlycurrent")), "\"", "\n")); + fputs(fh, strcat("seta hud_", panel_name, "_iconalign \"", cvar_string(strcat("hud_", 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_name, "_flip \"", cvar_string(strcat("hud_", panel_name, "_flip")), "\"", "\n")); + fputs(fh, strcat("seta hud_", panel_name, "_iconalign \"", cvar_string(strcat("hud_", panel_name, "_iconalign")), "\"", "\n")); + fputs(fh, strcat("seta hud_", panel_name, "_baralign \"", cvar_string(strcat("hud_", panel_name, "_baralign")), "\"", "\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_name, "_flip \"", cvar_string(strcat("hud_", panel_name, "_flip")), "\n")); + fputs(fh, strcat("seta hud_", panel_name, "_iconalign \"", cvar_string(strcat("hud_", panel_name, "_iconalign")), "\"", "\n")); + fputs(fh, strcat("seta hud_", panel_name, "_baralign \"", cvar_string(strcat("hud_", panel_name, "_baralign")), "\"", "\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_name, "_flip \"", cvar_string(strcat("hud_", panel_name, "_flip")), "\"", "\n")); + fputs(fh, strcat("seta hud_", panel_name, "_info_top \"", cvar_string(strcat("hud_", panel_name, "_info_top")), "\"", "\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_name, "_foreground_alpha \"", cvar_string(strcat("hud_", panel_name, "_foreground_alpha")), "\"", "\n")); + break; + case HUD_PANEL_VOTE: + fputs(fh, strcat("seta hud_", panel_name, "_alreadyvoted_alpha \"", cvar_string(strcat("hud_", panel_name, "_alreadyvoted_alpha")), "\"", "\n")); break; } fputs(fh, "\n"); } - 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) +// return smoothly faded size of given panel when a dialog is active +vector HUD_Panel_GetMenuSize(float id) { vector mySize; - mySize = stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_size"))); + mySize = panel_size; mySize = eX * mySize_x * vid_conwidth + eY * mySize_y * vid_conheight; @@ -684,7 +574,7 @@ vector HUD_Panel_GetSize(float id) { 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; + mySize = (1 - autocvar__menu_alpha) * mySize + (autocvar__menu_alpha) * menu_enable_size; } } else @@ -693,213 +583,99 @@ vector HUD_Panel_GetSize(float id) { 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; + mySize = (1 - autocvar__menu_alpha) * mySize + (autocvar__menu_alpha) * menu_enable_size; } } } return mySize; } -// return pos of given panel -vector HUD_Panel_GetPos(float id) +// return smoothly faded pos of given panel when a dialog is active +vector HUD_Panel_GetMenuPos(float id) { vector pos; - pos = stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_pos"))); + pos = panel_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); + mySize = HUD_Panel_GetMenuSize(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; + pos = (1 - autocvar__menu_alpha) * pos + (autocvar__menu_alpha) * menu_enable_panelpos; } return pos; } -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); -} - -vector HUD_Panel_GetColor(float id) -{ - float f; - vector color_vec; - string color; - - // 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); - } - else if(color == "pants") { - f = stof(getplayerkey(self.sv_entnum, "colors")); - color_vec = colormapPaletteColor(mod(f, 16), 1); - } - } - 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) +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) { - 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)); + 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); } // 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") - 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)); - } -} +#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, '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); 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; + if(!alpha) + return; + 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); + pic = strcat(hud_skin_path, "/statusbar_vertical"); + if(precache_pic(pic) == "") { + pic = "gfx/hud/default/statusbar_vertical"; + } + 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, 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); + 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 { - 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); + 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, 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); + 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); } } -vector HUD_Panel_GetProgressBarColor(string item) +void HUD_Panel_DrawHighlight(vector pos, vector mySize, vector color, float alpha, float drawflag) { - return stov(cvar_string(strcat("hud_progressbar_", item, "_color"))); + if(!alpha) + return; + + string pic; + pic = strcat(hud_skin_path, "/num_leading"); + if(precache_pic(pic) == "") { + pic = "gfx/hud/default/num_leading"; + } + + 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 +690,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) + + panel_pos -= '1 1 0' * panel_bg_border; + panel_size += '2 2 0' * panel_bg_border; - if(myPos_y + mySize_y < targPos_y) + 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 +713,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_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 +827,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 +836,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 +874,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 +944,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 +973,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_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_name, "_pos"), s); } float mouseClicked; @@ -1219,9 +991,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 +1106,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 +1130,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 +1333,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_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 +1380,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 +1390,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_WeaponIcons_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) @@ -1422,13 +1440,17 @@ float weaponorder_cmp(float i, float j, entity pass) void HUD_WeaponIcons(void) { + if(!autocvar_hud_weaponicons && !autocvar__hud_configure) + return; + float id = HUD_PANEL_WEAPONICONS; + HUD_Panel_UpdateCvarsForId(id); float alpha, stat_weapons; // "constants" - vector pos, mySize, accuracy_color; + vector pos, mySize; float i, weapid, fade, weapon_stats, weapon_hit, weapon_damage, weapon_cnt; // variables - pos = HUD_Panel_GetPos(id); - mySize = HUD_Panel_GetSize(id); + pos = panel_pos; + mySize = panel_size; stat_weapons = getstati(STAT_WEAPONS); weapon_cnt = 0; @@ -1460,13 +1482,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 @@ -1495,6 +1515,14 @@ void HUD_WeaponIcons(void) columns = ceil(WEP_COUNT/rows); float row, column; + + float a; + float when; + when = autocvar_hud_weaponicons_complainbubble_time; + float fadetime; + fadetime = autocvar_hud_weaponicons_complainbubble_fadetime; + + vector color; for(i = 0; i < weapon_cnt; ++i) { self = weaponorder[i]; @@ -1507,7 +1535,7 @@ void HUD_WeaponIcons(void) // 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(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 * panel_fg_alpha, DRAWFLAG_NORMAL); // draw the weapon accuracy on the HUD if(hud_accuracy_hud && !(gametype == GAME_RACE || gametype == GAME_CTS)) @@ -1515,22 +1543,73 @@ void HUD_WeaponIcons(void) if(weapon_damage) weapon_stats = floor(100 * weapon_hit / weapon_damage); - accuracy_color = HUD_AccuracyColor(weapon_stats); + // yellow_accuracy = value at which accuracy becomes yellow + if(weapon_stats >= 100) { + color_x = 0; + color_y = 1; + } + else if(weapon_stats > autocvar_hud_weaponicons_accuracy_yellow) { + color_x = 1 - (weapon_stats-autocvar_hud_weaponicons_accuracy_yellow)/(100-autocvar_hud_weaponicons_accuracy_yellow); // red value between 1 -> 0 + color_y = 1; + } else { + color_x = 1; + color_y = weapon_stats/autocvar_hud_weaponicons_accuracy_yellow; // green value between 0 -> 1 + } + 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(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), color, panel_fg_alpha, DRAWFLAG_NORMAL); } // draw the weapon icon if((self.impulse >= 0) && (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(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 * 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); + if(autocvar_hud_weaponicons_number == 1) // weapon number + 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', panel_fg_alpha, DRAWFLAG_NORMAL); + else if(autocvar_hud_weaponicons_number == 2) // bind + drawstring(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), getcommandkey(ftos(weapid), strcat("impulse ", ftos(weapid))), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); } + + // 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(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', panel_fg_alpha * 0.5, DRAWFLAG_NORMAL); + } + + // draw the complain message + if(time - complain_weapon_time < when + fadetime && self.weapon == complain_weapon && autocvar_hud_weaponicons_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 = '1 0 0'; + } + else if(complain_weapon_type == 1) { + s = "Don't have"; + color = '1 1 0'; + } + else { + s = "Unavailable"; + color = '1 1 1'; + } + drawpic_aspect_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows) + '1 1 0' * autocvar_hud_weaponicons_complainbubble_padding, "weapon_complainbubble", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows) - '2 2 0' * autocvar_hud_weaponicons_complainbubble_padding, color, a * panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows) + '1 1 0' * autocvar_hud_weaponicons_complainbubble_padding, s, eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows) - '2 2 0' * autocvar_hud_weaponicons_complainbubble_padding, mySize_y*(1/rows), '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); } ++row; @@ -1545,6 +1624,7 @@ void HUD_WeaponIcons(void) // Inventory (#1) // +// TODO: macro float GetAmmoStat(float i) { switch(i) @@ -1584,104 +1664,181 @@ 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) + 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_inventory_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, 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); +} + void HUD_Inventory(void) { + if(!autocvar_hud_inventory && !autocvar__hud_configure) + return; + float id = HUD_PANEL_INVENTORY; - float i; - float stat_items; + HUD_Panel_UpdateCvarsForId(id); + float i, currently_selected; - vector pos, mySize, mysize, mypos; - pos = HUD_Panel_GetPos(id); - mySize = HUD_Panel_GetSize(id); + 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_inventory_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) +{ + 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, newSize_y, color, panel_fg_alpha, DRAWFLAG_NORMAL); + drawfont = hud_font; + drawpic_aspect_skin(picpos, icon, '1 1 0' * newSize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); +} // Powerups (#2) // void HUD_Powerups(void) { + if(!autocvar_hud_powerups && !autocvar__hud_configure) + return; + float id = HUD_PANEL_POWERUPS; + HUD_Panel_UpdateCvarsForId(id); 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,16 +1849,14 @@ void HUD_Powerups(void) { } 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 strength_time, shield_time; @@ -1709,14 +1864,12 @@ void HUD_Powerups(void) { strength_time = bound(0, getstatf(STAT_STRENGTH_FINISHED) - time, 99); shield_time = bound(0, getstatf(STAT_INVINCIBLE_FINISHED) - time, 99); - if(hud_configure) + if(autocvar__hud_configure) { strength_time = 15; shield_time = 27; } - float len; - vector barpos, barsize; vector picpos; vector numpos; @@ -1725,7 +1878,7 @@ void HUD_Powerups(void) { float leftcnt, rightcnt; float leftexact, rightexact; float leftalpha, rightalpha; - if (cvar(strcat("hud_", HUD_Panel_GetName(id), "_flip"))) { + if (autocvar_hud_powerups_flip) { leftname = "strength"; leftcnt = ceil(strength_time); leftexact = strength_time; @@ -1745,174 +1898,153 @@ void HUD_Powerups(void) { 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_powerups_baralign == 1 || autocvar_hud_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(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); + HUD_Panel_GetProgressBarColor(leftname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + DrawNumIcon(autocvar_hud_powerups_iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, '1 1 1'); + // TODO: expand + //if(leftcnt <= 5) + // drawpic_aspect_skin_expanding_two(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * panel_fg_alpha, DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1)); + //else + // drawpic_aspect_skin(picpos, leftname, eX * (1/6) * mySize_x + eY * mySize_y, '1 1 1', leftalpha * panel_fg_alpha, DRAWFLAG_NORMAL); } if(rightcnt) { - len = strlen(ftos(rightcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(autocvar_hud_powerups_baralign == 0 || autocvar_hud_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(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); + HUD_Panel_GetProgressBarColor(rightname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + DrawNumIcon(autocvar_hud_powerups_iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, '1 1 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_powerups_baralign == 1 || autocvar_hud_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(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); + HUD_Panel_GetProgressBarColor(leftname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + DrawNumIcon(autocvar_hud_powerups_iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, '1 1 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_powerups_baralign == 0 || autocvar_hud_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(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); + HUD_Panel_GetProgressBarColor(rightname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + DrawNumIcon(autocvar_hud_powerups_iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, '1 1 1'); } } else { if(leftcnt) { - len = strlen(ftos(leftcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(autocvar_hud_powerups_baralign == 1 || autocvar_hud_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_powerups_iconalign == 1 || autocvar_hud_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(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); + HUD_Panel_GetProgressBarColor(leftname) + HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + //if(leftcnt <= 5) + //drawpic_aspect_skin_expanding_two(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * panel_fg_alpha, DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1)); + //else + 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, 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_powerups_baralign == 0 || autocvar_hud_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(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); + if(autocvar_hud_powerups_iconalign == 0 || autocvar_hud_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; + } + + HUD_Panel_GetProgressBarColor(rightname) + HUD_Panel_DrawProgressBar(barpos, 1, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + //if(rightcnt <= 5) + // drawpic_aspect_skin_expanding_two(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * panel_fg_alpha, DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1)); + //else + 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, 0.25 * mySize_x, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); } } + drawfont = hud_font; } // Health/armor (#3) // void HUD_HealthArmor(void) { + if(!autocvar_hud_healtharmor && !autocvar__hud_configure) + return; + float id = HUD_PANEL_HEALTHARMOR; + HUD_Panel_UpdateCvarsForId(id); 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 +2054,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 +2064,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_healtharmor == 2) // combined health and armor display { vector v; v = healtharmor_maxdamage(health, armor, armorblockpercent); @@ -1945,53 +2077,54 @@ void HUD_HealthArmor(void) float x; x = floor(v_x + 1); - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(autocvar_hud_healtharmor_baralign == 1 || autocvar_hud_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"; + 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"; + 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_healtharmor_iconalign, pos, mySize, x, biggercount, 1, HUD_Get_Num_Color(x, 2 * 200)); // 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_healtharmor_baralign == 0 || autocvar_hud_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_healtharmor_flip) { // old style layout with armor left/top of health leftname = "armor"; leftcnt = armor; if(leftcnt) @@ -2015,172 +2148,163 @@ 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_healtharmor_baralign == 1 || autocvar_hud_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)); + HUD_Panel_GetProgressBarColor(leftname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + DrawNumIcon(autocvar_hud_healtharmor_iconalign, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, 200)); } if(rightactive) { - len = strlen(ftos(rightcnt)); - - if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) { + if(autocvar_hud_healtharmor_baralign == 0 || autocvar_hud_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)); + HUD_Panel_GetProgressBarColor(rightname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + DrawNumIcon(autocvar_hud_healtharmor_iconalign, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(leftcnt, 200)); } - 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_healtharmor_baralign == 0 || autocvar_hud_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_healtharmor_baralign == 1 || autocvar_hud_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 { + barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; + } 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; + barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 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)); + HUD_Panel_GetProgressBarColor(leftname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + DrawNumIcon(autocvar_hud_healtharmor_iconalign, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, 200)); } 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_healtharmor_baralign == 0 || autocvar_hud_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)); + HUD_Panel_GetProgressBarColor(rightname) + HUD_Panel_DrawProgressBar(barpos, 0, barsize, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + DrawNumIcon(autocvar_hud_healtharmor_iconalign, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(leftcnt, 200)); } - 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_healtharmor_baralign == 0 || autocvar_hud_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_healtharmor_baralign == 1 || autocvar_hud_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_healtharmor_iconalign == 1 || autocvar_hud_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)); + 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, 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_healtharmor_baralign == 0 || autocvar_hud_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_healtharmor_iconalign == 0 || autocvar_hud_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; + } + + 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, 0.25 * mySize_x, HUD_Get_Num_Color(rightcnt, 200), panel_fg_alpha, DRAWFLAG_NORMAL); } - 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(fuel) - HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL); + { + if(autocvar_hud_healtharmor_baralign == 0 || autocvar_hud_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) // @@ -2232,7 +2356,7 @@ 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 + alsoprint = (autocvar_hud_notify_print || !panel_enabled); // print message to console if: notify panel disabled, or cvar to do so enabled if(msg == MSG_SUICIDE) { // TODO: cl_gentle @@ -2642,50 +2766,51 @@ void HUD_Centerprint(string s1, string s2, float type, float msg) void HUD_Notify (void) { + if(!autocvar_hud_notify && !autocvar__hud_configure) + return; + float id = HUD_PANEL_NOTIFY; + HUD_Panel_UpdateCvarsForId(id); 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_notify_time; float fadetime; - fadetime = cvar("hud_notify_fadetime"); + fadetime = autocvar_hud_notify_fadetime; string s; + vector color; 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_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 +2828,202 @@ 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"; + color = '1 1 1'; } 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"; + color = '1 1 1'; } 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"; + color = '1 1 1'; } 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"; + color = '1 1 1'; } 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"; + color = '1 0 0'; } 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"; + color = '0 0 1'; } 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_"; + color = '1 1 1'; } 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_"; + color = '1 1 1'; } 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_"; + color = '1 1 1'; } 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_"; + color = '1 1 1'; } 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_"; + color = '1 1 1'; } 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_"; + color = '1 1 1'; } else if(killnotify_deathtype[j] == INFO_GOTFLAG) { if(killnotify_victims[j] == "^1RED^7 flag") - s = "red"; + { + s = "flag_red_carrying"; + color = '1 0 0'; + } 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 = "flag_blue_carrying"; + color = '0 0 1'; + } } else if(killnotify_deathtype[j] == INFO_RETURNFLAG) { if(killnotify_victims[j] == "^1RED^7 flag") - s = "red"; + { + s = "flag_red_taken"; + color = '1 0 0'; + } 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 = "flag_blue_taken"; + color = '0 0 1'; + } } else if(killnotify_deathtype[j] == INFO_LOSTFLAG) { if(killnotify_victims[j] == "^1RED^7 flag") - s = "red"; + { + s = "flag_red_lost"; + color = '1 0 0'; + } 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); + { + s = "flag_blue_lost"; + color = '0 0 1'; + } + } + if(s != "" && a) + { + drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, color, 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"; + color = '1 1 1'; } 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); + color = '1 1 1'; } 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"; + color = '1 0 0'; } 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"; + color = '0 0 1'; } 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"; + color = '1 1 1'; } 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"; + color = '1 1 1'; } 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"; + color = '1 1 1'; } 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"; + color = '1 1 1'; } 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"; + color = '1 1 1'; } 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"; + color = '1 1 1'; } - 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, color, 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 +3039,20 @@ string seconds_tostring(float sec) void HUD_Timer(void) { + if(!autocvar_hud_timer && !autocvar__hud_configure) + return; + float id = HUD_PANEL_TIMER; + HUD_Panel_UpdateCvarsForId(id); 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 +3073,7 @@ void HUD_Timer(void) else timer_color = '1 0 0'; //red - if (cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) { + if (autocvar_hud_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 +3085,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, mySize_y, timer_color, panel_fg_alpha, DRAWFLAG_NORMAL); + drawfont = hud_font; } // Radar (#6) // void HUD_Radar(void) { + if (!(autocvar_hud_radar != 0 && (autocvar_hud_radar == 2 || teamplay || autocvar__hud_configure))) + return; + float id = HUD_PANEL_RADAR; + HUD_Panel_UpdateCvarsForId(id); 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 @@ -3214,7 +3206,7 @@ void HUD_Radar(void) 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,22 +3222,24 @@ void HUD_Radar(void) // void HUD_Score(void) { + if(!autocvar_hud_score && !autocvar__hud_configure) + return; + float id = HUD_PANEL_SCORE; + HUD_Panel_UpdateCvarsForId(id); 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; + float score_len; vector distribution_color; entity tm, pl, me; me = (spectatee_status > 0) ? playerslots[spectatee_status - 1] : playerslots[player_localentnum - 1]; @@ -3289,20 +3283,20 @@ void HUD_Score(void) distribution_color = eX; minusplus = 2; // minusplus 1: always prefix with plus sign } - 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); + //HUD_DrawXNum(bottomright - '0 48 0' - '16 0 0' * TIME_DECIMALS, distmsec, -TIME_DECIMALS, 0, 16, distribution_color, 0, 0, panel_fg_alpha, DRAWFLAG_NORMAL); + //HUD_DrawXNum(bottomright - '68 48 0' - '16 0 0' * TIME_DECIMALS, distsec, 4, minusplus, 16, distribution_color, 0, 0, panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(bottomright - '10 48 0' - '16 0 0' * TIME_DECIMALS, "num_dot", '16 16 0', distribution_color, panel_fg_alpha, DRAWFLAG_ADDITIVE); } // 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); + drawpic_aspect_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', panel_fg_alpha, 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', racemsec, -TIME_DECIMALS, 0, 30, '1 1 1', 0, 0, panel_fg_alpha, 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, panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '18 0 0', "num_dot", '30 30 0', '1 1 1', panel_fg_alpha, 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); + //HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '132 0 0', racemin, -2, 0, 30, '1 1 1', 0, 0, panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '84 0 0', "num_colon", '30 30 0', '1 1 1', panel_fg_alpha, DRAWFLAG_ADDITIVE); */ } else if (!teamplay) { // non-teamgames // me vector := [team/connected frags id] @@ -3310,7 +3304,7 @@ void HUD_Score(void) 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 +3312,7 @@ void HUD_Score(void) distribution = 0; score = me.(scores[ps_primary]); - if(hud_configure) + if(autocvar__hud_configure) score = 123; if(distribution >= 5) { @@ -3333,22 +3327,23 @@ void HUD_Score(void) 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, (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, 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; @@ -3361,14 +3356,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, 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, (1/3) * mySize_y, GetTeamRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL); teamnum += 1; } } @@ -3378,32 +3375,52 @@ void HUD_Score(void) // Race timer (#8) // void HUD_RaceTimer (void) { + if(!autocvar_hud_racetimer && !(gametype == GAME_RACE || gametype == GAME_CTS) && !autocvar__hud_configure) + return; + float id = HUD_PANEL_RACETIMER; + HUD_Panel_UpdateCvarsForId(id); 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) { @@ -3437,8 +3454,8 @@ 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(m - '0 16 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', panel_fg_alpha * 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) @@ -3448,16 +3465,16 @@ void HUD_RaceTimer (void) { { 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(m - '0 32 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', panel_fg_alpha * 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(m - '16 0 0' * stringwidth(forcetime, FALSE), forcetime, '32 32 0', '1 1 1', panel_fg_alpha, 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 +3482,8 @@ 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(m - '16 0 0' * stringwidth(s, FALSE), s, '32 32 0', '1 1 1', panel_fg_alpha * 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 @@ -3476,16 +3493,16 @@ 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(m - '0 16 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', panel_fg_alpha * 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(m - '0 0 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', panel_fg_alpha * 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) @@ -3499,8 +3516,8 @@ void HUD_RaceTimer (void) { 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(m - '0 32 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', panel_fg_alpha * 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 +3539,14 @@ float vote_change; // "time" when vote_active changed void HUD_VoteWindow(void) { + if(!autocvar_hud_vote && !autocvar__hud_configure) + return; + float id = HUD_PANEL_VOTE; + HUD_Panel_UpdateCvarsForId(id); 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 +3555,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 +3570,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_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; + + pos_x = pos_x + (mySize_x - newSize_x) / 2; + } + else + { + newSize_y = 1/3 * mySize_x; + newSize_x = mySize_x; + + pos_y = pos_y + (mySize_y - newSize_y) / 2; + } + mySize = newSize; - 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 = "A vote has been called for:"; + drawstring_aspect(pos, s, eX * mySize_x + eY * (2/8) * mySize_y, mySize_y*(2/8), '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 = "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); + drawstring_aspect(pos + eY * (2/8) * mySize_y, s, eX * mySize_x + eY * (1.75/8) * mySize_y, mySize_y*(1.75/8), '1 1 1', a * panel_fg_alpha, DRAWFLAG_NORMAL); // 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); - - // 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 = 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, mySize_y*(1.5/8) , '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, mySize_y*(1.5/8) , '1 0 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, "voteprogress_prog", mySize, eX, a * HUD_Panel_GetFgAlpha(id), 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 +3671,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 +3782,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 +3878,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 +3902,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 +3973,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 +4029,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, 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, 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, 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, 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + //drawstring_expanding(pos, "Personal best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', panel_fg_alpha, 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', panel_fg_alpha, DRAWFLAG_NORMAL, f); } // server record @@ -4008,13 +4047,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, 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, 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, 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, 0.25 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + //drawstring_expanding(pos + eY * 0.5 * mySize_y, "Server best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', panel_fg_alpha, 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', panel_fg_alpha, DRAWFLAG_NORMAL, f); } if (race_status != race_status_prev || race_status_name != race_status_name_prev) { @@ -4045,22 +4084,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 +4121,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_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; + HUD_Panel_UpdateCvarsForId(id); 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,49 +4167,77 @@ void HUD_ModIcons(void) // void HUD_DrawPressedKeys(void) { + if(!autocvar_hud_pressedkeys && !autocvar__hud_configure) + return; + + if(!(spectatee_status > 0 || autocvar_hud_pressedkeys >= 2 || autocvar__hud_configure)) + return; + float id = HUD_PANEL_PRESSEDKEYS; + HUD_Panel_UpdateCvarsForId(id); 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 2:1 aspect + vector newSize; + if(mySize_x/mySize_y > 2) + { + newSize_x = 2 * 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/2 * mySize_x; + newSize_x = mySize_x; + + pos_y = pos_y + (mySize_y - newSize_y) / 2; } + mySize = newSize; vector keysize; keysize = eX * mySize_x * (1/3) + eY * mySize_y * 0.5; 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) { + if(!autocvar_hud_chat && !autocvar__hud_configure) + { + cvar_set("con_chatrect", "0"); + return; + } + float id = HUD_PANEL_CHAT; + HUD_Panel_UpdateCvarsForId(id); 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; } cvar_set("con_chatrect", "1"); @@ -4179,7 +4248,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 +4257,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,18 +4276,20 @@ float frametimeavg1; // 1 frame ago float frametimeavg2; // 2 frames ago void HUD_EngineInfo(void) { + if(!autocvar_hud_engineinfo && !autocvar__hud_configure) + return; + float id = HUD_PANEL_ENGINEINFO; + HUD_Panel_UpdateCvarsForId(id); 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")) @@ -4249,8 +4320,228 @@ 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_engineinfo_framecounter_decimals"))), mySize, mySize_y, color, panel_fg_alpha, DRAWFLAG_NORMAL); + drawfont = hud_font; +} + +// Info messages panel (#14) +// +void HUD_InfoMessages(void) +{ + if(!autocvar_hud_infomessages && !autocvar__hud_configure) + return; + + float id = HUD_PANEL_INFOMESSAGES; + HUD_Panel_UpdateCvarsForId(id); + 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 6:1 aspect + vector newSize; + if(mySize_x/mySize_y > 6) + { + newSize_x = 6 * mySize_y; + newSize_y = mySize_y; + + pos_x = pos_x + (mySize_x - newSize_x) / 2; + } + else + { + newSize_y = 1/6 * 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.25 0.25 0' * mySize_y; + + string s; + if(!autocvar__hud_configure) + { + 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, panel_fg_alpha, 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"); + if(autocvar_hud_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_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_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_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_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_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_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_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_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_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_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_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,12 +4653,48 @@ void HUD_Reset (void) HUD_Mod_CTF_Reset(); } +#define HUD_DrawPanel(id)\ +switch (id) {\ + case (HUD_PANEL_RADAR):\ + HUD_Radar(); break;\ + case (HUD_PANEL_WEAPONICONS):\ + HUD_WeaponIcons(); break;\ + case (HUD_PANEL_INVENTORY):\ + HUD_Inventory(); 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); @@ -4377,63 +4704,66 @@ void HUD_Main (void) 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_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) { + HUD_DrawPanel(panel_order[i]); + } // TODO hud_'ify these if (cvar("cl_showspeed")) @@ -4441,9 +4771,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..71de37649b 100644 --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@ -1,8 +1,12 @@ +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; @@ -12,6 +16,11 @@ 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,232 @@ 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 + +// TODO: shirt, pants, team colors +#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_bg;\ + } else if(panel_bg_str == "0" && autocvar__hud_configure) {\ + panel_bg = "border";\ + } else {\ + panel_bg = panel_bg_str;\ + }\ + panel_bg = strcat(hud_skin_path, "/", panel_bg);\ + 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(panel_bg_color_str == "") {\ + panel_bg_color = autocvar_hud_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_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_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_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_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_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() + +// Update all common cvars of given panel name +#define HUD_Panel_UpdateCvars(name) \ +panel_enabled = autocvar_hud_##name; \ +panel_pos = autocvar_hud_##name##_pos; \ +panel_size = autocvar_hud_##name##_size; \ +panel_bg_str = autocvar_hud_##name##_bg; \ +panel_bg_color_str = autocvar_hud_##name##_bg_color; \ +panel_bg_color_team_str = autocvar_hud_##name##_bg_color_team; \ +panel_bg_alpha_str = autocvar_hud_##name##_bg_alpha; \ +panel_bg_border_str = autocvar_hud_##name##_bg_border; \ +panel_bg_padding_str = autocvar_hud_##name##_bg_padding; \ +HUD_Panel_StringVars() + +// Update all common cvars of given panel id +#define HUD_Panel_UpdateCvarsForId(id) \ +active_panel = id; \ +switch(id) { \ + case HUD_PANEL_WEAPONICONS: HUD_Panel_UpdateCvars(weaponicons) break; \ + case HUD_PANEL_INVENTORY: HUD_Panel_UpdateCvars(inventory) 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_##name##_pos; \ +panel_size = autocvar_hud_##name##_size; \ +HUD_Panel_GetScaledVectors()\ +panel_bg_border_str = autocvar_hud_##name##_bg_border; \ +HUD_Panel_GetBorder() + +// Update pos and size of given panel id +#define HUD_Panel_UpdatePosSizeForId(id) \ +switch(id) { \ + case HUD_PANEL_WEAPONICONS: HUD_Panel_UpdatePosSize(weaponicons) break;\ + case HUD_PANEL_INVENTORY: HUD_Panel_UpdatePosSize(inventory) 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/scoreboard.qc b/qcsrc/client/scoreboard.qc index 36168ea2e7..b0cb8712d1 100644 --- a/qcsrc/client/scoreboard.qc +++ b/qcsrc/client/scoreboard.qc @@ -870,7 +870,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; @@ -966,7 +968,18 @@ 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_weaponicons_accuracy_yellow) { + rgb_x = 1 - (weapon_stats-autocvar_hud_weaponicons_accuracy_yellow)/(100-autocvar_hud_weaponicons_accuracy_yellow); // red value between 1 -> 0 + rgb_y = 1; + } else { + rgb_x = 1; + rgb_y = weapon_stats/autocvar_hud_weaponicons_accuracy_yellow; // green value between 0 -> 1 + } 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; @@ -1114,10 +1127,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/common/constants.qh b/qcsrc/common/constants.qh index 29d2704fd4..9eebbfb6c6 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; @@ -603,6 +604,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_WEAPONICONS = "weaponicons"; +string HUD_PANELNAME_INVENTORY = "inventory"; +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..41e792ed88 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_WEAPONICONS: panel_name = HUD_PANELNAME_WEAPONICONS; break; \ + case HUD_PANEL_INVENTORY: panel_name = HUD_PANELNAME_INVENTORY; 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/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/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/g_damage.qc b/qcsrc/server/g_damage.qc index 30e49cd56f..48cd14ee0a 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -294,19 +294,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 +302,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 +346,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); }