]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge commit 'origin/master' into diabolik/nexmodel
authorSahil Singhal <sahil@sahil-desktop.(none)>
Thu, 24 Jun 2010 03:54:55 +0000 (23:54 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Thu, 24 Jun 2010 03:54:55 +0000 (23:54 -0400)
717 files changed:
balance.cfg
defaultXonotic.cfg
gfx/accident_radar.tga [deleted file]
gfx/aggressor_mini.tga [deleted file]
gfx/aneurysm_radar.tga [deleted file]
gfx/basement_radar.tga [deleted file]
gfx/basementctf_radar.tga [deleted file]
gfx/bleach_radar.tga [deleted file]
gfx/bloodprison_radar.tga [deleted file]
gfx/bloodprisonctf_radar.tga [deleted file]
gfx/bluesky_radar.tga [deleted file]
gfx/darkzone_radar.tga [deleted file]
gfx/desertfactory_radar.tga [deleted file]
gfx/dieselpower_radar.tga [deleted file]
gfx/downer_radar.tga [deleted file]
gfx/eggandbacon_mini.tga [deleted file]
gfx/evilspace_radar.tga [deleted file]
gfx/farewell_radar.tga [deleted file]
gfx/final_rage_radar.tga [deleted file]
gfx/finale.tga [deleted file]
gfx/hud/accelerometer_gradient.tga [deleted file]
gfx/hud/default/border.tga [new file with mode: 0644]
gfx/hud/default/borderx.tga [new file with mode: 0644]
gfx/hud/inv_weapon0.tga [deleted file]
gfx/hud/inv_weapon1.tga [deleted file]
gfx/hud/inv_weapon10.tga [deleted file]
gfx/hud/inv_weapon11.tga [deleted file]
gfx/hud/inv_weapon12.tga [deleted file]
gfx/hud/inv_weapon13.tga [deleted file]
gfx/hud/inv_weapon14.tga [deleted file]
gfx/hud/inv_weapon15.tga [deleted file]
gfx/hud/inv_weapon2.tga [deleted file]
gfx/hud/inv_weapon3.tga [deleted file]
gfx/hud/inv_weapon4.tga [deleted file]
gfx/hud/inv_weapon5.tga [deleted file]
gfx/hud/inv_weapon6.tga [deleted file]
gfx/hud/inv_weapon7.tga [deleted file]
gfx/hud/inv_weapon8.tga [deleted file]
gfx/hud/inv_weapon9.tga [deleted file]
gfx/hud/inv_weapon_hlacmod_renameit.tga [deleted file]
gfx/hud/inv_weaponcampingrifle.tga [deleted file]
gfx/hud/inv_weaponcrylink.tga [deleted file]
gfx/hud/inv_weaponelectro.tga [deleted file]
gfx/hud/inv_weaponfireball.tga [deleted file]
gfx/hud/inv_weapongrenadelauncher.tga [deleted file]
gfx/hud/inv_weaponhagar.tga [deleted file]
gfx/hud/inv_weaponhlac.tga [deleted file]
gfx/hud/inv_weaponhook.tga [deleted file]
gfx/hud/inv_weaponlaser.tga [deleted file]
gfx/hud/inv_weaponminstanex.tga [deleted file]
gfx/hud/inv_weaponnex.tga [deleted file]
gfx/hud/inv_weaponporto.tga [deleted file]
gfx/hud/inv_weaponrocketlauncher.tga [deleted file]
gfx/hud/inv_weaponseeker.tga [deleted file]
gfx/hud/inv_weaponshotgun.tga [deleted file]
gfx/hud/inv_weapontuba.tga [deleted file]
gfx/hud/inv_weaponuzi.tga [deleted file]
gfx/hud/keys/key_backward.tga [deleted file]
gfx/hud/keys/key_backward_inv.tga [deleted file]
gfx/hud/keys/key_bg.tga [deleted file]
gfx/hud/keys/key_crouch.tga [deleted file]
gfx/hud/keys/key_crouch_inv.tga [deleted file]
gfx/hud/keys/key_forward.tga [deleted file]
gfx/hud/keys/key_forward_inv.tga [deleted file]
gfx/hud/keys/key_jump.tga [deleted file]
gfx/hud/keys/key_jump_inv.tga [deleted file]
gfx/hud/keys/key_left.tga [deleted file]
gfx/hud/keys/key_left_inv.tga [deleted file]
gfx/hud/keys/key_right.tga [deleted file]
gfx/hud/keys/key_right_inv.tga [deleted file]
gfx/hud/num_0.tga [deleted file]
gfx/hud/num_0_stroke.tga [deleted file]
gfx/hud/num_1.tga [deleted file]
gfx/hud/num_1_stroke.tga [deleted file]
gfx/hud/num_2.tga [deleted file]
gfx/hud/num_2_stroke.tga [deleted file]
gfx/hud/num_3.tga [deleted file]
gfx/hud/num_3_stroke.tga [deleted file]
gfx/hud/num_4.tga [deleted file]
gfx/hud/num_4_stroke.tga [deleted file]
gfx/hud/num_5.tga [deleted file]
gfx/hud/num_5_stroke.tga [deleted file]
gfx/hud/num_6.tga [deleted file]
gfx/hud/num_6_stroke.tga [deleted file]
gfx/hud/num_7.tga [deleted file]
gfx/hud/num_7_stroke.tga [deleted file]
gfx/hud/num_8.tga [deleted file]
gfx/hud/num_8_stroke.tga [deleted file]
gfx/hud/num_9.tga [deleted file]
gfx/hud/num_9_stroke.tga [deleted file]
gfx/hud/num_colon.tga [deleted file]
gfx/hud/num_colon_stroke.tga [deleted file]
gfx/hud/num_dot.tga [deleted file]
gfx/hud/num_dot_stroke.tga [deleted file]
gfx/hud/num_minus.tga [deleted file]
gfx/hud/num_minus_stroke.tga [deleted file]
gfx/hud/num_plus.tga [deleted file]
gfx/hud/num_plus_stroke.tga [deleted file]
gfx/hud/old/ammo_bullets.tga [new file with mode: 0644]
gfx/hud/old/ammo_cells.tga [new file with mode: 0644]
gfx/hud/old/ammo_current_bg.tga [new file with mode: 0644]
gfx/hud/old/ammo_fuel.tga [new file with mode: 0644]
gfx/hud/old/ammo_rockets.tga [new file with mode: 0644]
gfx/hud/old/ammo_shells.tga [new file with mode: 0644]
gfx/hud/old/armor.tga [new file with mode: 0644]
gfx/hud/old/border.tga [new file with mode: 0644]
gfx/hud/old/border_radar.tga [new file with mode: 0644]
gfx/hud/old/dock.tga [new file with mode: 0644]
gfx/hud/old/flag_blue_carrying.tga [new file with mode: 0644]
gfx/hud/old/flag_blue_lost.tga [new file with mode: 0644]
gfx/hud/old/flag_blue_shielded.tga [new file with mode: 0644]
gfx/hud/old/flag_blue_taken.tga [new file with mode: 0644]
gfx/hud/old/flag_red_carrying.tga [new file with mode: 0644]
gfx/hud/old/flag_red_lost.tga [new file with mode: 0644]
gfx/hud/old/flag_red_shielded.tga [new file with mode: 0644]
gfx/hud/old/flag_red_taken.tga [new file with mode: 0644]
gfx/hud/old/health.tga [new file with mode: 0644]
gfx/hud/old/key_backward.tga [new file with mode: 0644]
gfx/hud/old/key_backward_inv.tga [new file with mode: 0644]
gfx/hud/old/key_bg.tga [new file with mode: 0644]
gfx/hud/old/key_crouch.tga [new file with mode: 0644]
gfx/hud/old/key_crouch_inv.tga [new file with mode: 0644]
gfx/hud/old/key_forward.tga [new file with mode: 0644]
gfx/hud/old/key_forward_inv.tga [new file with mode: 0644]
gfx/hud/old/key_jump.tga [new file with mode: 0644]
gfx/hud/old/key_jump_inv.tga [new file with mode: 0644]
gfx/hud/old/key_left.tga [new file with mode: 0644]
gfx/hud/old/key_left_inv.tga [new file with mode: 0644]
gfx/hud/old/key_right.tga [new file with mode: 0644]
gfx/hud/old/key_right_inv.tga [new file with mode: 0644]
gfx/hud/old/kh_blue.tga [new file with mode: 0644]
gfx/hud/old/kh_bluearrow.tga [new file with mode: 0644]
gfx/hud/old/kh_pink.tga [new file with mode: 0644]
gfx/hud/old/kh_pinkarrow.tga [new file with mode: 0644]
gfx/hud/old/kh_red.tga [new file with mode: 0644]
gfx/hud/old/kh_redarrow.tga [new file with mode: 0644]
gfx/hud/old/kh_yellow.tga [new file with mode: 0644]
gfx/hud/old/kh_yellowarrow.tga [new file with mode: 0644]
gfx/hud/old/nexball_carrying.tga [new file with mode: 0644]
gfx/hud/old/num_0.tga [new file with mode: 0644]
gfx/hud/old/num_0_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_1.tga [new file with mode: 0644]
gfx/hud/old/num_1_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_2.tga [new file with mode: 0644]
gfx/hud/old/num_2_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_3.tga [new file with mode: 0644]
gfx/hud/old/num_3_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_4.tga [new file with mode: 0644]
gfx/hud/old/num_4_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_5.tga [new file with mode: 0644]
gfx/hud/old/num_5_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_6.tga [new file with mode: 0644]
gfx/hud/old/num_6_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_7.tga [new file with mode: 0644]
gfx/hud/old/num_7_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_8.tga [new file with mode: 0644]
gfx/hud/old/num_8_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_9.tga [new file with mode: 0644]
gfx/hud/old/num_9_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_colon.tga [new file with mode: 0644]
gfx/hud/old/num_colon_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_dot.tga [new file with mode: 0644]
gfx/hud/old/num_dot_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_leading_1.tga [new file with mode: 0644]
gfx/hud/old/num_leading_2.tga [new file with mode: 0644]
gfx/hud/old/num_leading_3.tga [new file with mode: 0644]
gfx/hud/old/num_minus.tga [new file with mode: 0644]
gfx/hud/old/num_minus_stroke.tga [new file with mode: 0644]
gfx/hud/old/num_plus.tga [new file with mode: 0644]
gfx/hud/old/num_plus_stroke.tga [new file with mode: 0644]
gfx/hud/old/race_newfail.tga [new file with mode: 0644]
gfx/hud/old/race_newrankgreen.tga [new file with mode: 0644]
gfx/hud/old/race_newrankyellow.tga [new file with mode: 0644]
gfx/hud/old/race_newrecordserver.tga [new file with mode: 0644]
gfx/hud/old/race_newtime.tga [new file with mode: 0644]
gfx/hud/old/rifle_ring_1.tga [new file with mode: 0644]
gfx/hud/old/rifle_ring_2.tga [new file with mode: 0644]
gfx/hud/old/rifle_ring_3.tga [new file with mode: 0644]
gfx/hud/old/rifle_ring_4.tga [new file with mode: 0644]
gfx/hud/old/rifle_ring_5.tga [new file with mode: 0644]
gfx/hud/old/rifle_ring_6.tga [new file with mode: 0644]
gfx/hud/old/rifle_ring_7.tga [new file with mode: 0644]
gfx/hud/old/rifle_ring_8.tga [new file with mode: 0644]
gfx/hud/old/shield.tga [new file with mode: 0644]
gfx/hud/old/statusbar.tga [new file with mode: 0644]
gfx/hud/old/statusbar_vertical.tga [new file with mode: 0644]
gfx/hud/old/strength.tga [new file with mode: 0644]
gfx/hud/old/voteprogress_back.tga [new file with mode: 0644]
gfx/hud/old/voteprogress_prog.tga [new file with mode: 0644]
gfx/hud/old/voteprogress_voted.tga [new file with mode: 0644]
gfx/hud/old/weapon_accuracy.tga [new file with mode: 0644]
gfx/hud/old/weapon_current_bg.tga [new file with mode: 0644]
gfx/hud/old/weapon_hlacmod_renameit.tga [new file with mode: 0644]
gfx/hud/old/weaponcampingrifle.tga [new file with mode: 0644]
gfx/hud/old/weaponcrylink.tga [new file with mode: 0644]
gfx/hud/old/weaponelectro.tga [new file with mode: 0644]
gfx/hud/old/weaponfireball.tga [new file with mode: 0644]
gfx/hud/old/weapongrenadelauncher.tga [new file with mode: 0644]
gfx/hud/old/weaponhagar.tga [new file with mode: 0644]
gfx/hud/old/weaponhlac.tga [new file with mode: 0644]
gfx/hud/old/weaponhook.tga [new file with mode: 0644]
gfx/hud/old/weaponlaser.tga [new file with mode: 0644]
gfx/hud/old/weaponminstanex.tga [new file with mode: 0644]
gfx/hud/old/weaponnex.tga [new file with mode: 0644]
gfx/hud/old/weaponporto.tga [new file with mode: 0644]
gfx/hud/old/weaponrocketlauncher.tga [new file with mode: 0644]
gfx/hud/old/weaponseeker.tga [new file with mode: 0644]
gfx/hud/old/weaponshotgun.tga [new file with mode: 0644]
gfx/hud/old/weapontuba.tga [new file with mode: 0644]
gfx/hud/old/weaponuzi.tga [new file with mode: 0644]
gfx/hud/race/newfail.tga [deleted file]
gfx/hud/race/newrankgreen.tga [deleted file]
gfx/hud/race/newrankyellow.tga [deleted file]
gfx/hud/race/newrecordserver.tga [deleted file]
gfx/hud/race/newtime.tga [deleted file]
gfx/hud/rifle_ring_1.tga [deleted file]
gfx/hud/rifle_ring_2.tga [deleted file]
gfx/hud/rifle_ring_3.tga [deleted file]
gfx/hud/rifle_ring_4.tga [deleted file]
gfx/hud/rifle_ring_5.tga [deleted file]
gfx/hud/rifle_ring_6.tga [deleted file]
gfx/hud/rifle_ring_7.tga [deleted file]
gfx/hud/rifle_ring_8.tga [deleted file]
gfx/hud/sb_accuracy.tga [deleted file]
gfx/hud/sb_accuracy_bar.tga [deleted file]
gfx/hud/sb_ammobg.tga [deleted file]
gfx/hud/sb_armor.tga [deleted file]
gfx/hud/sb_bullets.tga [deleted file]
gfx/hud/sb_cells.tga [deleted file]
gfx/hud/sb_flag_blue_carrying.tga [deleted file]
gfx/hud/sb_flag_blue_lost.tga [deleted file]
gfx/hud/sb_flag_blue_shielded.tga [deleted file]
gfx/hud/sb_flag_blue_taken.tga [deleted file]
gfx/hud/sb_flag_red_carrying.tga [deleted file]
gfx/hud/sb_flag_red_lost.tga [deleted file]
gfx/hud/sb_flag_red_shielded.tga [deleted file]
gfx/hud/sb_flag_red_taken.tga [deleted file]
gfx/hud/sb_fuel.tga [deleted file]
gfx/hud/sb_health.tga [deleted file]
gfx/hud/sb_highlight_1.tga [deleted file]
gfx/hud/sb_highlight_2.tga [deleted file]
gfx/hud/sb_highlight_3.tga [deleted file]
gfx/hud/sb_highlight_4.tga [deleted file]
gfx/hud/sb_invinc.tga [deleted file]
gfx/hud/sb_kh_blue.tga [deleted file]
gfx/hud/sb_kh_bluearrow.tga [deleted file]
gfx/hud/sb_kh_pink.tga [deleted file]
gfx/hud/sb_kh_pinkarrow.tga [deleted file]
gfx/hud/sb_kh_red.tga [deleted file]
gfx/hud/sb_kh_redarrow.tga [deleted file]
gfx/hud/sb_kh_yellow.tga [deleted file]
gfx/hud/sb_kh_yellowarrow.tga [deleted file]
gfx/hud/sb_nexball_carrying.tga [deleted file]
gfx/hud/sb_rocket.tga [deleted file]
gfx/hud/sb_scoreboard_bg.tga [deleted file]
gfx/hud/sb_scoreboard_tableheader.tga [deleted file]
gfx/hud/sb_shells.tga [deleted file]
gfx/hud/sb_str.tga [deleted file]
gfx/hud/sb_timerbg.tga [deleted file]
gfx/hud/sbar.tga [deleted file]
gfx/hud/voteprogress_back.tga [deleted file]
gfx/hud/voteprogress_prog.tga [deleted file]
gfx/hud/voteprogress_voted.tga [deleted file]
gfx/hud/wickedhud/ammo_bullets.tga [new file with mode: 0644]
gfx/hud/wickedhud/ammo_cells.tga [new file with mode: 0644]
gfx/hud/wickedhud/ammo_current_bg.tga [new file with mode: 0644]
gfx/hud/wickedhud/ammo_fuel.tga [new file with mode: 0644]
gfx/hud/wickedhud/ammo_rockets.tga [new file with mode: 0644]
gfx/hud/wickedhud/ammo_shells.tga [new file with mode: 0644]
gfx/hud/wickedhud/armor.tga [new file with mode: 0644]
gfx/hud/wickedhud/border.tga [new file with mode: 0644]
gfx/hud/wickedhud/border_chat.tga [new file with mode: 0644]
gfx/hud/wickedhud/border_healtharmor.tga [new file with mode: 0644]
gfx/hud/wickedhud/border_inventory.tga [new file with mode: 0644]
gfx/hud/wickedhud/border_modicons.tga [new file with mode: 0644]
gfx/hud/wickedhud/border_powerups.tga [new file with mode: 0644]
gfx/hud/wickedhud/border_radar.tga [new file with mode: 0644]
gfx/hud/wickedhud/border_score.tga [new file with mode: 0644]
gfx/hud/wickedhud/border_timer.tga [new file with mode: 0644]
gfx/hud/wickedhud/border_vote.tga [new file with mode: 0644]
gfx/hud/wickedhud/border_weaponicons.tga [new file with mode: 0644]
gfx/hud/wickedhud/dock.tga [new file with mode: 0644]
gfx/hud/wickedhud/dock_small.tga [new file with mode: 0644]
gfx/hud/wickedhud/flag_blue_carrying.tga [new file with mode: 0644]
gfx/hud/wickedhud/flag_blue_lost.tga [new file with mode: 0644]
gfx/hud/wickedhud/flag_blue_shielded.tga [new file with mode: 0644]
gfx/hud/wickedhud/flag_blue_taken.tga [new file with mode: 0644]
gfx/hud/wickedhud/flag_red_carrying.tga [new file with mode: 0644]
gfx/hud/wickedhud/flag_red_lost.tga [new file with mode: 0644]
gfx/hud/wickedhud/flag_red_shielded.tga [new file with mode: 0644]
gfx/hud/wickedhud/flag_red_taken.tga [new file with mode: 0644]
gfx/hud/wickedhud/health.tga [new file with mode: 0644]
gfx/hud/wickedhud/key_backward.tga [new file with mode: 0644]
gfx/hud/wickedhud/key_backward_inv.tga [new file with mode: 0644]
gfx/hud/wickedhud/key_crouch.tga [new file with mode: 0644]
gfx/hud/wickedhud/key_crouch_inv.tga [new file with mode: 0644]
gfx/hud/wickedhud/key_forward.tga [new file with mode: 0644]
gfx/hud/wickedhud/key_forward_inv.tga [new file with mode: 0644]
gfx/hud/wickedhud/key_jump.tga [new file with mode: 0644]
gfx/hud/wickedhud/key_jump_inv.tga [new file with mode: 0644]
gfx/hud/wickedhud/key_left.tga [new file with mode: 0644]
gfx/hud/wickedhud/key_left_inv.tga [new file with mode: 0644]
gfx/hud/wickedhud/key_right.tga [new file with mode: 0644]
gfx/hud/wickedhud/key_right_inv.tga [new file with mode: 0644]
gfx/hud/wickedhud/kh_blue.tga [new file with mode: 0644]
gfx/hud/wickedhud/kh_bluearrow.tga [new file with mode: 0644]
gfx/hud/wickedhud/kh_pink.tga [new file with mode: 0644]
gfx/hud/wickedhud/kh_pinkarrow.tga [new file with mode: 0644]
gfx/hud/wickedhud/kh_red.tga [new file with mode: 0644]
gfx/hud/wickedhud/kh_redarrow.tga [new file with mode: 0644]
gfx/hud/wickedhud/kh_yellow.tga [new file with mode: 0644]
gfx/hud/wickedhud/kh_yellowarrow.tga [new file with mode: 0644]
gfx/hud/wickedhud/nexball_carrying.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_camping.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_death.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_fall.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_lava.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_outofammo.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_selfkill.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_shootingstar.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_slime.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_teamkill.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_void.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_water.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_0.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_0_stroke.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_1.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_1_stroke.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_2.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_2_stroke.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_3.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_3_stroke.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_4.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_4_stroke.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_5.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_5_stroke.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_6.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_6_stroke.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_7.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_7_stroke.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_8.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_8_stroke.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_9.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_9_stroke.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_colon.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_colon_stroke.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_dot.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_dot_stroke.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_leading_1.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_leading_2.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_leading_3.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_minus.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_minus_stroke.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_plus.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_plus_stroke.tga [new file with mode: 0644]
gfx/hud/wickedhud/race_newfail.tga [new file with mode: 0644]
gfx/hud/wickedhud/race_newrankgreen.tga [new file with mode: 0644]
gfx/hud/wickedhud/race_newrankyellow.tga [new file with mode: 0644]
gfx/hud/wickedhud/race_newrecordserver.tga [new file with mode: 0644]
gfx/hud/wickedhud/race_newtime.tga [new file with mode: 0644]
gfx/hud/wickedhud/rifle_ring_1.tga [new file with mode: 0644]
gfx/hud/wickedhud/rifle_ring_2.tga [new file with mode: 0644]
gfx/hud/wickedhud/rifle_ring_3.tga [new file with mode: 0644]
gfx/hud/wickedhud/rifle_ring_4.tga [new file with mode: 0644]
gfx/hud/wickedhud/rifle_ring_5.tga [new file with mode: 0644]
gfx/hud/wickedhud/rifle_ring_6.tga [new file with mode: 0644]
gfx/hud/wickedhud/rifle_ring_7.tga [new file with mode: 0644]
gfx/hud/wickedhud/rifle_ring_8.tga [new file with mode: 0644]
gfx/hud/wickedhud/shield.tga [new file with mode: 0644]
gfx/hud/wickedhud/statusbar.tga [new file with mode: 0644]
gfx/hud/wickedhud/statusbar_vertical.tga [new file with mode: 0644]
gfx/hud/wickedhud/strength.tga [new file with mode: 0644]
gfx/hud/wickedhud/voteprogress_back.tga [new file with mode: 0644]
gfx/hud/wickedhud/voteprogress_prog.tga [new file with mode: 0644]
gfx/hud/wickedhud/voteprogress_voted.tga [new file with mode: 0644]
gfx/hud/wickedhud/weapon_accuracy.tga [new file with mode: 0644]
gfx/hud/wickedhud/weapon_current_bg.tga [new file with mode: 0644]
gfx/hud/wickedhud/weapon_hlacmod_renameit.tga [new file with mode: 0644]
gfx/hud/wickedhud/weaponcampingrifle.tga [new file with mode: 0644]
gfx/hud/wickedhud/weaponcrylink.tga [new file with mode: 0644]
gfx/hud/wickedhud/weaponelectro.tga [new file with mode: 0644]
gfx/hud/wickedhud/weaponfireball.tga [new file with mode: 0644]
gfx/hud/wickedhud/weapongrenadelauncher.tga [new file with mode: 0644]
gfx/hud/wickedhud/weaponhagar.tga [new file with mode: 0644]
gfx/hud/wickedhud/weaponhlac.tga [new file with mode: 0644]
gfx/hud/wickedhud/weaponhook.tga [new file with mode: 0644]
gfx/hud/wickedhud/weaponlaser.tga [new file with mode: 0644]
gfx/hud/wickedhud/weaponminstanex.tga [new file with mode: 0644]
gfx/hud/wickedhud/weaponnex.tga [new file with mode: 0644]
gfx/hud/wickedhud/weaponporto.tga [new file with mode: 0644]
gfx/hud/wickedhud/weaponrocketlauncher.tga [new file with mode: 0644]
gfx/hud/wickedhud/weaponseeker.tga [new file with mode: 0644]
gfx/hud/wickedhud/weaponshotgun.tga [new file with mode: 0644]
gfx/hud/wickedhud/weapontuba.tga [new file with mode: 0644]
gfx/hud/wickedhud/weaponuzi.tga [new file with mode: 0644]
gfx/inv_weapon0.tga [deleted file]
gfx/inv_weapon1.tga [deleted file]
gfx/inv_weapon10.tga [deleted file]
gfx/inv_weapon11.tga [deleted file]
gfx/inv_weapon12.tga [deleted file]
gfx/inv_weapon13.tga [deleted file]
gfx/inv_weapon14.tga [deleted file]
gfx/inv_weapon15.tga [deleted file]
gfx/inv_weapon2.tga [deleted file]
gfx/inv_weapon3.tga [deleted file]
gfx/inv_weapon4.tga [deleted file]
gfx/inv_weapon5.tga [deleted file]
gfx/inv_weapon6.tga [deleted file]
gfx/inv_weapon7.tga [deleted file]
gfx/inv_weapon8.tga [deleted file]
gfx/inv_weapon9.tga [deleted file]
gfx/inv_weapon_hlacmod_renameit.tga [deleted file]
gfx/keys/key_backward.tga [deleted file]
gfx/keys/key_backward_inv.tga [deleted file]
gfx/keys/key_bg.tga [deleted file]
gfx/keys/key_crouch.tga [deleted file]
gfx/keys/key_crouch_inv.tga [deleted file]
gfx/keys/key_forward.tga [deleted file]
gfx/keys/key_forward_inv.tga [deleted file]
gfx/keys/key_jump.tga [deleted file]
gfx/keys/key_jump_inv.tga [deleted file]
gfx/keys/key_left.tga [deleted file]
gfx/keys/key_left_inv.tga [deleted file]
gfx/keys/key_right.tga [deleted file]
gfx/keys/key_right_inv.tga [deleted file]
gfx/nr_piece-o-cake_mini.tga [deleted file]
gfx/num_0.tga [deleted file]
gfx/num_1.tga [deleted file]
gfx/num_2.tga [deleted file]
gfx/num_3.tga [deleted file]
gfx/num_4.tga [deleted file]
gfx/num_5.tga [deleted file]
gfx/num_6.tga [deleted file]
gfx/num_7.tga [deleted file]
gfx/num_8.tga [deleted file]
gfx/num_9.tga [deleted file]
gfx/num_colon.tga [deleted file]
gfx/num_minus.tga [deleted file]
gfx/ons-reborn_radar.tga [deleted file]
gfx/racetrack_radar.tga [deleted file]
gfx/ranking.tga [deleted file]
gfx/reslimed_radar.tga [deleted file]
gfx/ruiner_radar.tga [deleted file]
gfx/runningman_1on1remix_radar.tga [deleted file]
gfx/runningman_radar.tga [deleted file]
gfx/runningmanctf_radar.tga [deleted file]
gfx/sb_armor.tga [deleted file]
gfx/sb_bullets.tga [deleted file]
gfx/sb_cells.tga [deleted file]
gfx/sb_energy.tga [deleted file]
gfx/sb_flag_blue_carrying.tga [deleted file]
gfx/sb_flag_blue_lost.tga [deleted file]
gfx/sb_flag_blue_shielded.tga [deleted file]
gfx/sb_flag_blue_taken.tga [deleted file]
gfx/sb_flag_red_carrying.tga [deleted file]
gfx/sb_flag_red_lost.tga [deleted file]
gfx/sb_flag_red_shielded.tga [deleted file]
gfx/sb_flag_red_taken.tga [deleted file]
gfx/sb_fuel.tga [deleted file]
gfx/sb_health.tga [deleted file]
gfx/sb_invinc.tga [deleted file]
gfx/sb_key_carrying.tga [deleted file]
gfx/sb_kh_full.tga [deleted file]
gfx/sb_kh_outline.tga [deleted file]
gfx/sb_nexball_carrying.tga [deleted file]
gfx/sb_player_ready.tga [deleted file]
gfx/sb_playercolor_base.tga [deleted file]
gfx/sb_playercolor_pants.tga [deleted file]
gfx/sb_playercolor_shirt.tga [deleted file]
gfx/sb_rocket.tga [deleted file]
gfx/sb_shells.tga [deleted file]
gfx/sb_slowmo.tga [deleted file]
gfx/sb_str.tga [deleted file]
gfx/sbar.tga [deleted file]
gfx/sbar_minimal.tga [deleted file]
gfx/sbar_overlay.tga [deleted file]
gfx/scoreboard/accuracy_bg.tga [new file with mode: 0644]
gfx/scoreboard/player_ready.tga [new file with mode: 0644]
gfx/scoreboard/playercolor_base.tga [new file with mode: 0644]
gfx/scoreboard/playercolor_pants.tga [new file with mode: 0644]
gfx/scoreboard/playercolor_shirt.tga [new file with mode: 0644]
gfx/scoreboard/scoreboard_bg.tga [new file with mode: 0644]
gfx/scoreboard/scoreboard_tableheader.tga [new file with mode: 0644]
gfx/silvercity_radar.tga [deleted file]
gfx/skyway_radar.tga [deleted file]
gfx/slimepit_radar.tga [deleted file]
gfx/soylent_radar.tga [deleted file]
gfx/starship_radar.tga [deleted file]
gfx/stormkeep2_radar.tga [deleted file]
gfx/stormkeep_radar.tga [deleted file]
gfx/strength_radar.tga [deleted file]
gfx/toxic_radar.tga [deleted file]
gfx/turret_test_radar.tga [deleted file]
gfx/warfare_radar.tga [deleted file]
hud_old_nexuiz.cfg [new file with mode: 0644]
hud_wickedhud_big.cfg [new file with mode: 0644]
hud_wickedhud_default.cfg [new file with mode: 0644]
keybinds.txt
loadfonts.cfg [deleted file]
models/player/erebus.iqm
models/player/erebus.iqm_0.tga
models/player/gak.iqm
models/player/gak.iqm_0.tga
models/player/gakarmored.iqm
models/player/gakarmored.iqm_0.tga
models/player/gakmasked.iqm
models/player/gakmasked.iqm_0.tga
models/player/ignis.iqm
models/player/ignis.iqm_0.tga
models/player/ignishalfmasked.iqm
models/player/ignishalfmasked.iqm_0.tga
models/player/ignismasked.iqm
models/player/ignismasked.iqm_0.tga
models/player/nyx.iqm
models/player/nyx.iqm_0.tga
models/player/pyria.iqm
models/player/pyria.iqm_0.tga
models/player/seraphina.iqm
models/player/seraphina.iqm_0.tga
models/player/seraphinamasked.iqm
models/player/seraphinamasked.iqm_0.tga
models/player/umbra.iqm
models/player/umbra.iqm_0.tga
qcsrc/client/Defs.qc
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/csqc_builtins.qc
qcsrc/client/csqc_constants.qc
qcsrc/client/damage.qc
qcsrc/client/hud.qc [new file with mode: 0644]
qcsrc/client/hud.qc.orig [deleted file]
qcsrc/client/hud.qh [new file with mode: 0644]
qcsrc/client/main.qh
qcsrc/client/mapvoting.qc
qcsrc/client/miscfunctions.qc
qcsrc/client/progs.src
qcsrc/client/sbar.qc [deleted file]
qcsrc/client/scoreboard.qc [new file with mode: 0644]
qcsrc/client/teamradar.qc
qcsrc/client/teamradar.qh
qcsrc/client/waypointsprites.qc
qcsrc/common/constants.qh
qcsrc/common/items.qc
qcsrc/common/items.qh
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/menu/anim/animation.c
qcsrc/menu/anim/animhost.c
qcsrc/menu/anim/easing.c
qcsrc/menu/anim/keyframe.c
qcsrc/menu/auto-super.pl [new file with mode: 0644]
qcsrc/menu/classes.c
qcsrc/menu/draw.qc
qcsrc/menu/gamecommand.qc
qcsrc/menu/item.c
qcsrc/menu/item/borderimage.c
qcsrc/menu/item/button.c
qcsrc/menu/item/checkbox.c
qcsrc/menu/item/container.c
qcsrc/menu/item/dialog.c
qcsrc/menu/item/gecko.c
qcsrc/menu/item/image.c
qcsrc/menu/item/inputbox.c
qcsrc/menu/item/inputcontainer.c
qcsrc/menu/item/label.c
qcsrc/menu/item/listbox.c
qcsrc/menu/item/modalcontroller.c
qcsrc/menu/item/nexposee.c
qcsrc/menu/item/radiobutton.c
qcsrc/menu/item/slider.c
qcsrc/menu/item/textslider.c
qcsrc/menu/menu.qc
qcsrc/menu/menu.qh
qcsrc/menu/oo/base.h
qcsrc/menu/oo/classdefs.h
qcsrc/menu/oo/constructors.h
qcsrc/menu/oo/implementation.h
qcsrc/menu/xonotic/bigbutton.c
qcsrc/menu/xonotic/bigcommandbutton.c
qcsrc/menu/xonotic/button.c
qcsrc/menu/xonotic/campaign.c
qcsrc/menu/xonotic/charmap.c
qcsrc/menu/xonotic/checkbox.c
qcsrc/menu/xonotic/checkbox_slider_invalid.c
qcsrc/menu/xonotic/colorbutton.c
qcsrc/menu/xonotic/colorpicker.c
qcsrc/menu/xonotic/commandbutton.c
qcsrc/menu/xonotic/credits.c
qcsrc/menu/xonotic/crosshairbutton.c
qcsrc/menu/xonotic/cvarlist.c
qcsrc/menu/xonotic/demolist.c
qcsrc/menu/xonotic/dialog.c
qcsrc/menu/xonotic/dialog_credits.c
qcsrc/menu/xonotic/dialog_hudpanel_chat.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_inventory.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_modicons.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_notification.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_powerups.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_racetimer.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_radar.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_score.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_timer.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_vote.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_weaponicons.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudsetup_exit.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer.c
qcsrc/menu/xonotic/dialog_multiplayer_create.c
qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c
qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
qcsrc/menu/xonotic/dialog_multiplayer_demo.c
qcsrc/menu/xonotic/dialog_multiplayer_join.c
qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c
qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_radar.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c
qcsrc/menu/xonotic/dialog_news.c
qcsrc/menu/xonotic/dialog_quit.c
qcsrc/menu/xonotic/dialog_settings.c
qcsrc/menu/xonotic/dialog_settings_audio.c
qcsrc/menu/xonotic/dialog_settings_effects.c
qcsrc/menu/xonotic/dialog_settings_input.c
qcsrc/menu/xonotic/dialog_settings_input_userbind.c
qcsrc/menu/xonotic/dialog_settings_misc.c
qcsrc/menu/xonotic/dialog_settings_misc_cvars.c
qcsrc/menu/xonotic/dialog_settings_network.c
qcsrc/menu/xonotic/dialog_settings_video.c
qcsrc/menu/xonotic/dialog_singleplayer.c
qcsrc/menu/xonotic/dialog_singleplayer_winner.c
qcsrc/menu/xonotic/dialog_teamselect.c
qcsrc/menu/xonotic/gametypebutton.c
qcsrc/menu/xonotic/image.c
qcsrc/menu/xonotic/inputbox.c
qcsrc/menu/xonotic/keybinder.c
qcsrc/menu/xonotic/listbox.c
qcsrc/menu/xonotic/mainwindow.c
qcsrc/menu/xonotic/maplist.c
qcsrc/menu/xonotic/nexposee.c
qcsrc/menu/xonotic/playerlist.c
qcsrc/menu/xonotic/playermodel.c
qcsrc/menu/xonotic/radiobutton.c
qcsrc/menu/xonotic/rootdialog.c
qcsrc/menu/xonotic/serverlist.c
qcsrc/menu/xonotic/skinlist.c
qcsrc/menu/xonotic/slider.c
qcsrc/menu/xonotic/slider_decibels.c
qcsrc/menu/xonotic/slider_resolution.c
qcsrc/menu/xonotic/tab.c
qcsrc/menu/xonotic/tabcontroller.c
qcsrc/menu/xonotic/textlabel.c
qcsrc/menu/xonotic/textslider.c
qcsrc/menu/xonotic/util.qc
qcsrc/menu/xonotic/util.qh
qcsrc/menu/xonotic/weaponslist.c
qcsrc/server/autocvars.qh [new file with mode: 0644]
qcsrc/server/bot/bot.qc
qcsrc/server/cheats.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_weapons.qc
qcsrc/server/ctf.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_tetris.qc
qcsrc/server/progs.src
qcsrc/server/w_campingrifle.qc
qcsrc/server/w_crylink.qc
qcsrc/server/w_electro.qc
qcsrc/server/w_fireball.qc
qcsrc/server/w_grenadelauncher.qc
qcsrc/server/w_hagar.qc
qcsrc/server/w_hlac.qc
qcsrc/server/w_hook.qc
qcsrc/server/w_laser.qc
qcsrc/server/w_minstanex.qc
qcsrc/server/w_nex.qc
qcsrc/server/w_porto.qc
qcsrc/server/w_rocketlauncher.qc
qcsrc/server/w_shotgun.qc
qcsrc/server/w_tuba.qc
qcsrc/server/w_uzi.qc
quake.rc
textures/campingrifle.tga
textures/campingrifle_bump.tga
textures/campingrifle_gloss.tga
textures/electro.tga
textures/electro_gloss.tga
textures/electro_glow.tga
textures/electro_norm.tga
textures/electro_pants.tga
textures/glauncher.tga
textures/glauncher_gloss.tga
textures/glauncher_norm.tga
textures/glauncher_pants.tga
textures/glauncher_shirt.tga
textures/hagar2.tga
textures/hagar2_gloss.tga
textures/hagar2_glow.tga
textures/hagar2_norm.tga
textures/hagar2_pants.tga
textures/hagar2_shirt.tga
textures/hlac_body.tga
textures/hlac_body_gloss.tga
textures/hlac_body_norm.tga
textures/hlac_body_pants.tga
textures/hlac_body_shirt.tga
textures/hookgun.tga
textures/hookgun_gloss.tga
textures/hookgun_norm.tga
textures/hookgun_pants.tga
textures/shotgun2.tga
textures/shotgun2_gloss.tga
textures/shotgun2_glow.tga
textures/shotgun2_norm.tga
textures/shotgun2_shirt.tga
update-cvarcount.sh

index cb58e9a14e563876567ed9accf0ebb85b4e2b5c3..156b69aed586e61776ebd45bc3dc5ee7035f6e99 100644 (file)
@@ -16,21 +16,21 @@ set g_start_weapon_campingrifle -1 "0 = never provide the weapon, 1 = always pro
 set g_start_weapon_tuba -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_fireball -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_seeker -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_balance_health_start 100
+set g_balance_health_start 150
 set g_balance_armor_start 0
-set g_start_ammo_shells 45
+set g_start_ammo_shells 40
 set g_start_ammo_nails 0
 set g_start_ammo_rockets 0
 set g_start_ammo_cells 0
 set g_start_ammo_fuel 0
-set g_warmup_start_health 200 "starting values when being in warmup-stage"
+set g_warmup_start_health 250 "starting values when being in warmup-stage"
 set g_warmup_start_armor 100 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_shells 50 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_nails 150 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_rockets 50 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 50 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
-set g_lms_start_health 200
+set g_lms_start_health 250
 set g_lms_start_armor 100
 set g_lms_start_ammo_shells 50
 set g_lms_start_ammo_nails 150
@@ -54,40 +54,40 @@ set g_balance_nix_ammoincr_fuel 2
 // {{{ pickup items
 set g_pickup_ammo_anyway 0
 set g_pickup_weapons_anyway 0
-set g_pickup_shells 30
-set g_pickup_shells_max 120
+set g_pickup_shells 15
+set g_pickup_shells_max 999
 set g_pickup_nails 80
-set g_pickup_nails_max 400
-set g_pickup_rockets 30
-set g_pickup_rockets_max 120
-set g_pickup_cells 50
-set g_pickup_cells_max 200
+set g_pickup_nails_max 999
+set g_pickup_rockets 15
+set g_pickup_rockets_max 999
+set g_pickup_cells 25
+set g_pickup_cells_max 999
 set g_pickup_fuel 25
 set g_pickup_fuel_jetpack 50
 set g_pickup_fuel_max 999
-set g_pickup_armorsmall 10
-set g_pickup_armorsmall_max 100
+set g_pickup_armorsmall 5
+set g_pickup_armorsmall_max 999
 set g_pickup_armorsmall_anyway 0
 set g_pickup_armormedium 25
-set g_pickup_armormedium_max 100
+set g_pickup_armormedium_max 999
 set g_pickup_armormedium_anyway 0
 set g_pickup_armorbig 50
-set g_pickup_armorbig_max 100
+set g_pickup_armorbig_max 999
 set g_pickup_armorbig_anyway 0
 set g_pickup_armorlarge 100
-set g_pickup_armorlarge_max 100
+set g_pickup_armorlarge_max 999
 set g_pickup_armorlarge_anyway 0
-set g_pickup_healthsmall 10
-set g_pickup_healthsmall_max 200
+set g_pickup_healthsmall 5
+set g_pickup_healthsmall_max 999
 set g_pickup_healthsmall_anyway 0
 set g_pickup_healthmedium 25
-set g_pickup_healthmedium_max 200
+set g_pickup_healthmedium_max 999
 set g_pickup_healthmedium_anyway 0
 set g_pickup_healthlarge 50
-set g_pickup_healthlarge_max 200
+set g_pickup_healthlarge_max 999
 set g_pickup_healthlarge_anyway 0
 set g_pickup_healthmega 100
-set g_pickup_healthmega_max 200
+set g_pickup_healthmega_max 999
 set g_pickup_healthmega_anyway 0
 set g_pickup_respawntime_short 15
 set g_pickup_respawntime_medium 20
@@ -104,23 +104,23 @@ set g_pickup_respawntimejitter_ammo 0
 // }}}
 
 // {{{ regen/rot
-set g_balance_health_regen 0
-set g_balance_health_regenlinear 5
+set g_balance_health_regen 0.1
+set g_balance_health_regenlinear 0
 set g_balance_pause_health_regen 5
 set g_balance_pause_health_regen_spawn 0
-set g_balance_health_rot 0
-set g_balance_health_rotlinear 5
-set g_balance_pause_health_rot 3
-set g_balance_pause_health_rot_spawn 1
+set g_balance_health_rot 0.1
+set g_balance_health_rotlinear 0
+set g_balance_pause_health_rot 5
+set g_balance_pause_health_rot_spawn 10
 set g_balance_health_regenstable 100
 set g_balance_health_rotstable 100
 set g_balance_health_limit 999
 set g_balance_armor_regen 0
 set g_balance_armor_regenlinear 0
-set g_balance_armor_rot 0
+set g_balance_armor_rot 0.1
 set g_balance_armor_rotlinear 0
-set g_balance_pause_armor_rot 1
-set g_balance_pause_armor_rot_spawn 1
+set g_balance_pause_armor_rot 5
+set g_balance_pause_armor_rot_spawn 10
 set g_balance_armor_regenstable 100
 set g_balance_armor_rotstable 100
 set g_balance_armor_limit 999
@@ -156,8 +156,8 @@ set g_projectiles_newton_style 2
 // 2: relative velocity projectiles, but aim is precorrected so projectiles hit the crosshair (note: strafe rockets then are SLOWER than ones shot while standing, happens in 1 too when aiming correctly which is hard)
 // 3: absolute velocity + player velocity component in shot direction (note: does NOT yield the right relative velocity, but may be good enough, but it is somewhat prone to sniper rockets)
 // 4: just add the player velocity length to the absolute velocity (tZork's sniper rockets)
-set g_projectiles_newton_style_2_minfactor 0.8
-set g_projectiles_newton_style_2_maxfactor 1.5
+set g_projectiles_newton_style_2_minfactor 0.7
+set g_projectiles_newton_style_2_maxfactor 5
 set g_projectiles_spread_style 0
 // possible values:
 // 0: forward + solid sphere (like Quake) - varies velocity
@@ -188,7 +188,7 @@ set g_balance_powerup_strength_selfforce 1.5
 set g_jetpack_antigravity 0.8 "factor of gravity compensation of the jetpack"
 set g_jetpack_acceleration_side 1200 "acceleration of the jetpack in xy direction"
 set g_jetpack_acceleration_up 600 "acceleration of the jetpack in z direction (note: you have to factor in gravity here, if antigravity is not 1)"
-set g_jetpack_maxspeed_side 1200 "max speed of the jetpack in xy direction"
+set g_jetpack_maxspeed_side 1500 "max speed of the jetpack in xy direction"
 set g_jetpack_maxspeed_up 600 "max speed of the jetpack in z direction"
 set g_jetpack_fuel 8 "fuel per second for jetpack"
 set g_jetpack_attenuation 2 "jetpack sound attenuation"
@@ -206,11 +206,11 @@ set g_balance_grapplehook_health 130
 
 // {{{ weapon properties
 // {{{ laser
-set g_balance_laser_primary_damage 25
+set g_balance_laser_primary_damage 35
 set g_balance_laser_primary_edgedamage 10
 set g_balance_laser_primary_force 400
 set g_balance_laser_primary_radius 70
-set g_balance_laser_primary_speed 12000
+set g_balance_laser_primary_speed 9000
 set g_balance_laser_primary_spread 0
 set g_balance_laser_primary_refire 0.7
 set g_balance_laser_primary_animtime 0.3
@@ -219,81 +219,81 @@ set g_balance_laser_primary_shotangle 0
 set g_balance_laser_primary_delay 0.03
 set g_balance_laser_gauntlet 0
 set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
-set g_balance_laser_secondary_damage 25
+set g_balance_laser_secondary_damage 35
 set g_balance_laser_secondary_edgedamage 10
 set g_balance_laser_secondary_force 400
 set g_balance_laser_secondary_radius 70
-set g_balance_laser_secondary_speed 12000
+set g_balance_laser_secondary_speed 9000
 set g_balance_laser_secondary_spread 0
 set g_balance_laser_secondary_refire 0.7
 set g_balance_laser_secondary_animtime 0.3
 set g_balance_laser_secondary_lifetime 30
-set g_balance_laser_secondary_shotangle -90
+set g_balance_laser_secondary_shotangle 0
 set g_balance_laser_secondary_delay 0
 // }}}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 6
-set g_balance_shotgun_primary_damage 8
-set g_balance_shotgun_primary_force 0
-set g_balance_shotgun_primary_spread 0.11
+set g_balance_shotgun_primary_damage 9
+set g_balance_shotgun_primary_force 60
+set g_balance_shotgun_primary_spread 0.07
 set g_balance_shotgun_primary_refire 0.5
 set g_balance_shotgun_primary_animtime 0.2
 set g_balance_shotgun_primary_ammo 1
-set g_balance_shotgun_primary_speed 8000
+set g_balance_shotgun_primary_speed 12000
 set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
 set g_balance_shotgun_secondary 1
 set g_balance_shotgun_secondary_bullets 6
-set g_balance_shotgun_secondary_damage 8
-set g_balance_shotgun_secondary_force 0
-set g_balance_shotgun_secondary_spread 0.17
+set g_balance_shotgun_secondary_damage 9
+set g_balance_shotgun_secondary_force 60
+set g_balance_shotgun_secondary_spread 0.1
 set g_balance_shotgun_secondary_refire 1.35
 set g_balance_shotgun_secondary_animtime 0.2
 set g_balance_shotgun_secondary_ammo 1
-set g_balance_shotgun_secondary_speed 8000
+set g_balance_shotgun_secondary_speed 12000
 set g_balance_shotgun_secondary_bulletconstant 75 // 3.8qu
 // }}}
 // {{{ uzi
 set g_balance_uzi_first 1
-set g_balance_uzi_first_damage 12
-set g_balance_uzi_first_force 0
+set g_balance_uzi_first_damage 30
+set g_balance_uzi_first_force 50
 set g_balance_uzi_first_spread 0.015
-set g_balance_uzi_first_refire 0.15
+set g_balance_uzi_first_refire 0.2
 set g_balance_uzi_first_ammo 1
-set g_balance_uzi_sustained_damage 7
-set g_balance_uzi_sustained_force 0
+set g_balance_uzi_sustained_damage 15
+set g_balance_uzi_sustained_force 27
 set g_balance_uzi_sustained_spread 0.05
-set g_balance_uzi_sustained_refire 0.075
+set g_balance_uzi_sustained_refire 0.1
 set g_balance_uzi_sustained_ammo 1
 set g_balance_uzi_speed 18000
 set g_balance_uzi_bulletconstant 115 // 13.1qu
 // }}}
 // {{{ mortar
 set g_balance_grenadelauncher_primary2secondary 0
-set g_balance_grenadelauncher_primary_damage 50
+set g_balance_grenadelauncher_primary_damage 70
 set g_balance_grenadelauncher_primary_edgedamage 38
 set g_balance_grenadelauncher_primary_force 400
 set g_balance_grenadelauncher_primary_radius 140
-set g_balance_grenadelauncher_primary_speed 2200
-set g_balance_grenadelauncher_primary_speed_up 220
+set g_balance_grenadelauncher_primary_speed 2000
+set g_balance_grenadelauncher_primary_speed_up 200
 set g_balance_grenadelauncher_primary_speed_z 0
 set g_balance_grenadelauncher_primary_spread 0
 set g_balance_grenadelauncher_primary_lifetime 30
 set g_balance_grenadelauncher_primary_refire 0.8
 set g_balance_grenadelauncher_primary_animtime 0.3
 set g_balance_grenadelauncher_primary_ammo 2
-set g_balance_grenadelauncher_secondary_damage 60
+set g_balance_grenadelauncher_secondary_damage 70
 set g_balance_grenadelauncher_secondary_edgedamage 38
 set g_balance_grenadelauncher_secondary_force 400
 set g_balance_grenadelauncher_secondary_radius 140
 set g_balance_grenadelauncher_secondary_speed 1400
-set g_balance_grenadelauncher_secondary_speed_up 150
+set g_balance_grenadelauncher_secondary_speed_up 200
 set g_balance_grenadelauncher_secondary_speed_z 0
 set g_balance_grenadelauncher_secondary_spread 0
-set g_balance_grenadelauncher_secondary_lifetime 1
+set g_balance_grenadelauncher_secondary_lifetime 2.5
 set g_balance_grenadelauncher_secondary_refire 0.7
 set g_balance_grenadelauncher_secondary_animtime 0.3
 set g_balance_grenadelauncher_secondary_ammo 2
-set g_balance_grenadelauncher_secondary_health 70
+set g_balance_grenadelauncher_secondary_health 10
 set g_balance_grenadelauncher_secondary_damageforcescale 4
 set g_balance_grenadelauncher_secondary_bouncefactor 0.5
 set g_balance_grenadelauncher_secondary_bouncestop 0.075
@@ -320,15 +320,15 @@ set g_balance_electro_secondary_speed 900
 set g_balance_electro_secondary_speed_up 200
 set g_balance_electro_secondary_speed_z 0
 set g_balance_electro_secondary_spread 0
-set g_balance_electro_secondary_lifetime 2.5
-set g_balance_electro_secondary_refire 0.2
-set g_balance_electro_secondary_refire2 1
-set g_balance_electro_secondary_animtime 0.2
+set g_balance_electro_secondary_lifetime 5
+set g_balance_electro_secondary_refire 0.3
+set g_balance_electro_secondary_refire2 0
+set g_balance_electro_secondary_animtime 0.3
 set g_balance_electro_secondary_ammo 2
 set g_balance_electro_secondary_health 5
 set g_balance_electro_secondary_damageforcescale 4
-set g_balance_electro_secondary_count 3
-set g_balance_electro_combo_damage 50
+set g_balance_electro_secondary_count 1
+set g_balance_electro_combo_damage 80
 set g_balance_electro_combo_edgedamage 0
 set g_balance_electro_combo_force 200
 set g_balance_electro_combo_radius 250
@@ -336,12 +336,12 @@ set g_balance_electro_combo_comboradius 0
 set g_balance_electro_combo_speed 2000
 // }}}
 // {{{ crylink
-set g_balance_crylink_primary_damage 14
+set g_balance_crylink_primary_damage 18
 set g_balance_crylink_primary_edgedamage 0
 set g_balance_crylink_primary_force -55
 set g_balance_crylink_primary_radius 80
 set g_balance_crylink_primary_speed 7000
-set g_balance_crylink_primary_spread 0.01
+set g_balance_crylink_primary_spread 0.03
 set g_balance_crylink_primary_shots 4
 set g_balance_crylink_primary_bounces 1
 set g_balance_crylink_primary_refire 0.4
@@ -357,17 +357,17 @@ set g_balance_crylink_primary_other_lifetime 0.1 // range: 700 full, fades to 24
 set g_balance_crylink_primary_other_fadetime 0.25
 
 set g_balance_crylink_secondary 1
-set g_balance_crylink_secondary_damage 10
+set g_balance_crylink_secondary_damage 18
 set g_balance_crylink_secondary_edgedamage 0
-set g_balance_crylink_secondary_force -40
-set g_balance_crylink_secondary_radius 10
-set g_balance_crylink_secondary_speed 4000
-set g_balance_crylink_secondary_spread 0.01
-set g_balance_crylink_secondary_shots 3
+set g_balance_crylink_secondary_force -55
+set g_balance_crylink_secondary_radius 3
+set g_balance_crylink_secondary_speed 7000
+set g_balance_crylink_secondary_spread 0.08
+set g_balance_crylink_secondary_shots 7
 set g_balance_crylink_secondary_bounces 0
-set g_balance_crylink_secondary_refire 0.1
-set g_balance_crylink_secondary_animtime 0.1
-set g_balance_crylink_secondary_ammo 1
+set g_balance_crylink_secondary_refire 0.5
+set g_balance_crylink_secondary_animtime 0.3
+set g_balance_crylink_secondary_ammo 2
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 
 set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000
@@ -392,43 +392,43 @@ set g_balance_minstanex_animtime 0.3
 set g_balance_minstanex_ammo 10
 // }}}
 // {{{ hagar
-set g_balance_hagar_primary_damage 30
-set g_balance_hagar_primary_edgedamage 0
-set g_balance_hagar_primary_force 50
-set g_balance_hagar_primary_radius 70
-set g_balance_hagar_primary_spread 0.05
-set g_balance_hagar_primary_speed 2400
+set g_balance_hagar_primary_damage 37
+set g_balance_hagar_primary_edgedamage 15
+set g_balance_hagar_primary_force 100
+set g_balance_hagar_primary_radius 65
+set g_balance_hagar_primary_spread 0.010
+set g_balance_hagar_primary_speed 3000
 set g_balance_hagar_primary_lifetime 30
 set g_balance_hagar_primary_refire 0.15
 set g_balance_hagar_primary_ammo 1
 set g_balance_hagar_secondary 1
-set g_balance_hagar_secondary_damage 20
-set g_balance_hagar_secondary_edgedamage 10
-set g_balance_hagar_secondary_force 50
-set g_balance_hagar_secondary_radius 90
-set g_balance_hagar_secondary_spread 0.05
-set g_balance_hagar_secondary_speed 2000
-set g_balance_hagar_secondary_lifetime_min 0.1
-set g_balance_hagar_secondary_lifetime_rand 0.05
-set g_balance_hagar_secondary_refire 0.1
-set g_balance_hagar_secondary_ammo 0.5
+set g_balance_hagar_secondary_damage 37
+set g_balance_hagar_secondary_edgedamage 15
+set g_balance_hagar_secondary_force 100
+set g_balance_hagar_secondary_radius 65
+set g_balance_hagar_secondary_spread 0.015
+set g_balance_hagar_secondary_speed 1400
+set g_balance_hagar_secondary_lifetime_min 30
+set g_balance_hagar_secondary_lifetime_rand 0
+set g_balance_hagar_secondary_refire 0.15
+set g_balance_hagar_secondary_ammo 1
 // }}}
 // {{{ rocketlauncher
-set g_balance_rocketlauncher_damage 80
+set g_balance_rocketlauncher_damage 105
 set g_balance_rocketlauncher_edgedamage 40
 set g_balance_rocketlauncher_force 600
-set g_balance_rocketlauncher_radius 100
-set g_balance_rocketlauncher_speed 1600
-set g_balance_rocketlauncher_speedaccel 1600
-set g_balance_rocketlauncher_speedstart 1000
+set g_balance_rocketlauncher_radius 150
+set g_balance_rocketlauncher_speed 850
+set g_balance_rocketlauncher_speedaccel 0
+set g_balance_rocketlauncher_speedstart 850
 set g_balance_rocketlauncher_lifetime 30
-set g_balance_rocketlauncher_refire 1.2
+set g_balance_rocketlauncher_refire 1
 set g_balance_rocketlauncher_animtime 0.3
 set g_balance_rocketlauncher_ammo 3
 set g_balance_rocketlauncher_health 40
 set g_balance_rocketlauncher_damageforcescale 4
-set g_balance_rocketlauncher_detonatedelay -1 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
-set g_balance_rocketlauncher_guiderate 140 // max degrees per second
+set g_balance_rocketlauncher_detonatedelay 0.2 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
+set g_balance_rocketlauncher_guiderate 90 // max degrees per second
 set g_balance_rocketlauncher_guideratedelay 0.01 // immediate
 set g_balance_rocketlauncher_guidegoal 512 // goal distance for (non-laser) guiding (higher = less control, lower = erratic)
 set g_balance_rocketlauncher_guidedelay 0.15 // delay before guiding kicks in
@@ -448,12 +448,12 @@ set g_balance_portal_health 200 // these get recharged whenever the portal is us
 set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
 // }}}
 // {{{ hook
-set g_balance_hook_primary_fuel 2 // hook monkeys set 0
+set g_balance_hook_primary_fuel 5 // hook monkeys set 0
 set g_balance_hook_primary_refire 0 // hook monkeys set 0
 set g_balance_hook_primary_animtime 0.3 // good shoot anim
 set g_balance_hook_primary_hooked_time_max 0 // infinite
 set g_balance_hook_primary_hooked_time_free 2 // 2s being hooked are free
-set g_balance_hook_primary_hooked_fuel 3 // fuel per second hooked
+set g_balance_hook_primary_hooked_fuel 5 // fuel per second hooked
 set g_balance_hook_secondary_damage 25 // not much
 set g_balance_hook_secondary_edgedamage 5 // not much
 set g_balance_hook_secondary_radius 500 // LOTS
@@ -570,7 +570,7 @@ set g_balance_fireball_secondary_damageforcescale 4
 set g_balance_fireball_secondary_damagetime 5
 set g_balance_fireball_secondary_force 100
 set g_balance_fireball_secondary_laserburntime 0.5
-set g_balance_fireball_secondary_laserdamage 30
+set g_balance_fireball_secondary_laserdamage 50
 set g_balance_fireball_secondary_laseredgedamage 20
 set g_balance_fireball_secondary_laserradius 110
 set g_balance_fireball_secondary_lifetime 7
index 725510d95f7a3610976aed0ceaa816cb0f4840c2..9edc772f299c76e27bb150f88a88aa136ed5ab13 100644 (file)
@@ -916,34 +916,15 @@ alias +zoom +button4
 alias -zoom -button4
 alias +crouch +button5
 alias -crouch -button5
-alias weapnext "_weapnext_${_supports_weaponpriority}${sbar_hudselector}${cl_weaponpriority_useforcycling}"
-alias _weapnext_000 "impulse 10"
-alias _weapnext_001 "impulse 10"
-alias _weapnext_010 "impulse 10"
-alias _weapnext_011 "impulse 10"
-alias _weapnext_020 "impulse 10"
-alias _weapnext_021 "impulse 10"
-alias _weapnext_100 "impulse 10"
-alias _weapnext_101 "impulse 15"
-alias _weapnext_110 "impulse 18"
-alias _weapnext_111 "impulse 15"
-alias _weapnext_120 "impulse 18"
-alias _weapnext_121 "impulse 15"
+alias weapnext "_weapnext_${cl_weaponpriority_useforcycling}"
+alias _weapnext_0 "impulse 18"
+alias _weapnext_1 "impulse 15"
+alias _weapnext_2 "impulse 10"
 alias weaplast "impulse 11"
-alias weapprev "_weapprev_${_supports_weaponpriority}${sbar_hudselector}${cl_weaponpriority_useforcycling}"
-alias _weapprev_000 "impulse 12"
-alias _weapprev_001 "impulse 12"
-alias _weapprev_010 "impulse 12"
-alias _weapprev_011 "impulse 12"
-alias _weapprev_020 "impulse 12"
-alias _weapprev_021 "impulse 12"
-alias _weapprev_100 "impulse 12"
-alias _weapprev_101 "impulse 16"
-alias _weapprev_110 "impulse 19"
-alias _weapprev_111 "impulse 16"
-alias _weapprev_120 "impulse 19"
-alias _weapprev_121 "impulse 16"
-set _supports_weaponpriority 0 "set to 1 by csqc if supported, and to 0 on disconnect"
+alias weapprev "_weapprev_${cl_weaponpriority_useforcycling}"
+alias _weapprev_0 "impulse 19"
+alias _weapprev_1 "impulse 16"
+alias _weapprev_2 "impulse 12"
 alias weapbest "impulse 13"
 
 alias reload "impulse 20"
@@ -1001,7 +982,6 @@ bind F10 quit
 bind F11 disconnect
 bind F12 screenshot
 bind F4 ready
-bind m radar
 bind ALT +showaccuracy
 
 // Gamepad defaults. Tested with Logitech Rumblepad 2, I hope similar ones works as well.
@@ -1055,7 +1035,7 @@ bind kp_minus "+userbind 18"
 set sv_vote_commands "restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoteam_auto" "these commands can be voted"
 set sv_vote_only_commands ""
 set sv_vote_master_commands "movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink" "maybe add kickban here (but then sv_vote_master 0)"
-set rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban\" status \"sv_cmd teamstatus\" movetoteam_auto movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink"
+set rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban *\" status \"sv_cmd teamstatus\" movetoteam_auto movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink"
 set sv_vote_call 1     "users can call a vote for the above commands"
 set sv_vote_master 1   "users can call a vote to become master"
 set sv_vote_master_password "" "when set, users can use \"vlogin PASSWORD\" to log in as master"
@@ -1335,34 +1315,38 @@ con_chatwidth 0.6
 con_notifysize 10
 con_notifyalign 0
 
-sbar_info_pos 50
-seta sbar_alpha_bg 0.8 "alpha value of the HUD background"
-seta sbar_alpha_fg 1 "alpha value of the HUD foreground items"
-seta sbar_border_thickness 1 "scoreboard border thickness"
-seta sbar_accuracy_border_thickness 1 "accuracy stats border thickness"
-seta sbar_accuracy_doublerows 0 "use two rows instead of one"
-seta sbar_accuracy_yellow 40 "percentage at which the accuracy color is yellow"
-seta sbar_accuracy 1 "0 = no weapon accuracy stats panel on scoreboard"
-seta sbar_accuracy_hud 1 "0 = no weapon accuracy bar on the weapon icons"
-seta sbar_color_bg_r 0 "red color component of the HUD background"
-seta sbar_color_bg_g 0.25 "green color component of the HUD background"
-seta sbar_color_bg_b 0.17 "blue color component of the HUD background"
-seta sbar_color_bg_team 0.5 "team color multiplier of the HUD background"
-seta sbar_scoreboard_alpha_bg 0.6 "scoreboard background alpha"
-seta sbar_scoreboard_alpha_fg 1 "scoreboard foreground alpha"
-seta sbar_scoreboard_alpha_name 0.9 "alpha of player text in scoreboard list other than self"
-seta sbar_scoreboard_alpha_name_self 1 "alpha of player text in scoreboard list of self" 
-seta sbar_scoreboard_fadeinspeed 10 "speed at which scoreboard fades in, higher is faster (0 = instant)"
-seta sbar_scoreboard_fadeoutspeed 5 "speed at which scoreboard fades out, higher is faster (0 = instant)"
-seta sbar_scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard"
-seta sbar_scoreboard_highlight_alpha 0.10 "highlight alpha value (depends on sbar_scoreboard_highlight 1)"
-seta sbar_scoreboard_highlight_alpha_self 0.25 "self highlight alpha value"
-seta sbar_hudselector 1        "0 = health/armor positions flipped, 1 = default hud layout, 2 = combined health and armor display"
-seta sbar_showcurrentammo 0 "0 = show all ammo types, 1 = show only the ammo type of the current weapon"
-seta sbar_showweaponicons 1 "1 = show icons of weapons that you have"
-seta sbar_timer_increment 0 "1 = show elapsed time on the timer"
-seta sbar_timer_scale 1 "scale multiplier of the timer"
-seta sbar_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted"
+// hud variables
+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_alpha 0.15 "alpha for visible grid when in configure mode"
+
+seta sbar_info_pos 0 "Y-axis distance from lower right corner for engine info prints"
+
+exec hud_wickedhud_default.cfg
+
+// scoreboard
+seta scoreboard_columns default
+seta scoreboard_border_thickness 1 "scoreboard border thickness"
+seta scoreboard_accuracy_border_thickness 1 "accuracy stats border thickness"
+seta scoreboard_accuracy_doublerows 0 "use two rows instead of one"
+seta scoreboard_accuracy 1 "0 = no weapon accuracy stats panel on scoreboard"
+seta scoreboard_color_bg_r 0 "red color component of the HUD background"
+seta scoreboard_color_bg_g 0.25 "green color component of the HUD background"
+seta scoreboard_color_bg_b 0.17 "blue color component of the HUD background"
+seta scoreboard_color_bg_team 0.5 "team color multiplier of the HUD background"
+seta scoreboard_alpha_bg 0.6 "scoreboard background alpha"
+seta scoreboard_alpha_fg 1 "scoreboard foreground alpha"
+seta scoreboard_alpha_name 0.9 "alpha of player text in scoreboard list other than self"
+seta scoreboard_alpha_name_self 1 "alpha of player text in scoreboard list of self" 
+seta scoreboard_fadeinspeed 10 "speed at which scoreboard fades in, higher is faster (0 = instant)"
+seta scoreboard_fadeoutspeed 5 "speed at which scoreboard fades out, higher is faster (0 = instant)"
+seta scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard"
+seta scoreboard_highlight_alpha 0.10 "highlight alpha value (depends on hud_scoreboard_highlight 1)"
+seta scoreboard_highlight_alpha_self 0.25 "self highlight alpha value"
 
 // for menu server list (eventually make them have engine support?)
 seta menu_slist_showfull 1 "show servers even if they are full and have no slots to join"
@@ -1474,17 +1458,16 @@ set sv_maxidle_spectatorsareidle 0
 // CTF capture limit placeholder cvar
 set capturelimit 0
 
-// sbar: font size
-seta sbar_fontsize 11
-seta sbar_fontsize_spec 16
+// hud: font size
+seta hud_fontsize 11
+seta hud_fontsize_spec 16
 seta scr_centersize 11
-seta sbar_width 560
-// alias sbar_font "loadfont user1 ${1},gfx/fallback ${2-}; loadfont user2 ${1}-big ${2-}; sbar_columns_set"
+seta hud_width 560
+// alias hud_font "loadfont user1 ${1},gfx/fallback ${2-}; loadfont user2 ${1}-big ${2-}; scoreboard_columns_set"
 alias sbar_font "set _requested_sbar_font \"${*}\""
-seta sbar_columns default
 sbar_font gfx/vera-sans 8 12 16 24 32
-seta sbar_showbinds 1  "display actions / bound keys in the strings shown during the game. 0 displays only actions, 1 displays only bound keys, 2 displays both"
-seta sbar_showbinds_limit 2    "maximum number of bound keys to show for an action. 0 for unlimited"
+seta hud_showbinds 1   "display actions / bound keys in the strings shown during the game. 0 displays only actions, 1 displays only bound keys, 2 displays both"
+seta hud_showbinds_limit 2     "maximum number of bound keys to show for an action. 0 for unlimited"
 
 // these entities are not referenced by anything directly, they just represent
 // teams and are found by find() when needed
@@ -1498,7 +1481,7 @@ alias allready "sv_cmd allready"
 
 // note: these cvars use weapon NUMBERS. Use the menu to edit this cvar, or look the numbers up in qcsrc/common/constants.qh.
 seta cl_weaponpriority "minstanex rocketlauncher nex grenadelauncher fireball hlac hagar seeker crylink campingrifle uzi electro tuba shotgun laser hook porto" "weapon priority list"
-seta cl_weaponpriority_useforcycling 0 "when set, weapon cycling by the mouse wheel makes use of the weapon priority list"
+seta cl_weaponpriority_useforcycling 0 "when set, weapon cycling by the mouse wheel makes use of the weapon priority list (the special value 2 uses the weapon ID list for cycling)"
 seta cl_weaponpriority0 "rocketlauncher grenadelauncher hagar seeker fireball" "use impulse 200 for prev gun from this list, 210 for best gun, 220 for next gun.  Default value: explosives"
 seta cl_weaponpriority1 "minstanex nex crylink hlac electro laser"             "use impulse 201 for prev gun from this list, 211 for best gun, 221 for next gun.  Default value: energy"
 seta cl_weaponpriority2 "minstanex nex campingrifle"                           "use impulse 202 for prev gun from this list, 212 for best gun, 222 for next gun.  Default value: hitscan exact"
@@ -1513,17 +1496,6 @@ seta cl_weaponimpulsemode 0 "0: only cycle between currently usable weapons in w
 
 seta sv_status_privacy 1       "hide IP addresses from \"status\" replies shown to clients"
 
-
-seta cl_teamradar 1    "show radar in teammatches when available"
-seta cl_teamradar_background_alpha 0   "set to -1 to disable"
-seta cl_teamradar_foreground_alpha 0.8 "alpha of the map"
-seta cl_teamradar_scale 4096 "distance you can see on the team radar"
-seta cl_teamradar_rotation 0   "rotation mode: you set what points up. 0 = player, 1 = west, 2 = south, 3 = east, 4 = north"
-seta cl_teamradar_size "128 128" "size of the team radar in pixels"
-seta cl_teamradar_position "1 0" "1 0 would be upper right corner, 0.5 0.5 the center, append a 2 at the end to disable the corner hack, and a 1 to disable half the hack"
-seta cl_teamradar_zoommode 0   "zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out"
-alias cl_teamradar_rotate "toggle cl_teamradar_rotation 0 1 2 3 4"
-
 set g_maplist_allow_hidden 0           "allow hidden maps to be, e.g., voted for and in the maplist"
 set g_maplist_allow_frustrating 0      "allow impossible maps to be, e.g., voted for and in the maplist (if set to 2, ONLY impossible maps are allowed)"
 
@@ -1532,8 +1504,8 @@ seta g_start_delay 0      "delay before the game starts, so everyone can join; recomm
 
 alias ons_map           "cl_cmd radar" // legacy alias
 alias radar             "cl_cmd radar"
-alias sbar_columns_set  "cl_cmd sbar_columns_set $*"
-alias sbar_columns_help "cl_cmd sbar_columns_help $*"
+alias scoreboard_columns_set  "cl_cmd scoreboard_columns_set $*"
+alias scoreboard_columns_help "cl_cmd scoreboard_columns_help $*"
 
 alias _gl_flashblend_update_00 "gl_flashblend 1"
 alias _gl_flashblend_update_10 "gl_flashblend 0"
@@ -1550,6 +1522,8 @@ exec turrets.cfg
 // must be at the bottom of this file:
 // alias for switching the teamselect menu
 alias menu_showteamselect "menu_cmd directmenu TeamSelect"
+alias menu_showhudexit "menu_cmd directmenu HUDExit"
+alias menu_showhudoptions "menu_cmd directpanelhudmenu $*"
 alias menu_sync "menu_cmd sync"
 bind f5 menu_showteamselect
 
@@ -1813,9 +1787,6 @@ collision_endposnudge 1
 set cl_lerpanim_maxdelta_framegroups 0.05 // must be faster than fastest weapon refire
 set cl_lerpanim_maxdelta_server 0.1 // must be slower than slowest server controlled anim (e.g. animinfo stuff)
 
-// FIXME temporary
-set menu_font_size_snapping_fix 1
-
 // player ID
 seta _cl_userid "" "player ID (e.g. for tournaments)"
 
diff --git a/gfx/accident_radar.tga b/gfx/accident_radar.tga
deleted file mode 100644 (file)
index 84a117c..0000000
Binary files a/gfx/accident_radar.tga and /dev/null differ
diff --git a/gfx/aggressor_mini.tga b/gfx/aggressor_mini.tga
deleted file mode 100644 (file)
index 475c86b..0000000
Binary files a/gfx/aggressor_mini.tga and /dev/null differ
diff --git a/gfx/aneurysm_radar.tga b/gfx/aneurysm_radar.tga
deleted file mode 100644 (file)
index f6535e1..0000000
Binary files a/gfx/aneurysm_radar.tga and /dev/null differ
diff --git a/gfx/basement_radar.tga b/gfx/basement_radar.tga
deleted file mode 100644 (file)
index b6d4a89..0000000
Binary files a/gfx/basement_radar.tga and /dev/null differ
diff --git a/gfx/basementctf_radar.tga b/gfx/basementctf_radar.tga
deleted file mode 100644 (file)
index 8d531c9..0000000
Binary files a/gfx/basementctf_radar.tga and /dev/null differ
diff --git a/gfx/bleach_radar.tga b/gfx/bleach_radar.tga
deleted file mode 100644 (file)
index 79482e4..0000000
Binary files a/gfx/bleach_radar.tga and /dev/null differ
diff --git a/gfx/bloodprison_radar.tga b/gfx/bloodprison_radar.tga
deleted file mode 100644 (file)
index 76e9200..0000000
Binary files a/gfx/bloodprison_radar.tga and /dev/null differ
diff --git a/gfx/bloodprisonctf_radar.tga b/gfx/bloodprisonctf_radar.tga
deleted file mode 100644 (file)
index 214fde2..0000000
Binary files a/gfx/bloodprisonctf_radar.tga and /dev/null differ
diff --git a/gfx/bluesky_radar.tga b/gfx/bluesky_radar.tga
deleted file mode 100644 (file)
index 5b5fe87..0000000
Binary files a/gfx/bluesky_radar.tga and /dev/null differ
diff --git a/gfx/darkzone_radar.tga b/gfx/darkzone_radar.tga
deleted file mode 100644 (file)
index a08a93f..0000000
Binary files a/gfx/darkzone_radar.tga and /dev/null differ
diff --git a/gfx/desertfactory_radar.tga b/gfx/desertfactory_radar.tga
deleted file mode 100644 (file)
index 6fa0686..0000000
Binary files a/gfx/desertfactory_radar.tga and /dev/null differ
diff --git a/gfx/dieselpower_radar.tga b/gfx/dieselpower_radar.tga
deleted file mode 100644 (file)
index 158c06a..0000000
Binary files a/gfx/dieselpower_radar.tga and /dev/null differ
diff --git a/gfx/downer_radar.tga b/gfx/downer_radar.tga
deleted file mode 100644 (file)
index b7782dd..0000000
Binary files a/gfx/downer_radar.tga and /dev/null differ
diff --git a/gfx/eggandbacon_mini.tga b/gfx/eggandbacon_mini.tga
deleted file mode 100644 (file)
index 578da17..0000000
Binary files a/gfx/eggandbacon_mini.tga and /dev/null differ
diff --git a/gfx/evilspace_radar.tga b/gfx/evilspace_radar.tga
deleted file mode 100644 (file)
index 8cf7ca5..0000000
Binary files a/gfx/evilspace_radar.tga and /dev/null differ
diff --git a/gfx/farewell_radar.tga b/gfx/farewell_radar.tga
deleted file mode 100644 (file)
index 2af15c8..0000000
Binary files a/gfx/farewell_radar.tga and /dev/null differ
diff --git a/gfx/final_rage_radar.tga b/gfx/final_rage_radar.tga
deleted file mode 100644 (file)
index ae58d61..0000000
Binary files a/gfx/final_rage_radar.tga and /dev/null differ
diff --git a/gfx/finale.tga b/gfx/finale.tga
deleted file mode 100644 (file)
index 18d9aed..0000000
Binary files a/gfx/finale.tga and /dev/null differ
diff --git a/gfx/hud/accelerometer_gradient.tga b/gfx/hud/accelerometer_gradient.tga
deleted file mode 100644 (file)
index 0bbad17..0000000
Binary files a/gfx/hud/accelerometer_gradient.tga and /dev/null differ
diff --git a/gfx/hud/default/border.tga b/gfx/hud/default/border.tga
new file mode 100644 (file)
index 0000000..6535f36
Binary files /dev/null and b/gfx/hud/default/border.tga differ
diff --git a/gfx/hud/default/borderx.tga b/gfx/hud/default/borderx.tga
new file mode 100644 (file)
index 0000000..8ef37d3
Binary files /dev/null and b/gfx/hud/default/borderx.tga differ
diff --git a/gfx/hud/inv_weapon0.tga b/gfx/hud/inv_weapon0.tga
deleted file mode 100644 (file)
index b66500b..0000000
Binary files a/gfx/hud/inv_weapon0.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon1.tga b/gfx/hud/inv_weapon1.tga
deleted file mode 100644 (file)
index 32f8e20..0000000
Binary files a/gfx/hud/inv_weapon1.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon10.tga b/gfx/hud/inv_weapon10.tga
deleted file mode 100644 (file)
index ae18113..0000000
Binary files a/gfx/hud/inv_weapon10.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon11.tga b/gfx/hud/inv_weapon11.tga
deleted file mode 100644 (file)
index a1f662e..0000000
Binary files a/gfx/hud/inv_weapon11.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon12.tga b/gfx/hud/inv_weapon12.tga
deleted file mode 100644 (file)
index b63c2d8..0000000
Binary files a/gfx/hud/inv_weapon12.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon13.tga b/gfx/hud/inv_weapon13.tga
deleted file mode 100644 (file)
index 0a8cf7e..0000000
Binary files a/gfx/hud/inv_weapon13.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon14.tga b/gfx/hud/inv_weapon14.tga
deleted file mode 100644 (file)
index 09da559..0000000
Binary files a/gfx/hud/inv_weapon14.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon15.tga b/gfx/hud/inv_weapon15.tga
deleted file mode 100644 (file)
index 0a8cf7e..0000000
Binary files a/gfx/hud/inv_weapon15.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon2.tga b/gfx/hud/inv_weapon2.tga
deleted file mode 100644 (file)
index 72ce481..0000000
Binary files a/gfx/hud/inv_weapon2.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon3.tga b/gfx/hud/inv_weapon3.tga
deleted file mode 100644 (file)
index 91a8ce4..0000000
Binary files a/gfx/hud/inv_weapon3.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon4.tga b/gfx/hud/inv_weapon4.tga
deleted file mode 100644 (file)
index b800f0a..0000000
Binary files a/gfx/hud/inv_weapon4.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon5.tga b/gfx/hud/inv_weapon5.tga
deleted file mode 100644 (file)
index 1a92967..0000000
Binary files a/gfx/hud/inv_weapon5.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon6.tga b/gfx/hud/inv_weapon6.tga
deleted file mode 100644 (file)
index 7523580..0000000
Binary files a/gfx/hud/inv_weapon6.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon7.tga b/gfx/hud/inv_weapon7.tga
deleted file mode 100644 (file)
index 3803159..0000000
Binary files a/gfx/hud/inv_weapon7.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon8.tga b/gfx/hud/inv_weapon8.tga
deleted file mode 100644 (file)
index bca989f..0000000
Binary files a/gfx/hud/inv_weapon8.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon9.tga b/gfx/hud/inv_weapon9.tga
deleted file mode 100644 (file)
index 444247f..0000000
Binary files a/gfx/hud/inv_weapon9.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapon_hlacmod_renameit.tga b/gfx/hud/inv_weapon_hlacmod_renameit.tga
deleted file mode 100644 (file)
index 503dad9..0000000
Binary files a/gfx/hud/inv_weapon_hlacmod_renameit.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponcampingrifle.tga b/gfx/hud/inv_weaponcampingrifle.tga
deleted file mode 100644 (file)
index 09da559..0000000
Binary files a/gfx/hud/inv_weaponcampingrifle.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponcrylink.tga b/gfx/hud/inv_weaponcrylink.tga
deleted file mode 100644 (file)
index 1a92967..0000000
Binary files a/gfx/hud/inv_weaponcrylink.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponelectro.tga b/gfx/hud/inv_weaponelectro.tga
deleted file mode 100644 (file)
index b800f0a..0000000
Binary files a/gfx/hud/inv_weaponelectro.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponfireball.tga b/gfx/hud/inv_weaponfireball.tga
deleted file mode 100644 (file)
index b90d687..0000000
Binary files a/gfx/hud/inv_weaponfireball.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapongrenadelauncher.tga b/gfx/hud/inv_weapongrenadelauncher.tga
deleted file mode 100644 (file)
index 91a8ce4..0000000
Binary files a/gfx/hud/inv_weapongrenadelauncher.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponhagar.tga b/gfx/hud/inv_weaponhagar.tga
deleted file mode 100644 (file)
index 3803159..0000000
Binary files a/gfx/hud/inv_weaponhagar.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponhlac.tga b/gfx/hud/inv_weaponhlac.tga
deleted file mode 100644 (file)
index b63c2d8..0000000
Binary files a/gfx/hud/inv_weaponhlac.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponhook.tga b/gfx/hud/inv_weaponhook.tga
deleted file mode 100644 (file)
index a1f662e..0000000
Binary files a/gfx/hud/inv_weaponhook.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponlaser.tga b/gfx/hud/inv_weaponlaser.tga
deleted file mode 100644 (file)
index b66500b..0000000
Binary files a/gfx/hud/inv_weaponlaser.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponminstanex.tga b/gfx/hud/inv_weaponminstanex.tga
deleted file mode 100644 (file)
index ae18113..0000000
Binary files a/gfx/hud/inv_weaponminstanex.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponnex.tga b/gfx/hud/inv_weaponnex.tga
deleted file mode 100644 (file)
index 7523580..0000000
Binary files a/gfx/hud/inv_weaponnex.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponporto.tga b/gfx/hud/inv_weaponporto.tga
deleted file mode 100644 (file)
index 444247f..0000000
Binary files a/gfx/hud/inv_weaponporto.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponrocketlauncher.tga b/gfx/hud/inv_weaponrocketlauncher.tga
deleted file mode 100644 (file)
index bca989f..0000000
Binary files a/gfx/hud/inv_weaponrocketlauncher.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponseeker.tga b/gfx/hud/inv_weaponseeker.tga
deleted file mode 100644 (file)
index 0a8cf7e..0000000
Binary files a/gfx/hud/inv_weaponseeker.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponshotgun.tga b/gfx/hud/inv_weaponshotgun.tga
deleted file mode 100644 (file)
index 32f8e20..0000000
Binary files a/gfx/hud/inv_weaponshotgun.tga and /dev/null differ
diff --git a/gfx/hud/inv_weapontuba.tga b/gfx/hud/inv_weapontuba.tga
deleted file mode 100644 (file)
index ba59aca..0000000
Binary files a/gfx/hud/inv_weapontuba.tga and /dev/null differ
diff --git a/gfx/hud/inv_weaponuzi.tga b/gfx/hud/inv_weaponuzi.tga
deleted file mode 100644 (file)
index 72ce481..0000000
Binary files a/gfx/hud/inv_weaponuzi.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_backward.tga b/gfx/hud/keys/key_backward.tga
deleted file mode 100644 (file)
index 4de0f33..0000000
Binary files a/gfx/hud/keys/key_backward.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_backward_inv.tga b/gfx/hud/keys/key_backward_inv.tga
deleted file mode 100644 (file)
index bef0d1c..0000000
Binary files a/gfx/hud/keys/key_backward_inv.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_bg.tga b/gfx/hud/keys/key_bg.tga
deleted file mode 100644 (file)
index fca30be..0000000
Binary files a/gfx/hud/keys/key_bg.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_crouch.tga b/gfx/hud/keys/key_crouch.tga
deleted file mode 100644 (file)
index 00b2dfe..0000000
Binary files a/gfx/hud/keys/key_crouch.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_crouch_inv.tga b/gfx/hud/keys/key_crouch_inv.tga
deleted file mode 100644 (file)
index 2cdbda8..0000000
Binary files a/gfx/hud/keys/key_crouch_inv.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_forward.tga b/gfx/hud/keys/key_forward.tga
deleted file mode 100644 (file)
index dfe2233..0000000
Binary files a/gfx/hud/keys/key_forward.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_forward_inv.tga b/gfx/hud/keys/key_forward_inv.tga
deleted file mode 100644 (file)
index 7bbea60..0000000
Binary files a/gfx/hud/keys/key_forward_inv.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_jump.tga b/gfx/hud/keys/key_jump.tga
deleted file mode 100644 (file)
index d02b2db..0000000
Binary files a/gfx/hud/keys/key_jump.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_jump_inv.tga b/gfx/hud/keys/key_jump_inv.tga
deleted file mode 100644 (file)
index c54bb37..0000000
Binary files a/gfx/hud/keys/key_jump_inv.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_left.tga b/gfx/hud/keys/key_left.tga
deleted file mode 100644 (file)
index 60fe71f..0000000
Binary files a/gfx/hud/keys/key_left.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_left_inv.tga b/gfx/hud/keys/key_left_inv.tga
deleted file mode 100644 (file)
index 92bc615..0000000
Binary files a/gfx/hud/keys/key_left_inv.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_right.tga b/gfx/hud/keys/key_right.tga
deleted file mode 100644 (file)
index 308c03b..0000000
Binary files a/gfx/hud/keys/key_right.tga and /dev/null differ
diff --git a/gfx/hud/keys/key_right_inv.tga b/gfx/hud/keys/key_right_inv.tga
deleted file mode 100644 (file)
index 8f04be4..0000000
Binary files a/gfx/hud/keys/key_right_inv.tga and /dev/null differ
diff --git a/gfx/hud/num_0.tga b/gfx/hud/num_0.tga
deleted file mode 100644 (file)
index f0ab2f1..0000000
Binary files a/gfx/hud/num_0.tga and /dev/null differ
diff --git a/gfx/hud/num_0_stroke.tga b/gfx/hud/num_0_stroke.tga
deleted file mode 100644 (file)
index e9c6e5b..0000000
Binary files a/gfx/hud/num_0_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_1.tga b/gfx/hud/num_1.tga
deleted file mode 100644 (file)
index 78f1f45..0000000
Binary files a/gfx/hud/num_1.tga and /dev/null differ
diff --git a/gfx/hud/num_1_stroke.tga b/gfx/hud/num_1_stroke.tga
deleted file mode 100644 (file)
index 1ff552f..0000000
Binary files a/gfx/hud/num_1_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_2.tga b/gfx/hud/num_2.tga
deleted file mode 100644 (file)
index 205dd03..0000000
Binary files a/gfx/hud/num_2.tga and /dev/null differ
diff --git a/gfx/hud/num_2_stroke.tga b/gfx/hud/num_2_stroke.tga
deleted file mode 100644 (file)
index 08d26df..0000000
Binary files a/gfx/hud/num_2_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_3.tga b/gfx/hud/num_3.tga
deleted file mode 100644 (file)
index 335b5da..0000000
Binary files a/gfx/hud/num_3.tga and /dev/null differ
diff --git a/gfx/hud/num_3_stroke.tga b/gfx/hud/num_3_stroke.tga
deleted file mode 100644 (file)
index a5fddda..0000000
Binary files a/gfx/hud/num_3_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_4.tga b/gfx/hud/num_4.tga
deleted file mode 100644 (file)
index 2b9f46f..0000000
Binary files a/gfx/hud/num_4.tga and /dev/null differ
diff --git a/gfx/hud/num_4_stroke.tga b/gfx/hud/num_4_stroke.tga
deleted file mode 100644 (file)
index fe87933..0000000
Binary files a/gfx/hud/num_4_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_5.tga b/gfx/hud/num_5.tga
deleted file mode 100644 (file)
index 8bb7043..0000000
Binary files a/gfx/hud/num_5.tga and /dev/null differ
diff --git a/gfx/hud/num_5_stroke.tga b/gfx/hud/num_5_stroke.tga
deleted file mode 100644 (file)
index 3a6978a..0000000
Binary files a/gfx/hud/num_5_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_6.tga b/gfx/hud/num_6.tga
deleted file mode 100644 (file)
index 1db8c0e..0000000
Binary files a/gfx/hud/num_6.tga and /dev/null differ
diff --git a/gfx/hud/num_6_stroke.tga b/gfx/hud/num_6_stroke.tga
deleted file mode 100644 (file)
index f64e178..0000000
Binary files a/gfx/hud/num_6_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_7.tga b/gfx/hud/num_7.tga
deleted file mode 100644 (file)
index 0099d68..0000000
Binary files a/gfx/hud/num_7.tga and /dev/null differ
diff --git a/gfx/hud/num_7_stroke.tga b/gfx/hud/num_7_stroke.tga
deleted file mode 100644 (file)
index 252e796..0000000
Binary files a/gfx/hud/num_7_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_8.tga b/gfx/hud/num_8.tga
deleted file mode 100644 (file)
index aa20157..0000000
Binary files a/gfx/hud/num_8.tga and /dev/null differ
diff --git a/gfx/hud/num_8_stroke.tga b/gfx/hud/num_8_stroke.tga
deleted file mode 100644 (file)
index e2cd39d..0000000
Binary files a/gfx/hud/num_8_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_9.tga b/gfx/hud/num_9.tga
deleted file mode 100644 (file)
index 87b9c21..0000000
Binary files a/gfx/hud/num_9.tga and /dev/null differ
diff --git a/gfx/hud/num_9_stroke.tga b/gfx/hud/num_9_stroke.tga
deleted file mode 100644 (file)
index 5a8d610..0000000
Binary files a/gfx/hud/num_9_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_colon.tga b/gfx/hud/num_colon.tga
deleted file mode 100644 (file)
index e22c09a..0000000
Binary files a/gfx/hud/num_colon.tga and /dev/null differ
diff --git a/gfx/hud/num_colon_stroke.tga b/gfx/hud/num_colon_stroke.tga
deleted file mode 100644 (file)
index 68ad28a..0000000
Binary files a/gfx/hud/num_colon_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_dot.tga b/gfx/hud/num_dot.tga
deleted file mode 100644 (file)
index 7fbfdd0..0000000
Binary files a/gfx/hud/num_dot.tga and /dev/null differ
diff --git a/gfx/hud/num_dot_stroke.tga b/gfx/hud/num_dot_stroke.tga
deleted file mode 100644 (file)
index 29ad696..0000000
Binary files a/gfx/hud/num_dot_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_minus.tga b/gfx/hud/num_minus.tga
deleted file mode 100644 (file)
index 10721f2..0000000
Binary files a/gfx/hud/num_minus.tga and /dev/null differ
diff --git a/gfx/hud/num_minus_stroke.tga b/gfx/hud/num_minus_stroke.tga
deleted file mode 100644 (file)
index 26455a0..0000000
Binary files a/gfx/hud/num_minus_stroke.tga and /dev/null differ
diff --git a/gfx/hud/num_plus.tga b/gfx/hud/num_plus.tga
deleted file mode 100644 (file)
index 3cb17b3..0000000
Binary files a/gfx/hud/num_plus.tga and /dev/null differ
diff --git a/gfx/hud/num_plus_stroke.tga b/gfx/hud/num_plus_stroke.tga
deleted file mode 100644 (file)
index 7df2faa..0000000
Binary files a/gfx/hud/num_plus_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/ammo_bullets.tga b/gfx/hud/old/ammo_bullets.tga
new file mode 100644 (file)
index 0000000..394fa05
Binary files /dev/null and b/gfx/hud/old/ammo_bullets.tga differ
diff --git a/gfx/hud/old/ammo_cells.tga b/gfx/hud/old/ammo_cells.tga
new file mode 100644 (file)
index 0000000..5365314
Binary files /dev/null and b/gfx/hud/old/ammo_cells.tga differ
diff --git a/gfx/hud/old/ammo_current_bg.tga b/gfx/hud/old/ammo_current_bg.tga
new file mode 100644 (file)
index 0000000..7f3a2af
Binary files /dev/null and b/gfx/hud/old/ammo_current_bg.tga differ
diff --git a/gfx/hud/old/ammo_fuel.tga b/gfx/hud/old/ammo_fuel.tga
new file mode 100644 (file)
index 0000000..d761568
Binary files /dev/null and b/gfx/hud/old/ammo_fuel.tga differ
diff --git a/gfx/hud/old/ammo_rockets.tga b/gfx/hud/old/ammo_rockets.tga
new file mode 100644 (file)
index 0000000..e2b4df2
Binary files /dev/null and b/gfx/hud/old/ammo_rockets.tga differ
diff --git a/gfx/hud/old/ammo_shells.tga b/gfx/hud/old/ammo_shells.tga
new file mode 100644 (file)
index 0000000..24e5c72
Binary files /dev/null and b/gfx/hud/old/ammo_shells.tga differ
diff --git a/gfx/hud/old/armor.tga b/gfx/hud/old/armor.tga
new file mode 100644 (file)
index 0000000..4801835
Binary files /dev/null and b/gfx/hud/old/armor.tga differ
diff --git a/gfx/hud/old/border.tga b/gfx/hud/old/border.tga
new file mode 100644 (file)
index 0000000..a3056c9
Binary files /dev/null and b/gfx/hud/old/border.tga differ
diff --git a/gfx/hud/old/border_radar.tga b/gfx/hud/old/border_radar.tga
new file mode 100644 (file)
index 0000000..669685b
Binary files /dev/null and b/gfx/hud/old/border_radar.tga differ
diff --git a/gfx/hud/old/dock.tga b/gfx/hud/old/dock.tga
new file mode 100644 (file)
index 0000000..2b28659
Binary files /dev/null and b/gfx/hud/old/dock.tga differ
diff --git a/gfx/hud/old/flag_blue_carrying.tga b/gfx/hud/old/flag_blue_carrying.tga
new file mode 100644 (file)
index 0000000..a8d64d1
Binary files /dev/null and b/gfx/hud/old/flag_blue_carrying.tga differ
diff --git a/gfx/hud/old/flag_blue_lost.tga b/gfx/hud/old/flag_blue_lost.tga
new file mode 100644 (file)
index 0000000..5c7e632
Binary files /dev/null and b/gfx/hud/old/flag_blue_lost.tga differ
diff --git a/gfx/hud/old/flag_blue_shielded.tga b/gfx/hud/old/flag_blue_shielded.tga
new file mode 100644 (file)
index 0000000..5da9356
Binary files /dev/null and b/gfx/hud/old/flag_blue_shielded.tga differ
diff --git a/gfx/hud/old/flag_blue_taken.tga b/gfx/hud/old/flag_blue_taken.tga
new file mode 100644 (file)
index 0000000..e6d955f
Binary files /dev/null and b/gfx/hud/old/flag_blue_taken.tga differ
diff --git a/gfx/hud/old/flag_red_carrying.tga b/gfx/hud/old/flag_red_carrying.tga
new file mode 100644 (file)
index 0000000..d1cf43d
Binary files /dev/null and b/gfx/hud/old/flag_red_carrying.tga differ
diff --git a/gfx/hud/old/flag_red_lost.tga b/gfx/hud/old/flag_red_lost.tga
new file mode 100644 (file)
index 0000000..b9d060d
Binary files /dev/null and b/gfx/hud/old/flag_red_lost.tga differ
diff --git a/gfx/hud/old/flag_red_shielded.tga b/gfx/hud/old/flag_red_shielded.tga
new file mode 100644 (file)
index 0000000..551ba61
Binary files /dev/null and b/gfx/hud/old/flag_red_shielded.tga differ
diff --git a/gfx/hud/old/flag_red_taken.tga b/gfx/hud/old/flag_red_taken.tga
new file mode 100644 (file)
index 0000000..7a1d3fc
Binary files /dev/null and b/gfx/hud/old/flag_red_taken.tga differ
diff --git a/gfx/hud/old/health.tga b/gfx/hud/old/health.tga
new file mode 100644 (file)
index 0000000..1fd71d8
Binary files /dev/null and b/gfx/hud/old/health.tga differ
diff --git a/gfx/hud/old/key_backward.tga b/gfx/hud/old/key_backward.tga
new file mode 100644 (file)
index 0000000..4de0f33
Binary files /dev/null and b/gfx/hud/old/key_backward.tga differ
diff --git a/gfx/hud/old/key_backward_inv.tga b/gfx/hud/old/key_backward_inv.tga
new file mode 100644 (file)
index 0000000..bef0d1c
Binary files /dev/null and b/gfx/hud/old/key_backward_inv.tga differ
diff --git a/gfx/hud/old/key_bg.tga b/gfx/hud/old/key_bg.tga
new file mode 100644 (file)
index 0000000..fca30be
Binary files /dev/null and b/gfx/hud/old/key_bg.tga differ
diff --git a/gfx/hud/old/key_crouch.tga b/gfx/hud/old/key_crouch.tga
new file mode 100644 (file)
index 0000000..00b2dfe
Binary files /dev/null and b/gfx/hud/old/key_crouch.tga differ
diff --git a/gfx/hud/old/key_crouch_inv.tga b/gfx/hud/old/key_crouch_inv.tga
new file mode 100644 (file)
index 0000000..2cdbda8
Binary files /dev/null and b/gfx/hud/old/key_crouch_inv.tga differ
diff --git a/gfx/hud/old/key_forward.tga b/gfx/hud/old/key_forward.tga
new file mode 100644 (file)
index 0000000..dfe2233
Binary files /dev/null and b/gfx/hud/old/key_forward.tga differ
diff --git a/gfx/hud/old/key_forward_inv.tga b/gfx/hud/old/key_forward_inv.tga
new file mode 100644 (file)
index 0000000..7bbea60
Binary files /dev/null and b/gfx/hud/old/key_forward_inv.tga differ
diff --git a/gfx/hud/old/key_jump.tga b/gfx/hud/old/key_jump.tga
new file mode 100644 (file)
index 0000000..d02b2db
Binary files /dev/null and b/gfx/hud/old/key_jump.tga differ
diff --git a/gfx/hud/old/key_jump_inv.tga b/gfx/hud/old/key_jump_inv.tga
new file mode 100644 (file)
index 0000000..c54bb37
Binary files /dev/null and b/gfx/hud/old/key_jump_inv.tga differ
diff --git a/gfx/hud/old/key_left.tga b/gfx/hud/old/key_left.tga
new file mode 100644 (file)
index 0000000..60fe71f
Binary files /dev/null and b/gfx/hud/old/key_left.tga differ
diff --git a/gfx/hud/old/key_left_inv.tga b/gfx/hud/old/key_left_inv.tga
new file mode 100644 (file)
index 0000000..92bc615
Binary files /dev/null and b/gfx/hud/old/key_left_inv.tga differ
diff --git a/gfx/hud/old/key_right.tga b/gfx/hud/old/key_right.tga
new file mode 100644 (file)
index 0000000..308c03b
Binary files /dev/null and b/gfx/hud/old/key_right.tga differ
diff --git a/gfx/hud/old/key_right_inv.tga b/gfx/hud/old/key_right_inv.tga
new file mode 100644 (file)
index 0000000..8f04be4
Binary files /dev/null and b/gfx/hud/old/key_right_inv.tga differ
diff --git a/gfx/hud/old/kh_blue.tga b/gfx/hud/old/kh_blue.tga
new file mode 100644 (file)
index 0000000..467b229
Binary files /dev/null and b/gfx/hud/old/kh_blue.tga differ
diff --git a/gfx/hud/old/kh_bluearrow.tga b/gfx/hud/old/kh_bluearrow.tga
new file mode 100644 (file)
index 0000000..b686d1b
Binary files /dev/null and b/gfx/hud/old/kh_bluearrow.tga differ
diff --git a/gfx/hud/old/kh_pink.tga b/gfx/hud/old/kh_pink.tga
new file mode 100644 (file)
index 0000000..b40967a
Binary files /dev/null and b/gfx/hud/old/kh_pink.tga differ
diff --git a/gfx/hud/old/kh_pinkarrow.tga b/gfx/hud/old/kh_pinkarrow.tga
new file mode 100644 (file)
index 0000000..17427e5
Binary files /dev/null and b/gfx/hud/old/kh_pinkarrow.tga differ
diff --git a/gfx/hud/old/kh_red.tga b/gfx/hud/old/kh_red.tga
new file mode 100644 (file)
index 0000000..3201f8a
Binary files /dev/null and b/gfx/hud/old/kh_red.tga differ
diff --git a/gfx/hud/old/kh_redarrow.tga b/gfx/hud/old/kh_redarrow.tga
new file mode 100644 (file)
index 0000000..edd1fab
Binary files /dev/null and b/gfx/hud/old/kh_redarrow.tga differ
diff --git a/gfx/hud/old/kh_yellow.tga b/gfx/hud/old/kh_yellow.tga
new file mode 100644 (file)
index 0000000..bb83475
Binary files /dev/null and b/gfx/hud/old/kh_yellow.tga differ
diff --git a/gfx/hud/old/kh_yellowarrow.tga b/gfx/hud/old/kh_yellowarrow.tga
new file mode 100644 (file)
index 0000000..8e754cc
Binary files /dev/null and b/gfx/hud/old/kh_yellowarrow.tga differ
diff --git a/gfx/hud/old/nexball_carrying.tga b/gfx/hud/old/nexball_carrying.tga
new file mode 100644 (file)
index 0000000..58d66f7
Binary files /dev/null and b/gfx/hud/old/nexball_carrying.tga differ
diff --git a/gfx/hud/old/num_0.tga b/gfx/hud/old/num_0.tga
new file mode 100644 (file)
index 0000000..f0ab2f1
Binary files /dev/null and b/gfx/hud/old/num_0.tga differ
diff --git a/gfx/hud/old/num_0_stroke.tga b/gfx/hud/old/num_0_stroke.tga
new file mode 100644 (file)
index 0000000..e9c6e5b
Binary files /dev/null and b/gfx/hud/old/num_0_stroke.tga differ
diff --git a/gfx/hud/old/num_1.tga b/gfx/hud/old/num_1.tga
new file mode 100644 (file)
index 0000000..78f1f45
Binary files /dev/null and b/gfx/hud/old/num_1.tga differ
diff --git a/gfx/hud/old/num_1_stroke.tga b/gfx/hud/old/num_1_stroke.tga
new file mode 100644 (file)
index 0000000..1ff552f
Binary files /dev/null and b/gfx/hud/old/num_1_stroke.tga differ
diff --git a/gfx/hud/old/num_2.tga b/gfx/hud/old/num_2.tga
new file mode 100644 (file)
index 0000000..205dd03
Binary files /dev/null and b/gfx/hud/old/num_2.tga differ
diff --git a/gfx/hud/old/num_2_stroke.tga b/gfx/hud/old/num_2_stroke.tga
new file mode 100644 (file)
index 0000000..08d26df
Binary files /dev/null and b/gfx/hud/old/num_2_stroke.tga differ
diff --git a/gfx/hud/old/num_3.tga b/gfx/hud/old/num_3.tga
new file mode 100644 (file)
index 0000000..335b5da
Binary files /dev/null and b/gfx/hud/old/num_3.tga differ
diff --git a/gfx/hud/old/num_3_stroke.tga b/gfx/hud/old/num_3_stroke.tga
new file mode 100644 (file)
index 0000000..a5fddda
Binary files /dev/null and b/gfx/hud/old/num_3_stroke.tga differ
diff --git a/gfx/hud/old/num_4.tga b/gfx/hud/old/num_4.tga
new file mode 100644 (file)
index 0000000..2b9f46f
Binary files /dev/null and b/gfx/hud/old/num_4.tga differ
diff --git a/gfx/hud/old/num_4_stroke.tga b/gfx/hud/old/num_4_stroke.tga
new file mode 100644 (file)
index 0000000..fe87933
Binary files /dev/null and b/gfx/hud/old/num_4_stroke.tga differ
diff --git a/gfx/hud/old/num_5.tga b/gfx/hud/old/num_5.tga
new file mode 100644 (file)
index 0000000..8bb7043
Binary files /dev/null and b/gfx/hud/old/num_5.tga differ
diff --git a/gfx/hud/old/num_5_stroke.tga b/gfx/hud/old/num_5_stroke.tga
new file mode 100644 (file)
index 0000000..3a6978a
Binary files /dev/null and b/gfx/hud/old/num_5_stroke.tga differ
diff --git a/gfx/hud/old/num_6.tga b/gfx/hud/old/num_6.tga
new file mode 100644 (file)
index 0000000..1db8c0e
Binary files /dev/null and b/gfx/hud/old/num_6.tga differ
diff --git a/gfx/hud/old/num_6_stroke.tga b/gfx/hud/old/num_6_stroke.tga
new file mode 100644 (file)
index 0000000..f64e178
Binary files /dev/null and b/gfx/hud/old/num_6_stroke.tga differ
diff --git a/gfx/hud/old/num_7.tga b/gfx/hud/old/num_7.tga
new file mode 100644 (file)
index 0000000..0099d68
Binary files /dev/null and b/gfx/hud/old/num_7.tga differ
diff --git a/gfx/hud/old/num_7_stroke.tga b/gfx/hud/old/num_7_stroke.tga
new file mode 100644 (file)
index 0000000..252e796
Binary files /dev/null and b/gfx/hud/old/num_7_stroke.tga differ
diff --git a/gfx/hud/old/num_8.tga b/gfx/hud/old/num_8.tga
new file mode 100644 (file)
index 0000000..aa20157
Binary files /dev/null and b/gfx/hud/old/num_8.tga differ
diff --git a/gfx/hud/old/num_8_stroke.tga b/gfx/hud/old/num_8_stroke.tga
new file mode 100644 (file)
index 0000000..e2cd39d
Binary files /dev/null and b/gfx/hud/old/num_8_stroke.tga differ
diff --git a/gfx/hud/old/num_9.tga b/gfx/hud/old/num_9.tga
new file mode 100644 (file)
index 0000000..87b9c21
Binary files /dev/null and b/gfx/hud/old/num_9.tga differ
diff --git a/gfx/hud/old/num_9_stroke.tga b/gfx/hud/old/num_9_stroke.tga
new file mode 100644 (file)
index 0000000..5a8d610
Binary files /dev/null and b/gfx/hud/old/num_9_stroke.tga differ
diff --git a/gfx/hud/old/num_colon.tga b/gfx/hud/old/num_colon.tga
new file mode 100644 (file)
index 0000000..e22c09a
Binary files /dev/null and b/gfx/hud/old/num_colon.tga differ
diff --git a/gfx/hud/old/num_colon_stroke.tga b/gfx/hud/old/num_colon_stroke.tga
new file mode 100644 (file)
index 0000000..68ad28a
Binary files /dev/null and b/gfx/hud/old/num_colon_stroke.tga differ
diff --git a/gfx/hud/old/num_dot.tga b/gfx/hud/old/num_dot.tga
new file mode 100644 (file)
index 0000000..7fbfdd0
Binary files /dev/null and b/gfx/hud/old/num_dot.tga differ
diff --git a/gfx/hud/old/num_dot_stroke.tga b/gfx/hud/old/num_dot_stroke.tga
new file mode 100644 (file)
index 0000000..29ad696
Binary files /dev/null and b/gfx/hud/old/num_dot_stroke.tga differ
diff --git a/gfx/hud/old/num_leading_1.tga b/gfx/hud/old/num_leading_1.tga
new file mode 100644 (file)
index 0000000..0e5233c
Binary files /dev/null and b/gfx/hud/old/num_leading_1.tga differ
diff --git a/gfx/hud/old/num_leading_2.tga b/gfx/hud/old/num_leading_2.tga
new file mode 100644 (file)
index 0000000..0629e49
Binary files /dev/null and b/gfx/hud/old/num_leading_2.tga differ
diff --git a/gfx/hud/old/num_leading_3.tga b/gfx/hud/old/num_leading_3.tga
new file mode 100644 (file)
index 0000000..a6fb924
Binary files /dev/null and b/gfx/hud/old/num_leading_3.tga differ
diff --git a/gfx/hud/old/num_minus.tga b/gfx/hud/old/num_minus.tga
new file mode 100644 (file)
index 0000000..10721f2
Binary files /dev/null and b/gfx/hud/old/num_minus.tga differ
diff --git a/gfx/hud/old/num_minus_stroke.tga b/gfx/hud/old/num_minus_stroke.tga
new file mode 100644 (file)
index 0000000..26455a0
Binary files /dev/null and b/gfx/hud/old/num_minus_stroke.tga differ
diff --git a/gfx/hud/old/num_plus.tga b/gfx/hud/old/num_plus.tga
new file mode 100644 (file)
index 0000000..3cb17b3
Binary files /dev/null and b/gfx/hud/old/num_plus.tga differ
diff --git a/gfx/hud/old/num_plus_stroke.tga b/gfx/hud/old/num_plus_stroke.tga
new file mode 100644 (file)
index 0000000..7df2faa
Binary files /dev/null and b/gfx/hud/old/num_plus_stroke.tga differ
diff --git a/gfx/hud/old/race_newfail.tga b/gfx/hud/old/race_newfail.tga
new file mode 100644 (file)
index 0000000..cd1164b
Binary files /dev/null and b/gfx/hud/old/race_newfail.tga differ
diff --git a/gfx/hud/old/race_newrankgreen.tga b/gfx/hud/old/race_newrankgreen.tga
new file mode 100644 (file)
index 0000000..c8fa157
Binary files /dev/null and b/gfx/hud/old/race_newrankgreen.tga differ
diff --git a/gfx/hud/old/race_newrankyellow.tga b/gfx/hud/old/race_newrankyellow.tga
new file mode 100644 (file)
index 0000000..0af3c59
Binary files /dev/null and b/gfx/hud/old/race_newrankyellow.tga differ
diff --git a/gfx/hud/old/race_newrecordserver.tga b/gfx/hud/old/race_newrecordserver.tga
new file mode 100644 (file)
index 0000000..aa8bae1
Binary files /dev/null and b/gfx/hud/old/race_newrecordserver.tga differ
diff --git a/gfx/hud/old/race_newtime.tga b/gfx/hud/old/race_newtime.tga
new file mode 100644 (file)
index 0000000..c9647b9
Binary files /dev/null and b/gfx/hud/old/race_newtime.tga differ
diff --git a/gfx/hud/old/rifle_ring_1.tga b/gfx/hud/old/rifle_ring_1.tga
new file mode 100644 (file)
index 0000000..a90927c
Binary files /dev/null and b/gfx/hud/old/rifle_ring_1.tga differ
diff --git a/gfx/hud/old/rifle_ring_2.tga b/gfx/hud/old/rifle_ring_2.tga
new file mode 100644 (file)
index 0000000..6f6ca4c
Binary files /dev/null and b/gfx/hud/old/rifle_ring_2.tga differ
diff --git a/gfx/hud/old/rifle_ring_3.tga b/gfx/hud/old/rifle_ring_3.tga
new file mode 100644 (file)
index 0000000..68f6df7
Binary files /dev/null and b/gfx/hud/old/rifle_ring_3.tga differ
diff --git a/gfx/hud/old/rifle_ring_4.tga b/gfx/hud/old/rifle_ring_4.tga
new file mode 100644 (file)
index 0000000..0a5db15
Binary files /dev/null and b/gfx/hud/old/rifle_ring_4.tga differ
diff --git a/gfx/hud/old/rifle_ring_5.tga b/gfx/hud/old/rifle_ring_5.tga
new file mode 100644 (file)
index 0000000..d5cc95b
Binary files /dev/null and b/gfx/hud/old/rifle_ring_5.tga differ
diff --git a/gfx/hud/old/rifle_ring_6.tga b/gfx/hud/old/rifle_ring_6.tga
new file mode 100644 (file)
index 0000000..4a126e7
Binary files /dev/null and b/gfx/hud/old/rifle_ring_6.tga differ
diff --git a/gfx/hud/old/rifle_ring_7.tga b/gfx/hud/old/rifle_ring_7.tga
new file mode 100644 (file)
index 0000000..846212b
Binary files /dev/null and b/gfx/hud/old/rifle_ring_7.tga differ
diff --git a/gfx/hud/old/rifle_ring_8.tga b/gfx/hud/old/rifle_ring_8.tga
new file mode 100644 (file)
index 0000000..137e24d
Binary files /dev/null and b/gfx/hud/old/rifle_ring_8.tga differ
diff --git a/gfx/hud/old/shield.tga b/gfx/hud/old/shield.tga
new file mode 100644 (file)
index 0000000..f13f0b4
Binary files /dev/null and b/gfx/hud/old/shield.tga differ
diff --git a/gfx/hud/old/statusbar.tga b/gfx/hud/old/statusbar.tga
new file mode 100644 (file)
index 0000000..0bbad17
Binary files /dev/null and b/gfx/hud/old/statusbar.tga differ
diff --git a/gfx/hud/old/statusbar_vertical.tga b/gfx/hud/old/statusbar_vertical.tga
new file mode 100644 (file)
index 0000000..d63a37f
Binary files /dev/null and b/gfx/hud/old/statusbar_vertical.tga differ
diff --git a/gfx/hud/old/strength.tga b/gfx/hud/old/strength.tga
new file mode 100644 (file)
index 0000000..b19019d
Binary files /dev/null and b/gfx/hud/old/strength.tga differ
diff --git a/gfx/hud/old/voteprogress_back.tga b/gfx/hud/old/voteprogress_back.tga
new file mode 100644 (file)
index 0000000..fc031ce
Binary files /dev/null and b/gfx/hud/old/voteprogress_back.tga differ
diff --git a/gfx/hud/old/voteprogress_prog.tga b/gfx/hud/old/voteprogress_prog.tga
new file mode 100644 (file)
index 0000000..9f3f614
Binary files /dev/null and b/gfx/hud/old/voteprogress_prog.tga differ
diff --git a/gfx/hud/old/voteprogress_voted.tga b/gfx/hud/old/voteprogress_voted.tga
new file mode 100644 (file)
index 0000000..a21fe6a
Binary files /dev/null and b/gfx/hud/old/voteprogress_voted.tga differ
diff --git a/gfx/hud/old/weapon_accuracy.tga b/gfx/hud/old/weapon_accuracy.tga
new file mode 100644 (file)
index 0000000..0e0c26f
Binary files /dev/null and b/gfx/hud/old/weapon_accuracy.tga differ
diff --git a/gfx/hud/old/weapon_current_bg.tga b/gfx/hud/old/weapon_current_bg.tga
new file mode 100644 (file)
index 0000000..7f3a2af
Binary files /dev/null and b/gfx/hud/old/weapon_current_bg.tga differ
diff --git a/gfx/hud/old/weapon_hlacmod_renameit.tga b/gfx/hud/old/weapon_hlacmod_renameit.tga
new file mode 100644 (file)
index 0000000..503dad9
Binary files /dev/null and b/gfx/hud/old/weapon_hlacmod_renameit.tga differ
diff --git a/gfx/hud/old/weaponcampingrifle.tga b/gfx/hud/old/weaponcampingrifle.tga
new file mode 100644 (file)
index 0000000..09da559
Binary files /dev/null and b/gfx/hud/old/weaponcampingrifle.tga differ
diff --git a/gfx/hud/old/weaponcrylink.tga b/gfx/hud/old/weaponcrylink.tga
new file mode 100644 (file)
index 0000000..1a92967
Binary files /dev/null and b/gfx/hud/old/weaponcrylink.tga differ
diff --git a/gfx/hud/old/weaponelectro.tga b/gfx/hud/old/weaponelectro.tga
new file mode 100644 (file)
index 0000000..b800f0a
Binary files /dev/null and b/gfx/hud/old/weaponelectro.tga differ
diff --git a/gfx/hud/old/weaponfireball.tga b/gfx/hud/old/weaponfireball.tga
new file mode 100644 (file)
index 0000000..b90d687
Binary files /dev/null and b/gfx/hud/old/weaponfireball.tga differ
diff --git a/gfx/hud/old/weapongrenadelauncher.tga b/gfx/hud/old/weapongrenadelauncher.tga
new file mode 100644 (file)
index 0000000..91a8ce4
Binary files /dev/null and b/gfx/hud/old/weapongrenadelauncher.tga differ
diff --git a/gfx/hud/old/weaponhagar.tga b/gfx/hud/old/weaponhagar.tga
new file mode 100644 (file)
index 0000000..3803159
Binary files /dev/null and b/gfx/hud/old/weaponhagar.tga differ
diff --git a/gfx/hud/old/weaponhlac.tga b/gfx/hud/old/weaponhlac.tga
new file mode 100644 (file)
index 0000000..b63c2d8
Binary files /dev/null and b/gfx/hud/old/weaponhlac.tga differ
diff --git a/gfx/hud/old/weaponhook.tga b/gfx/hud/old/weaponhook.tga
new file mode 100644 (file)
index 0000000..a1f662e
Binary files /dev/null and b/gfx/hud/old/weaponhook.tga differ
diff --git a/gfx/hud/old/weaponlaser.tga b/gfx/hud/old/weaponlaser.tga
new file mode 100644 (file)
index 0000000..b66500b
Binary files /dev/null and b/gfx/hud/old/weaponlaser.tga differ
diff --git a/gfx/hud/old/weaponminstanex.tga b/gfx/hud/old/weaponminstanex.tga
new file mode 100644 (file)
index 0000000..ae18113
Binary files /dev/null and b/gfx/hud/old/weaponminstanex.tga differ
diff --git a/gfx/hud/old/weaponnex.tga b/gfx/hud/old/weaponnex.tga
new file mode 100644 (file)
index 0000000..7523580
Binary files /dev/null and b/gfx/hud/old/weaponnex.tga differ
diff --git a/gfx/hud/old/weaponporto.tga b/gfx/hud/old/weaponporto.tga
new file mode 100644 (file)
index 0000000..444247f
Binary files /dev/null and b/gfx/hud/old/weaponporto.tga differ
diff --git a/gfx/hud/old/weaponrocketlauncher.tga b/gfx/hud/old/weaponrocketlauncher.tga
new file mode 100644 (file)
index 0000000..bca989f
Binary files /dev/null and b/gfx/hud/old/weaponrocketlauncher.tga differ
diff --git a/gfx/hud/old/weaponseeker.tga b/gfx/hud/old/weaponseeker.tga
new file mode 100644 (file)
index 0000000..0a8cf7e
Binary files /dev/null and b/gfx/hud/old/weaponseeker.tga differ
diff --git a/gfx/hud/old/weaponshotgun.tga b/gfx/hud/old/weaponshotgun.tga
new file mode 100644 (file)
index 0000000..32f8e20
Binary files /dev/null and b/gfx/hud/old/weaponshotgun.tga differ
diff --git a/gfx/hud/old/weapontuba.tga b/gfx/hud/old/weapontuba.tga
new file mode 100644 (file)
index 0000000..ba59aca
Binary files /dev/null and b/gfx/hud/old/weapontuba.tga differ
diff --git a/gfx/hud/old/weaponuzi.tga b/gfx/hud/old/weaponuzi.tga
new file mode 100644 (file)
index 0000000..72ce481
Binary files /dev/null and b/gfx/hud/old/weaponuzi.tga differ
diff --git a/gfx/hud/race/newfail.tga b/gfx/hud/race/newfail.tga
deleted file mode 100644 (file)
index cd1164b..0000000
Binary files a/gfx/hud/race/newfail.tga and /dev/null differ
diff --git a/gfx/hud/race/newrankgreen.tga b/gfx/hud/race/newrankgreen.tga
deleted file mode 100644 (file)
index c8fa157..0000000
Binary files a/gfx/hud/race/newrankgreen.tga and /dev/null differ
diff --git a/gfx/hud/race/newrankyellow.tga b/gfx/hud/race/newrankyellow.tga
deleted file mode 100644 (file)
index 0af3c59..0000000
Binary files a/gfx/hud/race/newrankyellow.tga and /dev/null differ
diff --git a/gfx/hud/race/newrecordserver.tga b/gfx/hud/race/newrecordserver.tga
deleted file mode 100644 (file)
index aa8bae1..0000000
Binary files a/gfx/hud/race/newrecordserver.tga and /dev/null differ
diff --git a/gfx/hud/race/newtime.tga b/gfx/hud/race/newtime.tga
deleted file mode 100644 (file)
index c9647b9..0000000
Binary files a/gfx/hud/race/newtime.tga and /dev/null differ
diff --git a/gfx/hud/rifle_ring_1.tga b/gfx/hud/rifle_ring_1.tga
deleted file mode 100644 (file)
index a90927c..0000000
Binary files a/gfx/hud/rifle_ring_1.tga and /dev/null differ
diff --git a/gfx/hud/rifle_ring_2.tga b/gfx/hud/rifle_ring_2.tga
deleted file mode 100644 (file)
index 6f6ca4c..0000000
Binary files a/gfx/hud/rifle_ring_2.tga and /dev/null differ
diff --git a/gfx/hud/rifle_ring_3.tga b/gfx/hud/rifle_ring_3.tga
deleted file mode 100644 (file)
index 68f6df7..0000000
Binary files a/gfx/hud/rifle_ring_3.tga and /dev/null differ
diff --git a/gfx/hud/rifle_ring_4.tga b/gfx/hud/rifle_ring_4.tga
deleted file mode 100644 (file)
index 0a5db15..0000000
Binary files a/gfx/hud/rifle_ring_4.tga and /dev/null differ
diff --git a/gfx/hud/rifle_ring_5.tga b/gfx/hud/rifle_ring_5.tga
deleted file mode 100644 (file)
index d5cc95b..0000000
Binary files a/gfx/hud/rifle_ring_5.tga and /dev/null differ
diff --git a/gfx/hud/rifle_ring_6.tga b/gfx/hud/rifle_ring_6.tga
deleted file mode 100644 (file)
index 4a126e7..0000000
Binary files a/gfx/hud/rifle_ring_6.tga and /dev/null differ
diff --git a/gfx/hud/rifle_ring_7.tga b/gfx/hud/rifle_ring_7.tga
deleted file mode 100644 (file)
index 846212b..0000000
Binary files a/gfx/hud/rifle_ring_7.tga and /dev/null differ
diff --git a/gfx/hud/rifle_ring_8.tga b/gfx/hud/rifle_ring_8.tga
deleted file mode 100644 (file)
index 137e24d..0000000
Binary files a/gfx/hud/rifle_ring_8.tga and /dev/null differ
diff --git a/gfx/hud/sb_accuracy.tga b/gfx/hud/sb_accuracy.tga
deleted file mode 100644 (file)
index 2974c1d..0000000
Binary files a/gfx/hud/sb_accuracy.tga and /dev/null differ
diff --git a/gfx/hud/sb_accuracy_bar.tga b/gfx/hud/sb_accuracy_bar.tga
deleted file mode 100644 (file)
index 96e853d..0000000
Binary files a/gfx/hud/sb_accuracy_bar.tga and /dev/null differ
diff --git a/gfx/hud/sb_ammobg.tga b/gfx/hud/sb_ammobg.tga
deleted file mode 100644 (file)
index 7f3a2af..0000000
Binary files a/gfx/hud/sb_ammobg.tga and /dev/null differ
diff --git a/gfx/hud/sb_armor.tga b/gfx/hud/sb_armor.tga
deleted file mode 100644 (file)
index 669bbc8..0000000
Binary files a/gfx/hud/sb_armor.tga and /dev/null differ
diff --git a/gfx/hud/sb_bullets.tga b/gfx/hud/sb_bullets.tga
deleted file mode 100644 (file)
index 394fa05..0000000
Binary files a/gfx/hud/sb_bullets.tga and /dev/null differ
diff --git a/gfx/hud/sb_cells.tga b/gfx/hud/sb_cells.tga
deleted file mode 100644 (file)
index 5365314..0000000
Binary files a/gfx/hud/sb_cells.tga and /dev/null differ
diff --git a/gfx/hud/sb_flag_blue_carrying.tga b/gfx/hud/sb_flag_blue_carrying.tga
deleted file mode 100644 (file)
index a8d64d1..0000000
Binary files a/gfx/hud/sb_flag_blue_carrying.tga and /dev/null differ
diff --git a/gfx/hud/sb_flag_blue_lost.tga b/gfx/hud/sb_flag_blue_lost.tga
deleted file mode 100644 (file)
index 5c7e632..0000000
Binary files a/gfx/hud/sb_flag_blue_lost.tga and /dev/null differ
diff --git a/gfx/hud/sb_flag_blue_shielded.tga b/gfx/hud/sb_flag_blue_shielded.tga
deleted file mode 100644 (file)
index 5da9356..0000000
Binary files a/gfx/hud/sb_flag_blue_shielded.tga and /dev/null differ
diff --git a/gfx/hud/sb_flag_blue_taken.tga b/gfx/hud/sb_flag_blue_taken.tga
deleted file mode 100644 (file)
index e6d955f..0000000
Binary files a/gfx/hud/sb_flag_blue_taken.tga and /dev/null differ
diff --git a/gfx/hud/sb_flag_red_carrying.tga b/gfx/hud/sb_flag_red_carrying.tga
deleted file mode 100644 (file)
index d1cf43d..0000000
Binary files a/gfx/hud/sb_flag_red_carrying.tga and /dev/null differ
diff --git a/gfx/hud/sb_flag_red_lost.tga b/gfx/hud/sb_flag_red_lost.tga
deleted file mode 100644 (file)
index b9d060d..0000000
Binary files a/gfx/hud/sb_flag_red_lost.tga and /dev/null differ
diff --git a/gfx/hud/sb_flag_red_shielded.tga b/gfx/hud/sb_flag_red_shielded.tga
deleted file mode 100644 (file)
index 551ba61..0000000
Binary files a/gfx/hud/sb_flag_red_shielded.tga and /dev/null differ
diff --git a/gfx/hud/sb_flag_red_taken.tga b/gfx/hud/sb_flag_red_taken.tga
deleted file mode 100644 (file)
index 7a1d3fc..0000000
Binary files a/gfx/hud/sb_flag_red_taken.tga and /dev/null differ
diff --git a/gfx/hud/sb_fuel.tga b/gfx/hud/sb_fuel.tga
deleted file mode 100644 (file)
index d761568..0000000
Binary files a/gfx/hud/sb_fuel.tga and /dev/null differ
diff --git a/gfx/hud/sb_health.tga b/gfx/hud/sb_health.tga
deleted file mode 100644 (file)
index 1a950cd..0000000
Binary files a/gfx/hud/sb_health.tga and /dev/null differ
diff --git a/gfx/hud/sb_highlight_1.tga b/gfx/hud/sb_highlight_1.tga
deleted file mode 100644 (file)
index 0e5233c..0000000
Binary files a/gfx/hud/sb_highlight_1.tga and /dev/null differ
diff --git a/gfx/hud/sb_highlight_2.tga b/gfx/hud/sb_highlight_2.tga
deleted file mode 100644 (file)
index 0629e49..0000000
Binary files a/gfx/hud/sb_highlight_2.tga and /dev/null differ
diff --git a/gfx/hud/sb_highlight_3.tga b/gfx/hud/sb_highlight_3.tga
deleted file mode 100644 (file)
index a6fb924..0000000
Binary files a/gfx/hud/sb_highlight_3.tga and /dev/null differ
diff --git a/gfx/hud/sb_highlight_4.tga b/gfx/hud/sb_highlight_4.tga
deleted file mode 100644 (file)
index ec54137..0000000
Binary files a/gfx/hud/sb_highlight_4.tga and /dev/null differ
diff --git a/gfx/hud/sb_invinc.tga b/gfx/hud/sb_invinc.tga
deleted file mode 100644 (file)
index f13f0b4..0000000
Binary files a/gfx/hud/sb_invinc.tga and /dev/null differ
diff --git a/gfx/hud/sb_kh_blue.tga b/gfx/hud/sb_kh_blue.tga
deleted file mode 100644 (file)
index 467b229..0000000
Binary files a/gfx/hud/sb_kh_blue.tga and /dev/null differ
diff --git a/gfx/hud/sb_kh_bluearrow.tga b/gfx/hud/sb_kh_bluearrow.tga
deleted file mode 100644 (file)
index b686d1b..0000000
Binary files a/gfx/hud/sb_kh_bluearrow.tga and /dev/null differ
diff --git a/gfx/hud/sb_kh_pink.tga b/gfx/hud/sb_kh_pink.tga
deleted file mode 100644 (file)
index b40967a..0000000
Binary files a/gfx/hud/sb_kh_pink.tga and /dev/null differ
diff --git a/gfx/hud/sb_kh_pinkarrow.tga b/gfx/hud/sb_kh_pinkarrow.tga
deleted file mode 100644 (file)
index 17427e5..0000000
Binary files a/gfx/hud/sb_kh_pinkarrow.tga and /dev/null differ
diff --git a/gfx/hud/sb_kh_red.tga b/gfx/hud/sb_kh_red.tga
deleted file mode 100644 (file)
index 3201f8a..0000000
Binary files a/gfx/hud/sb_kh_red.tga and /dev/null differ
diff --git a/gfx/hud/sb_kh_redarrow.tga b/gfx/hud/sb_kh_redarrow.tga
deleted file mode 100644 (file)
index edd1fab..0000000
Binary files a/gfx/hud/sb_kh_redarrow.tga and /dev/null differ
diff --git a/gfx/hud/sb_kh_yellow.tga b/gfx/hud/sb_kh_yellow.tga
deleted file mode 100644 (file)
index bb83475..0000000
Binary files a/gfx/hud/sb_kh_yellow.tga and /dev/null differ
diff --git a/gfx/hud/sb_kh_yellowarrow.tga b/gfx/hud/sb_kh_yellowarrow.tga
deleted file mode 100644 (file)
index 8e754cc..0000000
Binary files a/gfx/hud/sb_kh_yellowarrow.tga and /dev/null differ
diff --git a/gfx/hud/sb_nexball_carrying.tga b/gfx/hud/sb_nexball_carrying.tga
deleted file mode 100644 (file)
index 58d66f7..0000000
Binary files a/gfx/hud/sb_nexball_carrying.tga and /dev/null differ
diff --git a/gfx/hud/sb_rocket.tga b/gfx/hud/sb_rocket.tga
deleted file mode 100644 (file)
index e2b4df2..0000000
Binary files a/gfx/hud/sb_rocket.tga and /dev/null differ
diff --git a/gfx/hud/sb_scoreboard_bg.tga b/gfx/hud/sb_scoreboard_bg.tga
deleted file mode 100644 (file)
index 1d9ea76..0000000
Binary files a/gfx/hud/sb_scoreboard_bg.tga and /dev/null differ
diff --git a/gfx/hud/sb_scoreboard_tableheader.tga b/gfx/hud/sb_scoreboard_tableheader.tga
deleted file mode 100644 (file)
index e43040f..0000000
Binary files a/gfx/hud/sb_scoreboard_tableheader.tga and /dev/null differ
diff --git a/gfx/hud/sb_shells.tga b/gfx/hud/sb_shells.tga
deleted file mode 100644 (file)
index 24e5c72..0000000
Binary files a/gfx/hud/sb_shells.tga and /dev/null differ
diff --git a/gfx/hud/sb_str.tga b/gfx/hud/sb_str.tga
deleted file mode 100644 (file)
index b19019d..0000000
Binary files a/gfx/hud/sb_str.tga and /dev/null differ
diff --git a/gfx/hud/sb_timerbg.tga b/gfx/hud/sb_timerbg.tga
deleted file mode 100644 (file)
index 52ceaa9..0000000
Binary files a/gfx/hud/sb_timerbg.tga and /dev/null differ
diff --git a/gfx/hud/sbar.tga b/gfx/hud/sbar.tga
deleted file mode 100644 (file)
index f93ea60..0000000
Binary files a/gfx/hud/sbar.tga and /dev/null differ
diff --git a/gfx/hud/voteprogress_back.tga b/gfx/hud/voteprogress_back.tga
deleted file mode 100644 (file)
index 10ffa13..0000000
Binary files a/gfx/hud/voteprogress_back.tga and /dev/null differ
diff --git a/gfx/hud/voteprogress_prog.tga b/gfx/hud/voteprogress_prog.tga
deleted file mode 100644 (file)
index 9f3f614..0000000
Binary files a/gfx/hud/voteprogress_prog.tga and /dev/null differ
diff --git a/gfx/hud/voteprogress_voted.tga b/gfx/hud/voteprogress_voted.tga
deleted file mode 100644 (file)
index a21fe6a..0000000
Binary files a/gfx/hud/voteprogress_voted.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/ammo_bullets.tga b/gfx/hud/wickedhud/ammo_bullets.tga
new file mode 100644 (file)
index 0000000..e7cd01a
Binary files /dev/null and b/gfx/hud/wickedhud/ammo_bullets.tga differ
diff --git a/gfx/hud/wickedhud/ammo_cells.tga b/gfx/hud/wickedhud/ammo_cells.tga
new file mode 100644 (file)
index 0000000..664eb23
Binary files /dev/null and b/gfx/hud/wickedhud/ammo_cells.tga differ
diff --git a/gfx/hud/wickedhud/ammo_current_bg.tga b/gfx/hud/wickedhud/ammo_current_bg.tga
new file mode 100644 (file)
index 0000000..bd07205
Binary files /dev/null and b/gfx/hud/wickedhud/ammo_current_bg.tga differ
diff --git a/gfx/hud/wickedhud/ammo_fuel.tga b/gfx/hud/wickedhud/ammo_fuel.tga
new file mode 100644 (file)
index 0000000..8450a2f
Binary files /dev/null and b/gfx/hud/wickedhud/ammo_fuel.tga differ
diff --git a/gfx/hud/wickedhud/ammo_rockets.tga b/gfx/hud/wickedhud/ammo_rockets.tga
new file mode 100644 (file)
index 0000000..c37f077
Binary files /dev/null and b/gfx/hud/wickedhud/ammo_rockets.tga differ
diff --git a/gfx/hud/wickedhud/ammo_shells.tga b/gfx/hud/wickedhud/ammo_shells.tga
new file mode 100644 (file)
index 0000000..59bea4b
Binary files /dev/null and b/gfx/hud/wickedhud/ammo_shells.tga differ
diff --git a/gfx/hud/wickedhud/armor.tga b/gfx/hud/wickedhud/armor.tga
new file mode 100644 (file)
index 0000000..92046b4
Binary files /dev/null and b/gfx/hud/wickedhud/armor.tga differ
diff --git a/gfx/hud/wickedhud/border.tga b/gfx/hud/wickedhud/border.tga
new file mode 100644 (file)
index 0000000..8ceee44
Binary files /dev/null and b/gfx/hud/wickedhud/border.tga differ
diff --git a/gfx/hud/wickedhud/border_chat.tga b/gfx/hud/wickedhud/border_chat.tga
new file mode 100644 (file)
index 0000000..1cd065e
Binary files /dev/null and b/gfx/hud/wickedhud/border_chat.tga differ
diff --git a/gfx/hud/wickedhud/border_healtharmor.tga b/gfx/hud/wickedhud/border_healtharmor.tga
new file mode 100644 (file)
index 0000000..7109ab5
Binary files /dev/null and b/gfx/hud/wickedhud/border_healtharmor.tga differ
diff --git a/gfx/hud/wickedhud/border_inventory.tga b/gfx/hud/wickedhud/border_inventory.tga
new file mode 100644 (file)
index 0000000..20ae8f6
Binary files /dev/null and b/gfx/hud/wickedhud/border_inventory.tga differ
diff --git a/gfx/hud/wickedhud/border_modicons.tga b/gfx/hud/wickedhud/border_modicons.tga
new file mode 100644 (file)
index 0000000..5437b04
Binary files /dev/null and b/gfx/hud/wickedhud/border_modicons.tga differ
diff --git a/gfx/hud/wickedhud/border_powerups.tga b/gfx/hud/wickedhud/border_powerups.tga
new file mode 100644 (file)
index 0000000..f8fbf44
Binary files /dev/null and b/gfx/hud/wickedhud/border_powerups.tga differ
diff --git a/gfx/hud/wickedhud/border_radar.tga b/gfx/hud/wickedhud/border_radar.tga
new file mode 100644 (file)
index 0000000..a300f52
Binary files /dev/null and b/gfx/hud/wickedhud/border_radar.tga differ
diff --git a/gfx/hud/wickedhud/border_score.tga b/gfx/hud/wickedhud/border_score.tga
new file mode 100644 (file)
index 0000000..a4d8b6c
Binary files /dev/null and b/gfx/hud/wickedhud/border_score.tga differ
diff --git a/gfx/hud/wickedhud/border_timer.tga b/gfx/hud/wickedhud/border_timer.tga
new file mode 100644 (file)
index 0000000..c657136
Binary files /dev/null and b/gfx/hud/wickedhud/border_timer.tga differ
diff --git a/gfx/hud/wickedhud/border_vote.tga b/gfx/hud/wickedhud/border_vote.tga
new file mode 100644 (file)
index 0000000..13b948e
Binary files /dev/null and b/gfx/hud/wickedhud/border_vote.tga differ
diff --git a/gfx/hud/wickedhud/border_weaponicons.tga b/gfx/hud/wickedhud/border_weaponicons.tga
new file mode 100644 (file)
index 0000000..08e8dcd
Binary files /dev/null and b/gfx/hud/wickedhud/border_weaponicons.tga differ
diff --git a/gfx/hud/wickedhud/dock.tga b/gfx/hud/wickedhud/dock.tga
new file mode 100644 (file)
index 0000000..9dd4e2f
Binary files /dev/null and b/gfx/hud/wickedhud/dock.tga differ
diff --git a/gfx/hud/wickedhud/dock_small.tga b/gfx/hud/wickedhud/dock_small.tga
new file mode 100644 (file)
index 0000000..5135876
Binary files /dev/null and b/gfx/hud/wickedhud/dock_small.tga differ
diff --git a/gfx/hud/wickedhud/flag_blue_carrying.tga b/gfx/hud/wickedhud/flag_blue_carrying.tga
new file mode 100644 (file)
index 0000000..0700cd5
Binary files /dev/null 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
new file mode 100644 (file)
index 0000000..f0bb89d
Binary files /dev/null and b/gfx/hud/wickedhud/flag_blue_lost.tga differ
diff --git a/gfx/hud/wickedhud/flag_blue_shielded.tga b/gfx/hud/wickedhud/flag_blue_shielded.tga
new file mode 100644 (file)
index 0000000..e385437
Binary files /dev/null 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
new file mode 100644 (file)
index 0000000..e51e297
Binary files /dev/null and b/gfx/hud/wickedhud/flag_blue_taken.tga differ
diff --git a/gfx/hud/wickedhud/flag_red_carrying.tga b/gfx/hud/wickedhud/flag_red_carrying.tga
new file mode 100644 (file)
index 0000000..c28cea8
Binary files /dev/null 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
new file mode 100644 (file)
index 0000000..93d5579
Binary files /dev/null and b/gfx/hud/wickedhud/flag_red_lost.tga differ
diff --git a/gfx/hud/wickedhud/flag_red_shielded.tga b/gfx/hud/wickedhud/flag_red_shielded.tga
new file mode 100644 (file)
index 0000000..ed9994a
Binary files /dev/null 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
new file mode 100644 (file)
index 0000000..f999476
Binary files /dev/null and b/gfx/hud/wickedhud/flag_red_taken.tga differ
diff --git a/gfx/hud/wickedhud/health.tga b/gfx/hud/wickedhud/health.tga
new file mode 100644 (file)
index 0000000..0ed8a90
Binary files /dev/null and b/gfx/hud/wickedhud/health.tga differ
diff --git a/gfx/hud/wickedhud/key_backward.tga b/gfx/hud/wickedhud/key_backward.tga
new file mode 100644 (file)
index 0000000..4de0f33
Binary files /dev/null and b/gfx/hud/wickedhud/key_backward.tga differ
diff --git a/gfx/hud/wickedhud/key_backward_inv.tga b/gfx/hud/wickedhud/key_backward_inv.tga
new file mode 100644 (file)
index 0000000..bef0d1c
Binary files /dev/null and b/gfx/hud/wickedhud/key_backward_inv.tga differ
diff --git a/gfx/hud/wickedhud/key_crouch.tga b/gfx/hud/wickedhud/key_crouch.tga
new file mode 100644 (file)
index 0000000..00b2dfe
Binary files /dev/null and b/gfx/hud/wickedhud/key_crouch.tga differ
diff --git a/gfx/hud/wickedhud/key_crouch_inv.tga b/gfx/hud/wickedhud/key_crouch_inv.tga
new file mode 100644 (file)
index 0000000..2cdbda8
Binary files /dev/null and b/gfx/hud/wickedhud/key_crouch_inv.tga differ
diff --git a/gfx/hud/wickedhud/key_forward.tga b/gfx/hud/wickedhud/key_forward.tga
new file mode 100644 (file)
index 0000000..dfe2233
Binary files /dev/null and b/gfx/hud/wickedhud/key_forward.tga differ
diff --git a/gfx/hud/wickedhud/key_forward_inv.tga b/gfx/hud/wickedhud/key_forward_inv.tga
new file mode 100644 (file)
index 0000000..7bbea60
Binary files /dev/null and b/gfx/hud/wickedhud/key_forward_inv.tga differ
diff --git a/gfx/hud/wickedhud/key_jump.tga b/gfx/hud/wickedhud/key_jump.tga
new file mode 100644 (file)
index 0000000..d02b2db
Binary files /dev/null and b/gfx/hud/wickedhud/key_jump.tga differ
diff --git a/gfx/hud/wickedhud/key_jump_inv.tga b/gfx/hud/wickedhud/key_jump_inv.tga
new file mode 100644 (file)
index 0000000..c54bb37
Binary files /dev/null and b/gfx/hud/wickedhud/key_jump_inv.tga differ
diff --git a/gfx/hud/wickedhud/key_left.tga b/gfx/hud/wickedhud/key_left.tga
new file mode 100644 (file)
index 0000000..60fe71f
Binary files /dev/null and b/gfx/hud/wickedhud/key_left.tga differ
diff --git a/gfx/hud/wickedhud/key_left_inv.tga b/gfx/hud/wickedhud/key_left_inv.tga
new file mode 100644 (file)
index 0000000..92bc615
Binary files /dev/null and b/gfx/hud/wickedhud/key_left_inv.tga differ
diff --git a/gfx/hud/wickedhud/key_right.tga b/gfx/hud/wickedhud/key_right.tga
new file mode 100644 (file)
index 0000000..308c03b
Binary files /dev/null and b/gfx/hud/wickedhud/key_right.tga differ
diff --git a/gfx/hud/wickedhud/key_right_inv.tga b/gfx/hud/wickedhud/key_right_inv.tga
new file mode 100644 (file)
index 0000000..8f04be4
Binary files /dev/null and b/gfx/hud/wickedhud/key_right_inv.tga differ
diff --git a/gfx/hud/wickedhud/kh_blue.tga b/gfx/hud/wickedhud/kh_blue.tga
new file mode 100644 (file)
index 0000000..467b229
Binary files /dev/null and b/gfx/hud/wickedhud/kh_blue.tga differ
diff --git a/gfx/hud/wickedhud/kh_bluearrow.tga b/gfx/hud/wickedhud/kh_bluearrow.tga
new file mode 100644 (file)
index 0000000..b686d1b
Binary files /dev/null and b/gfx/hud/wickedhud/kh_bluearrow.tga differ
diff --git a/gfx/hud/wickedhud/kh_pink.tga b/gfx/hud/wickedhud/kh_pink.tga
new file mode 100644 (file)
index 0000000..b40967a
Binary files /dev/null and b/gfx/hud/wickedhud/kh_pink.tga differ
diff --git a/gfx/hud/wickedhud/kh_pinkarrow.tga b/gfx/hud/wickedhud/kh_pinkarrow.tga
new file mode 100644 (file)
index 0000000..17427e5
Binary files /dev/null and b/gfx/hud/wickedhud/kh_pinkarrow.tga differ
diff --git a/gfx/hud/wickedhud/kh_red.tga b/gfx/hud/wickedhud/kh_red.tga
new file mode 100644 (file)
index 0000000..3201f8a
Binary files /dev/null and b/gfx/hud/wickedhud/kh_red.tga differ
diff --git a/gfx/hud/wickedhud/kh_redarrow.tga b/gfx/hud/wickedhud/kh_redarrow.tga
new file mode 100644 (file)
index 0000000..edd1fab
Binary files /dev/null and b/gfx/hud/wickedhud/kh_redarrow.tga differ
diff --git a/gfx/hud/wickedhud/kh_yellow.tga b/gfx/hud/wickedhud/kh_yellow.tga
new file mode 100644 (file)
index 0000000..bb83475
Binary files /dev/null and b/gfx/hud/wickedhud/kh_yellow.tga differ
diff --git a/gfx/hud/wickedhud/kh_yellowarrow.tga b/gfx/hud/wickedhud/kh_yellowarrow.tga
new file mode 100644 (file)
index 0000000..8e754cc
Binary files /dev/null and b/gfx/hud/wickedhud/kh_yellowarrow.tga differ
diff --git a/gfx/hud/wickedhud/nexball_carrying.tga b/gfx/hud/wickedhud/nexball_carrying.tga
new file mode 100644 (file)
index 0000000..04ada8c
Binary files /dev/null and b/gfx/hud/wickedhud/nexball_carrying.tga differ
diff --git a/gfx/hud/wickedhud/notify_camping.tga b/gfx/hud/wickedhud/notify_camping.tga
new file mode 100644 (file)
index 0000000..2766dd1
Binary files /dev/null and b/gfx/hud/wickedhud/notify_camping.tga differ
diff --git a/gfx/hud/wickedhud/notify_death.tga b/gfx/hud/wickedhud/notify_death.tga
new file mode 100644 (file)
index 0000000..d5e8045
Binary files /dev/null and b/gfx/hud/wickedhud/notify_death.tga differ
diff --git a/gfx/hud/wickedhud/notify_fall.tga b/gfx/hud/wickedhud/notify_fall.tga
new file mode 100644 (file)
index 0000000..febd1d0
Binary files /dev/null and b/gfx/hud/wickedhud/notify_fall.tga differ
diff --git a/gfx/hud/wickedhud/notify_lava.tga b/gfx/hud/wickedhud/notify_lava.tga
new file mode 100644 (file)
index 0000000..3976e8b
Binary files /dev/null and b/gfx/hud/wickedhud/notify_lava.tga differ
diff --git a/gfx/hud/wickedhud/notify_outofammo.tga b/gfx/hud/wickedhud/notify_outofammo.tga
new file mode 100644 (file)
index 0000000..82a11dd
Binary files /dev/null and b/gfx/hud/wickedhud/notify_outofammo.tga differ
diff --git a/gfx/hud/wickedhud/notify_selfkill.tga b/gfx/hud/wickedhud/notify_selfkill.tga
new file mode 100644 (file)
index 0000000..646a1a2
Binary files /dev/null and b/gfx/hud/wickedhud/notify_selfkill.tga differ
diff --git a/gfx/hud/wickedhud/notify_shootingstar.tga b/gfx/hud/wickedhud/notify_shootingstar.tga
new file mode 100644 (file)
index 0000000..048e015
Binary files /dev/null and b/gfx/hud/wickedhud/notify_shootingstar.tga differ
diff --git a/gfx/hud/wickedhud/notify_slime.tga b/gfx/hud/wickedhud/notify_slime.tga
new file mode 100644 (file)
index 0000000..c08a6a3
Binary files /dev/null and b/gfx/hud/wickedhud/notify_slime.tga differ
diff --git a/gfx/hud/wickedhud/notify_teamkill.tga b/gfx/hud/wickedhud/notify_teamkill.tga
new file mode 100644 (file)
index 0000000..0f28ebb
Binary files /dev/null and b/gfx/hud/wickedhud/notify_teamkill.tga differ
diff --git a/gfx/hud/wickedhud/notify_void.tga b/gfx/hud/wickedhud/notify_void.tga
new file mode 100644 (file)
index 0000000..1e2d280
Binary files /dev/null and b/gfx/hud/wickedhud/notify_void.tga differ
diff --git a/gfx/hud/wickedhud/notify_water.tga b/gfx/hud/wickedhud/notify_water.tga
new file mode 100644 (file)
index 0000000..8315f12
Binary files /dev/null and b/gfx/hud/wickedhud/notify_water.tga differ
diff --git a/gfx/hud/wickedhud/num_0.tga b/gfx/hud/wickedhud/num_0.tga
new file mode 100644 (file)
index 0000000..f0ab2f1
Binary files /dev/null and b/gfx/hud/wickedhud/num_0.tga differ
diff --git a/gfx/hud/wickedhud/num_0_stroke.tga b/gfx/hud/wickedhud/num_0_stroke.tga
new file mode 100644 (file)
index 0000000..e9c6e5b
Binary files /dev/null and b/gfx/hud/wickedhud/num_0_stroke.tga differ
diff --git a/gfx/hud/wickedhud/num_1.tga b/gfx/hud/wickedhud/num_1.tga
new file mode 100644 (file)
index 0000000..78f1f45
Binary files /dev/null and b/gfx/hud/wickedhud/num_1.tga differ
diff --git a/gfx/hud/wickedhud/num_1_stroke.tga b/gfx/hud/wickedhud/num_1_stroke.tga
new file mode 100644 (file)
index 0000000..1ff552f
Binary files /dev/null and b/gfx/hud/wickedhud/num_1_stroke.tga differ
diff --git a/gfx/hud/wickedhud/num_2.tga b/gfx/hud/wickedhud/num_2.tga
new file mode 100644 (file)
index 0000000..205dd03
Binary files /dev/null and b/gfx/hud/wickedhud/num_2.tga differ
diff --git a/gfx/hud/wickedhud/num_2_stroke.tga b/gfx/hud/wickedhud/num_2_stroke.tga
new file mode 100644 (file)
index 0000000..08d26df
Binary files /dev/null and b/gfx/hud/wickedhud/num_2_stroke.tga differ
diff --git a/gfx/hud/wickedhud/num_3.tga b/gfx/hud/wickedhud/num_3.tga
new file mode 100644 (file)
index 0000000..335b5da
Binary files /dev/null and b/gfx/hud/wickedhud/num_3.tga differ
diff --git a/gfx/hud/wickedhud/num_3_stroke.tga b/gfx/hud/wickedhud/num_3_stroke.tga
new file mode 100644 (file)
index 0000000..a5fddda
Binary files /dev/null and b/gfx/hud/wickedhud/num_3_stroke.tga differ
diff --git a/gfx/hud/wickedhud/num_4.tga b/gfx/hud/wickedhud/num_4.tga
new file mode 100644 (file)
index 0000000..2b9f46f
Binary files /dev/null and b/gfx/hud/wickedhud/num_4.tga differ
diff --git a/gfx/hud/wickedhud/num_4_stroke.tga b/gfx/hud/wickedhud/num_4_stroke.tga
new file mode 100644 (file)
index 0000000..fe87933
Binary files /dev/null and b/gfx/hud/wickedhud/num_4_stroke.tga differ
diff --git a/gfx/hud/wickedhud/num_5.tga b/gfx/hud/wickedhud/num_5.tga
new file mode 100644 (file)
index 0000000..8bb7043
Binary files /dev/null and b/gfx/hud/wickedhud/num_5.tga differ
diff --git a/gfx/hud/wickedhud/num_5_stroke.tga b/gfx/hud/wickedhud/num_5_stroke.tga
new file mode 100644 (file)
index 0000000..3a6978a
Binary files /dev/null and b/gfx/hud/wickedhud/num_5_stroke.tga differ
diff --git a/gfx/hud/wickedhud/num_6.tga b/gfx/hud/wickedhud/num_6.tga
new file mode 100644 (file)
index 0000000..1db8c0e
Binary files /dev/null and b/gfx/hud/wickedhud/num_6.tga differ
diff --git a/gfx/hud/wickedhud/num_6_stroke.tga b/gfx/hud/wickedhud/num_6_stroke.tga
new file mode 100644 (file)
index 0000000..f64e178
Binary files /dev/null and b/gfx/hud/wickedhud/num_6_stroke.tga differ
diff --git a/gfx/hud/wickedhud/num_7.tga b/gfx/hud/wickedhud/num_7.tga
new file mode 100644 (file)
index 0000000..0099d68
Binary files /dev/null and b/gfx/hud/wickedhud/num_7.tga differ
diff --git a/gfx/hud/wickedhud/num_7_stroke.tga b/gfx/hud/wickedhud/num_7_stroke.tga
new file mode 100644 (file)
index 0000000..252e796
Binary files /dev/null and b/gfx/hud/wickedhud/num_7_stroke.tga differ
diff --git a/gfx/hud/wickedhud/num_8.tga b/gfx/hud/wickedhud/num_8.tga
new file mode 100644 (file)
index 0000000..aa20157
Binary files /dev/null and b/gfx/hud/wickedhud/num_8.tga differ
diff --git a/gfx/hud/wickedhud/num_8_stroke.tga b/gfx/hud/wickedhud/num_8_stroke.tga
new file mode 100644 (file)
index 0000000..e2cd39d
Binary files /dev/null and b/gfx/hud/wickedhud/num_8_stroke.tga differ
diff --git a/gfx/hud/wickedhud/num_9.tga b/gfx/hud/wickedhud/num_9.tga
new file mode 100644 (file)
index 0000000..87b9c21
Binary files /dev/null and b/gfx/hud/wickedhud/num_9.tga differ
diff --git a/gfx/hud/wickedhud/num_9_stroke.tga b/gfx/hud/wickedhud/num_9_stroke.tga
new file mode 100644 (file)
index 0000000..5a8d610
Binary files /dev/null and b/gfx/hud/wickedhud/num_9_stroke.tga differ
diff --git a/gfx/hud/wickedhud/num_colon.tga b/gfx/hud/wickedhud/num_colon.tga
new file mode 100644 (file)
index 0000000..e22c09a
Binary files /dev/null and b/gfx/hud/wickedhud/num_colon.tga differ
diff --git a/gfx/hud/wickedhud/num_colon_stroke.tga b/gfx/hud/wickedhud/num_colon_stroke.tga
new file mode 100644 (file)
index 0000000..68ad28a
Binary files /dev/null and b/gfx/hud/wickedhud/num_colon_stroke.tga differ
diff --git a/gfx/hud/wickedhud/num_dot.tga b/gfx/hud/wickedhud/num_dot.tga
new file mode 100644 (file)
index 0000000..7fbfdd0
Binary files /dev/null and b/gfx/hud/wickedhud/num_dot.tga differ
diff --git a/gfx/hud/wickedhud/num_dot_stroke.tga b/gfx/hud/wickedhud/num_dot_stroke.tga
new file mode 100644 (file)
index 0000000..29ad696
Binary files /dev/null and b/gfx/hud/wickedhud/num_dot_stroke.tga differ
diff --git a/gfx/hud/wickedhud/num_leading_1.tga b/gfx/hud/wickedhud/num_leading_1.tga
new file mode 100644 (file)
index 0000000..f2f59d3
Binary files /dev/null and b/gfx/hud/wickedhud/num_leading_1.tga differ
diff --git a/gfx/hud/wickedhud/num_leading_2.tga b/gfx/hud/wickedhud/num_leading_2.tga
new file mode 100644 (file)
index 0000000..a9be88c
Binary files /dev/null and b/gfx/hud/wickedhud/num_leading_2.tga differ
diff --git a/gfx/hud/wickedhud/num_leading_3.tga b/gfx/hud/wickedhud/num_leading_3.tga
new file mode 100644 (file)
index 0000000..ebd35a4
Binary files /dev/null and b/gfx/hud/wickedhud/num_leading_3.tga differ
diff --git a/gfx/hud/wickedhud/num_minus.tga b/gfx/hud/wickedhud/num_minus.tga
new file mode 100644 (file)
index 0000000..10721f2
Binary files /dev/null and b/gfx/hud/wickedhud/num_minus.tga differ
diff --git a/gfx/hud/wickedhud/num_minus_stroke.tga b/gfx/hud/wickedhud/num_minus_stroke.tga
new file mode 100644 (file)
index 0000000..26455a0
Binary files /dev/null and b/gfx/hud/wickedhud/num_minus_stroke.tga differ
diff --git a/gfx/hud/wickedhud/num_plus.tga b/gfx/hud/wickedhud/num_plus.tga
new file mode 100644 (file)
index 0000000..3cb17b3
Binary files /dev/null and b/gfx/hud/wickedhud/num_plus.tga differ
diff --git a/gfx/hud/wickedhud/num_plus_stroke.tga b/gfx/hud/wickedhud/num_plus_stroke.tga
new file mode 100644 (file)
index 0000000..7df2faa
Binary files /dev/null and b/gfx/hud/wickedhud/num_plus_stroke.tga differ
diff --git a/gfx/hud/wickedhud/race_newfail.tga b/gfx/hud/wickedhud/race_newfail.tga
new file mode 100644 (file)
index 0000000..cd1164b
Binary files /dev/null and b/gfx/hud/wickedhud/race_newfail.tga differ
diff --git a/gfx/hud/wickedhud/race_newrankgreen.tga b/gfx/hud/wickedhud/race_newrankgreen.tga
new file mode 100644 (file)
index 0000000..c8fa157
Binary files /dev/null and b/gfx/hud/wickedhud/race_newrankgreen.tga differ
diff --git a/gfx/hud/wickedhud/race_newrankyellow.tga b/gfx/hud/wickedhud/race_newrankyellow.tga
new file mode 100644 (file)
index 0000000..0af3c59
Binary files /dev/null and b/gfx/hud/wickedhud/race_newrankyellow.tga differ
diff --git a/gfx/hud/wickedhud/race_newrecordserver.tga b/gfx/hud/wickedhud/race_newrecordserver.tga
new file mode 100644 (file)
index 0000000..aa8bae1
Binary files /dev/null and b/gfx/hud/wickedhud/race_newrecordserver.tga differ
diff --git a/gfx/hud/wickedhud/race_newtime.tga b/gfx/hud/wickedhud/race_newtime.tga
new file mode 100644 (file)
index 0000000..c9647b9
Binary files /dev/null and b/gfx/hud/wickedhud/race_newtime.tga differ
diff --git a/gfx/hud/wickedhud/rifle_ring_1.tga b/gfx/hud/wickedhud/rifle_ring_1.tga
new file mode 100644 (file)
index 0000000..a90927c
Binary files /dev/null and b/gfx/hud/wickedhud/rifle_ring_1.tga differ
diff --git a/gfx/hud/wickedhud/rifle_ring_2.tga b/gfx/hud/wickedhud/rifle_ring_2.tga
new file mode 100644 (file)
index 0000000..6f6ca4c
Binary files /dev/null and b/gfx/hud/wickedhud/rifle_ring_2.tga differ
diff --git a/gfx/hud/wickedhud/rifle_ring_3.tga b/gfx/hud/wickedhud/rifle_ring_3.tga
new file mode 100644 (file)
index 0000000..68f6df7
Binary files /dev/null and b/gfx/hud/wickedhud/rifle_ring_3.tga differ
diff --git a/gfx/hud/wickedhud/rifle_ring_4.tga b/gfx/hud/wickedhud/rifle_ring_4.tga
new file mode 100644 (file)
index 0000000..0a5db15
Binary files /dev/null and b/gfx/hud/wickedhud/rifle_ring_4.tga differ
diff --git a/gfx/hud/wickedhud/rifle_ring_5.tga b/gfx/hud/wickedhud/rifle_ring_5.tga
new file mode 100644 (file)
index 0000000..d5cc95b
Binary files /dev/null and b/gfx/hud/wickedhud/rifle_ring_5.tga differ
diff --git a/gfx/hud/wickedhud/rifle_ring_6.tga b/gfx/hud/wickedhud/rifle_ring_6.tga
new file mode 100644 (file)
index 0000000..4a126e7
Binary files /dev/null and b/gfx/hud/wickedhud/rifle_ring_6.tga differ
diff --git a/gfx/hud/wickedhud/rifle_ring_7.tga b/gfx/hud/wickedhud/rifle_ring_7.tga
new file mode 100644 (file)
index 0000000..846212b
Binary files /dev/null and b/gfx/hud/wickedhud/rifle_ring_7.tga differ
diff --git a/gfx/hud/wickedhud/rifle_ring_8.tga b/gfx/hud/wickedhud/rifle_ring_8.tga
new file mode 100644 (file)
index 0000000..137e24d
Binary files /dev/null and b/gfx/hud/wickedhud/rifle_ring_8.tga differ
diff --git a/gfx/hud/wickedhud/shield.tga b/gfx/hud/wickedhud/shield.tga
new file mode 100644 (file)
index 0000000..f13f0b4
Binary files /dev/null and b/gfx/hud/wickedhud/shield.tga differ
diff --git a/gfx/hud/wickedhud/statusbar.tga b/gfx/hud/wickedhud/statusbar.tga
new file mode 100644 (file)
index 0000000..987c8f5
Binary files /dev/null and b/gfx/hud/wickedhud/statusbar.tga differ
diff --git a/gfx/hud/wickedhud/statusbar_vertical.tga b/gfx/hud/wickedhud/statusbar_vertical.tga
new file mode 100644 (file)
index 0000000..e271438
Binary files /dev/null and b/gfx/hud/wickedhud/statusbar_vertical.tga differ
diff --git a/gfx/hud/wickedhud/strength.tga b/gfx/hud/wickedhud/strength.tga
new file mode 100644 (file)
index 0000000..b19019d
Binary files /dev/null and b/gfx/hud/wickedhud/strength.tga differ
diff --git a/gfx/hud/wickedhud/voteprogress_back.tga b/gfx/hud/wickedhud/voteprogress_back.tga
new file mode 100644 (file)
index 0000000..fc031ce
Binary files /dev/null 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
new file mode 100644 (file)
index 0000000..9f3f614
Binary files /dev/null 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
new file mode 100644 (file)
index 0000000..a21fe6a
Binary files /dev/null and b/gfx/hud/wickedhud/voteprogress_voted.tga differ
diff --git a/gfx/hud/wickedhud/weapon_accuracy.tga b/gfx/hud/wickedhud/weapon_accuracy.tga
new file mode 100644 (file)
index 0000000..4a451b1
Binary files /dev/null and b/gfx/hud/wickedhud/weapon_accuracy.tga differ
diff --git a/gfx/hud/wickedhud/weapon_current_bg.tga b/gfx/hud/wickedhud/weapon_current_bg.tga
new file mode 100644 (file)
index 0000000..5a8f936
Binary files /dev/null and b/gfx/hud/wickedhud/weapon_current_bg.tga differ
diff --git a/gfx/hud/wickedhud/weapon_hlacmod_renameit.tga b/gfx/hud/wickedhud/weapon_hlacmod_renameit.tga
new file mode 100644 (file)
index 0000000..f11c173
Binary files /dev/null and b/gfx/hud/wickedhud/weapon_hlacmod_renameit.tga differ
diff --git a/gfx/hud/wickedhud/weaponcampingrifle.tga b/gfx/hud/wickedhud/weaponcampingrifle.tga
new file mode 100644 (file)
index 0000000..fb6413b
Binary files /dev/null and b/gfx/hud/wickedhud/weaponcampingrifle.tga differ
diff --git a/gfx/hud/wickedhud/weaponcrylink.tga b/gfx/hud/wickedhud/weaponcrylink.tga
new file mode 100644 (file)
index 0000000..e48ad4d
Binary files /dev/null and b/gfx/hud/wickedhud/weaponcrylink.tga differ
diff --git a/gfx/hud/wickedhud/weaponelectro.tga b/gfx/hud/wickedhud/weaponelectro.tga
new file mode 100644 (file)
index 0000000..73c791b
Binary files /dev/null and b/gfx/hud/wickedhud/weaponelectro.tga differ
diff --git a/gfx/hud/wickedhud/weaponfireball.tga b/gfx/hud/wickedhud/weaponfireball.tga
new file mode 100644 (file)
index 0000000..d7ea1fb
Binary files /dev/null and b/gfx/hud/wickedhud/weaponfireball.tga differ
diff --git a/gfx/hud/wickedhud/weapongrenadelauncher.tga b/gfx/hud/wickedhud/weapongrenadelauncher.tga
new file mode 100644 (file)
index 0000000..c09081b
Binary files /dev/null and b/gfx/hud/wickedhud/weapongrenadelauncher.tga differ
diff --git a/gfx/hud/wickedhud/weaponhagar.tga b/gfx/hud/wickedhud/weaponhagar.tga
new file mode 100644 (file)
index 0000000..69a7b72
Binary files /dev/null and b/gfx/hud/wickedhud/weaponhagar.tga differ
diff --git a/gfx/hud/wickedhud/weaponhlac.tga b/gfx/hud/wickedhud/weaponhlac.tga
new file mode 100644 (file)
index 0000000..2ba3853
Binary files /dev/null and b/gfx/hud/wickedhud/weaponhlac.tga differ
diff --git a/gfx/hud/wickedhud/weaponhook.tga b/gfx/hud/wickedhud/weaponhook.tga
new file mode 100644 (file)
index 0000000..0c7fd40
Binary files /dev/null and b/gfx/hud/wickedhud/weaponhook.tga differ
diff --git a/gfx/hud/wickedhud/weaponlaser.tga b/gfx/hud/wickedhud/weaponlaser.tga
new file mode 100644 (file)
index 0000000..1f016e1
Binary files /dev/null and b/gfx/hud/wickedhud/weaponlaser.tga differ
diff --git a/gfx/hud/wickedhud/weaponminstanex.tga b/gfx/hud/wickedhud/weaponminstanex.tga
new file mode 100644 (file)
index 0000000..26877c2
Binary files /dev/null and b/gfx/hud/wickedhud/weaponminstanex.tga differ
diff --git a/gfx/hud/wickedhud/weaponnex.tga b/gfx/hud/wickedhud/weaponnex.tga
new file mode 100644 (file)
index 0000000..4ed91bc
Binary files /dev/null and b/gfx/hud/wickedhud/weaponnex.tga differ
diff --git a/gfx/hud/wickedhud/weaponporto.tga b/gfx/hud/wickedhud/weaponporto.tga
new file mode 100644 (file)
index 0000000..46dd107
Binary files /dev/null and b/gfx/hud/wickedhud/weaponporto.tga differ
diff --git a/gfx/hud/wickedhud/weaponrocketlauncher.tga b/gfx/hud/wickedhud/weaponrocketlauncher.tga
new file mode 100644 (file)
index 0000000..f5449b3
Binary files /dev/null and b/gfx/hud/wickedhud/weaponrocketlauncher.tga differ
diff --git a/gfx/hud/wickedhud/weaponseeker.tga b/gfx/hud/wickedhud/weaponseeker.tga
new file mode 100644 (file)
index 0000000..566ee86
Binary files /dev/null and b/gfx/hud/wickedhud/weaponseeker.tga differ
diff --git a/gfx/hud/wickedhud/weaponshotgun.tga b/gfx/hud/wickedhud/weaponshotgun.tga
new file mode 100644 (file)
index 0000000..055841c
Binary files /dev/null and b/gfx/hud/wickedhud/weaponshotgun.tga differ
diff --git a/gfx/hud/wickedhud/weapontuba.tga b/gfx/hud/wickedhud/weapontuba.tga
new file mode 100644 (file)
index 0000000..8b80015
Binary files /dev/null and b/gfx/hud/wickedhud/weapontuba.tga differ
diff --git a/gfx/hud/wickedhud/weaponuzi.tga b/gfx/hud/wickedhud/weaponuzi.tga
new file mode 100644 (file)
index 0000000..c0e75d1
Binary files /dev/null and b/gfx/hud/wickedhud/weaponuzi.tga differ
diff --git a/gfx/inv_weapon0.tga b/gfx/inv_weapon0.tga
deleted file mode 100644 (file)
index d026298..0000000
Binary files a/gfx/inv_weapon0.tga and /dev/null differ
diff --git a/gfx/inv_weapon1.tga b/gfx/inv_weapon1.tga
deleted file mode 100644 (file)
index 9a1c5d7..0000000
Binary files a/gfx/inv_weapon1.tga and /dev/null differ
diff --git a/gfx/inv_weapon10.tga b/gfx/inv_weapon10.tga
deleted file mode 100644 (file)
index b69237e..0000000
Binary files a/gfx/inv_weapon10.tga and /dev/null differ
diff --git a/gfx/inv_weapon11.tga b/gfx/inv_weapon11.tga
deleted file mode 100644 (file)
index 2f4e247..0000000
Binary files a/gfx/inv_weapon11.tga and /dev/null differ
diff --git a/gfx/inv_weapon12.tga b/gfx/inv_weapon12.tga
deleted file mode 100644 (file)
index 2f6c33a..0000000
Binary files a/gfx/inv_weapon12.tga and /dev/null differ
diff --git a/gfx/inv_weapon13.tga b/gfx/inv_weapon13.tga
deleted file mode 100644 (file)
index 1803b3e..0000000
Binary files a/gfx/inv_weapon13.tga and /dev/null differ
diff --git a/gfx/inv_weapon14.tga b/gfx/inv_weapon14.tga
deleted file mode 100644 (file)
index 2a6642b..0000000
Binary files a/gfx/inv_weapon14.tga and /dev/null differ
diff --git a/gfx/inv_weapon15.tga b/gfx/inv_weapon15.tga
deleted file mode 100644 (file)
index ba59aca..0000000
Binary files a/gfx/inv_weapon15.tga and /dev/null differ
diff --git a/gfx/inv_weapon2.tga b/gfx/inv_weapon2.tga
deleted file mode 100644 (file)
index 21b8812..0000000
Binary files a/gfx/inv_weapon2.tga and /dev/null differ
diff --git a/gfx/inv_weapon3.tga b/gfx/inv_weapon3.tga
deleted file mode 100644 (file)
index 857712a..0000000
Binary files a/gfx/inv_weapon3.tga and /dev/null differ
diff --git a/gfx/inv_weapon4.tga b/gfx/inv_weapon4.tga
deleted file mode 100644 (file)
index e753fed..0000000
Binary files a/gfx/inv_weapon4.tga and /dev/null differ
diff --git a/gfx/inv_weapon5.tga b/gfx/inv_weapon5.tga
deleted file mode 100644 (file)
index 0256781..0000000
Binary files a/gfx/inv_weapon5.tga and /dev/null differ
diff --git a/gfx/inv_weapon6.tga b/gfx/inv_weapon6.tga
deleted file mode 100644 (file)
index 9e1c14e..0000000
Binary files a/gfx/inv_weapon6.tga and /dev/null differ
diff --git a/gfx/inv_weapon7.tga b/gfx/inv_weapon7.tga
deleted file mode 100644 (file)
index d9be91a..0000000
Binary files a/gfx/inv_weapon7.tga and /dev/null differ
diff --git a/gfx/inv_weapon8.tga b/gfx/inv_weapon8.tga
deleted file mode 100644 (file)
index 94897f7..0000000
Binary files a/gfx/inv_weapon8.tga and /dev/null differ
diff --git a/gfx/inv_weapon9.tga b/gfx/inv_weapon9.tga
deleted file mode 100644 (file)
index 3080c51..0000000
Binary files a/gfx/inv_weapon9.tga and /dev/null differ
diff --git a/gfx/inv_weapon_hlacmod_renameit.tga b/gfx/inv_weapon_hlacmod_renameit.tga
deleted file mode 100644 (file)
index 8c8e873..0000000
Binary files a/gfx/inv_weapon_hlacmod_renameit.tga and /dev/null differ
diff --git a/gfx/keys/key_backward.tga b/gfx/keys/key_backward.tga
deleted file mode 100644 (file)
index 4de0f33..0000000
Binary files a/gfx/keys/key_backward.tga and /dev/null differ
diff --git a/gfx/keys/key_backward_inv.tga b/gfx/keys/key_backward_inv.tga
deleted file mode 100644 (file)
index bef0d1c..0000000
Binary files a/gfx/keys/key_backward_inv.tga and /dev/null differ
diff --git a/gfx/keys/key_bg.tga b/gfx/keys/key_bg.tga
deleted file mode 100644 (file)
index fca30be..0000000
Binary files a/gfx/keys/key_bg.tga and /dev/null differ
diff --git a/gfx/keys/key_crouch.tga b/gfx/keys/key_crouch.tga
deleted file mode 100644 (file)
index 00b2dfe..0000000
Binary files a/gfx/keys/key_crouch.tga and /dev/null differ
diff --git a/gfx/keys/key_crouch_inv.tga b/gfx/keys/key_crouch_inv.tga
deleted file mode 100644 (file)
index 2cdbda8..0000000
Binary files a/gfx/keys/key_crouch_inv.tga and /dev/null differ
diff --git a/gfx/keys/key_forward.tga b/gfx/keys/key_forward.tga
deleted file mode 100644 (file)
index dfe2233..0000000
Binary files a/gfx/keys/key_forward.tga and /dev/null differ
diff --git a/gfx/keys/key_forward_inv.tga b/gfx/keys/key_forward_inv.tga
deleted file mode 100644 (file)
index 7bbea60..0000000
Binary files a/gfx/keys/key_forward_inv.tga and /dev/null differ
diff --git a/gfx/keys/key_jump.tga b/gfx/keys/key_jump.tga
deleted file mode 100644 (file)
index d02b2db..0000000
Binary files a/gfx/keys/key_jump.tga and /dev/null differ
diff --git a/gfx/keys/key_jump_inv.tga b/gfx/keys/key_jump_inv.tga
deleted file mode 100644 (file)
index c54bb37..0000000
Binary files a/gfx/keys/key_jump_inv.tga and /dev/null differ
diff --git a/gfx/keys/key_left.tga b/gfx/keys/key_left.tga
deleted file mode 100644 (file)
index 60fe71f..0000000
Binary files a/gfx/keys/key_left.tga and /dev/null differ
diff --git a/gfx/keys/key_left_inv.tga b/gfx/keys/key_left_inv.tga
deleted file mode 100644 (file)
index 92bc615..0000000
Binary files a/gfx/keys/key_left_inv.tga and /dev/null differ
diff --git a/gfx/keys/key_right.tga b/gfx/keys/key_right.tga
deleted file mode 100644 (file)
index 308c03b..0000000
Binary files a/gfx/keys/key_right.tga and /dev/null differ
diff --git a/gfx/keys/key_right_inv.tga b/gfx/keys/key_right_inv.tga
deleted file mode 100644 (file)
index 8f04be4..0000000
Binary files a/gfx/keys/key_right_inv.tga and /dev/null differ
diff --git a/gfx/nr_piece-o-cake_mini.tga b/gfx/nr_piece-o-cake_mini.tga
deleted file mode 100644 (file)
index fb3ed08..0000000
Binary files a/gfx/nr_piece-o-cake_mini.tga and /dev/null differ
diff --git a/gfx/num_0.tga b/gfx/num_0.tga
deleted file mode 100644 (file)
index 7bbc65a..0000000
Binary files a/gfx/num_0.tga and /dev/null differ
diff --git a/gfx/num_1.tga b/gfx/num_1.tga
deleted file mode 100644 (file)
index f45427e..0000000
Binary files a/gfx/num_1.tga and /dev/null differ
diff --git a/gfx/num_2.tga b/gfx/num_2.tga
deleted file mode 100644 (file)
index cd78826..0000000
Binary files a/gfx/num_2.tga and /dev/null differ
diff --git a/gfx/num_3.tga b/gfx/num_3.tga
deleted file mode 100644 (file)
index 51d9cb7..0000000
Binary files a/gfx/num_3.tga and /dev/null differ
diff --git a/gfx/num_4.tga b/gfx/num_4.tga
deleted file mode 100644 (file)
index 23dc13c..0000000
Binary files a/gfx/num_4.tga and /dev/null differ
diff --git a/gfx/num_5.tga b/gfx/num_5.tga
deleted file mode 100644 (file)
index 284c42d..0000000
Binary files a/gfx/num_5.tga and /dev/null differ
diff --git a/gfx/num_6.tga b/gfx/num_6.tga
deleted file mode 100644 (file)
index abc3502..0000000
Binary files a/gfx/num_6.tga and /dev/null differ
diff --git a/gfx/num_7.tga b/gfx/num_7.tga
deleted file mode 100644 (file)
index 4076519..0000000
Binary files a/gfx/num_7.tga and /dev/null differ
diff --git a/gfx/num_8.tga b/gfx/num_8.tga
deleted file mode 100644 (file)
index 59e9f38..0000000
Binary files a/gfx/num_8.tga and /dev/null differ
diff --git a/gfx/num_9.tga b/gfx/num_9.tga
deleted file mode 100644 (file)
index 424e564..0000000
Binary files a/gfx/num_9.tga and /dev/null differ
diff --git a/gfx/num_colon.tga b/gfx/num_colon.tga
deleted file mode 100644 (file)
index 9179c4e..0000000
Binary files a/gfx/num_colon.tga and /dev/null differ
diff --git a/gfx/num_minus.tga b/gfx/num_minus.tga
deleted file mode 100644 (file)
index 6fabf6a..0000000
Binary files a/gfx/num_minus.tga and /dev/null differ
diff --git a/gfx/ons-reborn_radar.tga b/gfx/ons-reborn_radar.tga
deleted file mode 100644 (file)
index 4af8d83..0000000
Binary files a/gfx/ons-reborn_radar.tga and /dev/null differ
diff --git a/gfx/racetrack_radar.tga b/gfx/racetrack_radar.tga
deleted file mode 100644 (file)
index 9aef542..0000000
Binary files a/gfx/racetrack_radar.tga and /dev/null differ
diff --git a/gfx/ranking.tga b/gfx/ranking.tga
deleted file mode 100644 (file)
index 4d675d8..0000000
Binary files a/gfx/ranking.tga and /dev/null differ
diff --git a/gfx/reslimed_radar.tga b/gfx/reslimed_radar.tga
deleted file mode 100644 (file)
index ad58d6d..0000000
Binary files a/gfx/reslimed_radar.tga and /dev/null differ
diff --git a/gfx/ruiner_radar.tga b/gfx/ruiner_radar.tga
deleted file mode 100644 (file)
index 5e31386..0000000
Binary files a/gfx/ruiner_radar.tga and /dev/null differ
diff --git a/gfx/runningman_1on1remix_radar.tga b/gfx/runningman_1on1remix_radar.tga
deleted file mode 100644 (file)
index 18b883d..0000000
Binary files a/gfx/runningman_1on1remix_radar.tga and /dev/null differ
diff --git a/gfx/runningman_radar.tga b/gfx/runningman_radar.tga
deleted file mode 100644 (file)
index 6e0f297..0000000
Binary files a/gfx/runningman_radar.tga and /dev/null differ
diff --git a/gfx/runningmanctf_radar.tga b/gfx/runningmanctf_radar.tga
deleted file mode 100644 (file)
index cfbd49a..0000000
Binary files a/gfx/runningmanctf_radar.tga and /dev/null differ
diff --git a/gfx/sb_armor.tga b/gfx/sb_armor.tga
deleted file mode 100644 (file)
index 53fc319..0000000
Binary files a/gfx/sb_armor.tga and /dev/null differ
diff --git a/gfx/sb_bullets.tga b/gfx/sb_bullets.tga
deleted file mode 100644 (file)
index d3808ee..0000000
Binary files a/gfx/sb_bullets.tga and /dev/null differ
diff --git a/gfx/sb_cells.tga b/gfx/sb_cells.tga
deleted file mode 100644 (file)
index eace69a..0000000
Binary files a/gfx/sb_cells.tga and /dev/null differ
diff --git a/gfx/sb_energy.tga b/gfx/sb_energy.tga
deleted file mode 100644 (file)
index b688a01..0000000
Binary files a/gfx/sb_energy.tga and /dev/null differ
diff --git a/gfx/sb_flag_blue_carrying.tga b/gfx/sb_flag_blue_carrying.tga
deleted file mode 100644 (file)
index 7372869..0000000
Binary files a/gfx/sb_flag_blue_carrying.tga and /dev/null differ
diff --git a/gfx/sb_flag_blue_lost.tga b/gfx/sb_flag_blue_lost.tga
deleted file mode 100644 (file)
index 5e8c62e..0000000
Binary files a/gfx/sb_flag_blue_lost.tga and /dev/null differ
diff --git a/gfx/sb_flag_blue_shielded.tga b/gfx/sb_flag_blue_shielded.tga
deleted file mode 100644 (file)
index 61b9d3e..0000000
Binary files a/gfx/sb_flag_blue_shielded.tga and /dev/null differ
diff --git a/gfx/sb_flag_blue_taken.tga b/gfx/sb_flag_blue_taken.tga
deleted file mode 100644 (file)
index d167429..0000000
Binary files a/gfx/sb_flag_blue_taken.tga and /dev/null differ
diff --git a/gfx/sb_flag_red_carrying.tga b/gfx/sb_flag_red_carrying.tga
deleted file mode 100644 (file)
index 4f06f15..0000000
Binary files a/gfx/sb_flag_red_carrying.tga and /dev/null differ
diff --git a/gfx/sb_flag_red_lost.tga b/gfx/sb_flag_red_lost.tga
deleted file mode 100644 (file)
index 801bac6..0000000
Binary files a/gfx/sb_flag_red_lost.tga and /dev/null differ
diff --git a/gfx/sb_flag_red_shielded.tga b/gfx/sb_flag_red_shielded.tga
deleted file mode 100644 (file)
index fe317b8..0000000
Binary files a/gfx/sb_flag_red_shielded.tga and /dev/null differ
diff --git a/gfx/sb_flag_red_taken.tga b/gfx/sb_flag_red_taken.tga
deleted file mode 100644 (file)
index 39e9b1d..0000000
Binary files a/gfx/sb_flag_red_taken.tga and /dev/null differ
diff --git a/gfx/sb_fuel.tga b/gfx/sb_fuel.tga
deleted file mode 100644 (file)
index d761568..0000000
Binary files a/gfx/sb_fuel.tga and /dev/null differ
diff --git a/gfx/sb_health.tga b/gfx/sb_health.tga
deleted file mode 100644 (file)
index 725763b..0000000
Binary files a/gfx/sb_health.tga and /dev/null differ
diff --git a/gfx/sb_invinc.tga b/gfx/sb_invinc.tga
deleted file mode 100644 (file)
index 64ea27c..0000000
Binary files a/gfx/sb_invinc.tga and /dev/null differ
diff --git a/gfx/sb_key_carrying.tga b/gfx/sb_key_carrying.tga
deleted file mode 100644 (file)
index 2f3843b..0000000
Binary files a/gfx/sb_key_carrying.tga and /dev/null differ
diff --git a/gfx/sb_kh_full.tga b/gfx/sb_kh_full.tga
deleted file mode 100644 (file)
index 8621ae9..0000000
Binary files a/gfx/sb_kh_full.tga and /dev/null differ
diff --git a/gfx/sb_kh_outline.tga b/gfx/sb_kh_outline.tga
deleted file mode 100644 (file)
index 37dfbbe..0000000
Binary files a/gfx/sb_kh_outline.tga and /dev/null differ
diff --git a/gfx/sb_nexball_carrying.tga b/gfx/sb_nexball_carrying.tga
deleted file mode 100644 (file)
index 58d66f7..0000000
Binary files a/gfx/sb_nexball_carrying.tga and /dev/null differ
diff --git a/gfx/sb_player_ready.tga b/gfx/sb_player_ready.tga
deleted file mode 100644 (file)
index 0e2a31c..0000000
Binary files a/gfx/sb_player_ready.tga and /dev/null differ
diff --git a/gfx/sb_playercolor_base.tga b/gfx/sb_playercolor_base.tga
deleted file mode 100644 (file)
index 645457d..0000000
Binary files a/gfx/sb_playercolor_base.tga and /dev/null differ
diff --git a/gfx/sb_playercolor_pants.tga b/gfx/sb_playercolor_pants.tga
deleted file mode 100644 (file)
index 608f96f..0000000
Binary files a/gfx/sb_playercolor_pants.tga and /dev/null differ
diff --git a/gfx/sb_playercolor_shirt.tga b/gfx/sb_playercolor_shirt.tga
deleted file mode 100644 (file)
index 61ad4da..0000000
Binary files a/gfx/sb_playercolor_shirt.tga and /dev/null differ
diff --git a/gfx/sb_rocket.tga b/gfx/sb_rocket.tga
deleted file mode 100644 (file)
index 4cf9b36..0000000
Binary files a/gfx/sb_rocket.tga and /dev/null differ
diff --git a/gfx/sb_shells.tga b/gfx/sb_shells.tga
deleted file mode 100644 (file)
index b274f3a..0000000
Binary files a/gfx/sb_shells.tga and /dev/null differ
diff --git a/gfx/sb_slowmo.tga b/gfx/sb_slowmo.tga
deleted file mode 100644 (file)
index 8f09acb..0000000
Binary files a/gfx/sb_slowmo.tga and /dev/null differ
diff --git a/gfx/sb_str.tga b/gfx/sb_str.tga
deleted file mode 100644 (file)
index 131eac0..0000000
Binary files a/gfx/sb_str.tga and /dev/null differ
diff --git a/gfx/sbar.tga b/gfx/sbar.tga
deleted file mode 100644 (file)
index a79d9c1..0000000
Binary files a/gfx/sbar.tga and /dev/null differ
diff --git a/gfx/sbar_minimal.tga b/gfx/sbar_minimal.tga
deleted file mode 100644 (file)
index 29f1aa6..0000000
Binary files a/gfx/sbar_minimal.tga and /dev/null differ
diff --git a/gfx/sbar_overlay.tga b/gfx/sbar_overlay.tga
deleted file mode 100644 (file)
index aeee9e7..0000000
Binary files a/gfx/sbar_overlay.tga and /dev/null differ
diff --git a/gfx/scoreboard/accuracy_bg.tga b/gfx/scoreboard/accuracy_bg.tga
new file mode 100644 (file)
index 0000000..2974c1d
Binary files /dev/null and b/gfx/scoreboard/accuracy_bg.tga differ
diff --git a/gfx/scoreboard/player_ready.tga b/gfx/scoreboard/player_ready.tga
new file mode 100644 (file)
index 0000000..0e2a31c
Binary files /dev/null and b/gfx/scoreboard/player_ready.tga differ
diff --git a/gfx/scoreboard/playercolor_base.tga b/gfx/scoreboard/playercolor_base.tga
new file mode 100644 (file)
index 0000000..645457d
Binary files /dev/null and b/gfx/scoreboard/playercolor_base.tga differ
diff --git a/gfx/scoreboard/playercolor_pants.tga b/gfx/scoreboard/playercolor_pants.tga
new file mode 100644 (file)
index 0000000..608f96f
Binary files /dev/null and b/gfx/scoreboard/playercolor_pants.tga differ
diff --git a/gfx/scoreboard/playercolor_shirt.tga b/gfx/scoreboard/playercolor_shirt.tga
new file mode 100644 (file)
index 0000000..61ad4da
Binary files /dev/null and b/gfx/scoreboard/playercolor_shirt.tga differ
diff --git a/gfx/scoreboard/scoreboard_bg.tga b/gfx/scoreboard/scoreboard_bg.tga
new file mode 100644 (file)
index 0000000..1d9ea76
Binary files /dev/null and b/gfx/scoreboard/scoreboard_bg.tga differ
diff --git a/gfx/scoreboard/scoreboard_tableheader.tga b/gfx/scoreboard/scoreboard_tableheader.tga
new file mode 100644 (file)
index 0000000..e43040f
Binary files /dev/null and b/gfx/scoreboard/scoreboard_tableheader.tga differ
diff --git a/gfx/silvercity_radar.tga b/gfx/silvercity_radar.tga
deleted file mode 100644 (file)
index 0126208..0000000
Binary files a/gfx/silvercity_radar.tga and /dev/null differ
diff --git a/gfx/skyway_radar.tga b/gfx/skyway_radar.tga
deleted file mode 100644 (file)
index f513ae1..0000000
Binary files a/gfx/skyway_radar.tga and /dev/null differ
diff --git a/gfx/slimepit_radar.tga b/gfx/slimepit_radar.tga
deleted file mode 100644 (file)
index 9bcccf8..0000000
Binary files a/gfx/slimepit_radar.tga and /dev/null differ
diff --git a/gfx/soylent_radar.tga b/gfx/soylent_radar.tga
deleted file mode 100644 (file)
index c88fa93..0000000
Binary files a/gfx/soylent_radar.tga and /dev/null differ
diff --git a/gfx/starship_radar.tga b/gfx/starship_radar.tga
deleted file mode 100644 (file)
index 6d5dc7a..0000000
Binary files a/gfx/starship_radar.tga and /dev/null differ
diff --git a/gfx/stormkeep2_radar.tga b/gfx/stormkeep2_radar.tga
deleted file mode 100644 (file)
index dbb240d..0000000
Binary files a/gfx/stormkeep2_radar.tga and /dev/null differ
diff --git a/gfx/stormkeep_radar.tga b/gfx/stormkeep_radar.tga
deleted file mode 100644 (file)
index 82e45b6..0000000
Binary files a/gfx/stormkeep_radar.tga and /dev/null differ
diff --git a/gfx/strength_radar.tga b/gfx/strength_radar.tga
deleted file mode 100644 (file)
index 961e7cc..0000000
Binary files a/gfx/strength_radar.tga and /dev/null differ
diff --git a/gfx/toxic_radar.tga b/gfx/toxic_radar.tga
deleted file mode 100644 (file)
index d643cbf..0000000
Binary files a/gfx/toxic_radar.tga and /dev/null differ
diff --git a/gfx/turret_test_radar.tga b/gfx/turret_test_radar.tga
deleted file mode 100644 (file)
index 635cbfb..0000000
Binary files a/gfx/turret_test_radar.tga and /dev/null differ
diff --git a/gfx/warfare_radar.tga b/gfx/warfare_radar.tga
deleted file mode 100644 (file)
index c184c4b..0000000
Binary files a/gfx/warfare_radar.tga and /dev/null differ
diff --git a/hud_old_nexuiz.cfg b/hud_old_nexuiz.cfg
new file mode 100644 (file)
index 0000000..cc9baef
--- /dev/null
@@ -0,0 +1,173 @@
+seta hud_skin "old"
+seta hud_bg "0"
+seta hud_bg_color "1 1 1"
+seta hud_bg_color_team "0"
+seta hud_bg_alpha "0.500000"
+seta hud_bg_border "10"
+seta hud_bg_padding "0"
+seta hud_fg_alpha "1"
+
+seta hud_dock "dock"
+seta hud_dock_color "0 0.5 0.35"
+seta hud_dock_color_team "0.700000"
+seta hud_dock_alpha "1"
+
+seta hud_progressbar_alpha 0
+seta hud_progressbar_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.370000 0.870000"
+seta hud_weaponicons_size "0.330000 0.050000"
+seta hud_weaponicons_bg ""
+seta hud_weaponicons_bg_color ""
+seta hud_weaponicons_bg_color_team ""
+seta hud_weaponicons_bg_alpha ""
+seta hud_weaponicons_bg_border ""
+seta hud_weaponicons_bg_padding "-5"
+seta hud_weaponicons_accuracy_yellow 40
+
+seta hud_inventory 1
+seta hud_inventory_pos "0.160000 0.910000"
+seta hud_inventory_size "0.190000 0.090000"
+seta hud_inventory_bg ""
+seta hud_inventory_bg_color ""
+seta hud_inventory_bg_color_team ""
+seta hud_inventory_bg_alpha ""
+seta hud_inventory_bg_border ""
+seta hud_inventory_bg_padding ""
+seta hud_inventory_onlycurrent 0
+
+seta hud_powerups 1
+seta hud_powerups_pos "0.670000 0.910000"
+seta hud_powerups_size "0.100000 0.080000"
+seta hud_powerups_bg ""
+seta hud_powerups_bg_color ""
+seta hud_powerups_bg_color_team ""
+seta hud_powerups_bg_alpha ""
+seta hud_powerups_bg_border ""
+seta hud_powerups_bg_padding ""
+seta hud_powerups_flip 1
+seta hud_powerups_mirror 0
+
+seta hud_healtharmor 1
+seta hud_healtharmor_pos "0.370000 0.930000"
+seta hud_healtharmor_size "0.300000 0.070000"
+seta hud_healtharmor_bg ""
+seta hud_healtharmor_bg_color ""
+seta hud_healtharmor_bg_color_team ""
+seta hud_healtharmor_bg_alpha ""
+seta hud_healtharmor_bg_border ""
+seta hud_healtharmor_bg_padding ""
+seta hud_healtharmor_flip 0
+seta hud_healtharmor_mirror 0
+
+seta hud_notify 1
+seta hud_notify_pos "0.690000 0.660000"
+seta hud_notify_size "0.300000 0.070000"
+seta hud_notify_bg ""
+seta hud_notify_bg_color ""
+seta hud_notify_bg_color_team ""
+seta hud_notify_bg_alpha "0"
+seta hud_notify_bg_border ""
+seta hud_notify_bg_padding ""
+seta hud_notify_flip 0
+seta hud_notify_info_top 0
+
+seta hud_timer 1
+seta hud_timer_pos "0.860000 0"
+seta hud_timer_size "0.140000 0.045528"
+seta hud_timer_bg "border"
+seta hud_timer_bg_color "0 0.5 0.35"
+seta hud_timer_bg_color_team ""
+seta hud_timer_bg_alpha "0.800000"
+seta hud_timer_bg_border ""
+seta hud_timer_bg_padding "0"
+
+seta hud_radar 2
+seta hud_radar_pos "0.800000 0"
+seta hud_radar_size "0.200000 0.260000"
+seta hud_radar_bg "border_radar"
+seta hud_radar_bg_color ""
+seta hud_radar_bg_color_team ""
+seta hud_radar_bg_alpha ""
+seta hud_radar_bg_border ""
+seta hud_radar_bg_padding "-10"
+seta hud_radar_foreground_alpha 0.800000
+seta hud_radar_alreadyvoted_alpha 0
+
+seta hud_score 1
+seta hud_score_pos "0.760000 0.913333"
+seta hud_score_size "0.240000 0.080000"
+seta hud_score_bg ""
+seta hud_score_bg_color ""
+seta hud_score_bg_color_team ""
+seta hud_score_bg_alpha ""
+seta hud_score_bg_border ""
+seta hud_score_bg_padding ""
+
+seta hud_racetimer 1
+seta hud_racetimer_pos "0.360000 0.140000"
+seta hud_racetimer_size "0.280000 0.093333"
+seta hud_racetimer_bg ""
+seta hud_racetimer_bg_color ""
+seta hud_racetimer_bg_color_team ""
+seta hud_racetimer_bg_alpha "0"
+seta hud_racetimer_bg_border ""
+seta hud_racetimer_bg_padding ""
+
+seta hud_vote 1
+seta hud_vote_pos "0.690000 0.750000"
+seta hud_vote_size "0.300000 0.100000"
+seta hud_vote_bg ""
+seta hud_vote_bg_color "0 0.5 0.35"
+seta hud_vote_bg_color_team ""
+seta hud_vote_bg_alpha "0.800000"
+seta hud_vote_bg_border ""
+seta hud_vote_bg_padding "-3"
+seta hud_vote_alreadyvoted_alpha 0.750000
+
+seta hud_modicons 1
+seta hud_modicons_pos "0.010000 0.910000"
+seta hud_modicons_size "0.135000 0.090000"
+seta hud_modicons_bg ""
+seta hud_modicons_bg_color ""
+seta hud_modicons_bg_color_team ""
+seta hud_modicons_bg_alpha ""
+seta hud_modicons_bg_border ""
+seta hud_modicons_bg_padding ""
+
+seta hud_pressedkeys 1
+seta hud_pressedkeys_pos "0.440000 0.740000"
+seta hud_pressedkeys_size "0.120000 0.094368"
+seta hud_pressedkeys_bg ""
+seta hud_pressedkeys_bg_color ""
+seta hud_pressedkeys_bg_color_team ""
+seta hud_pressedkeys_bg_alpha "0"
+seta hud_pressedkeys_bg_border ""
+seta hud_pressedkeys_bg_padding ""
+
+seta hud_chat 1
+seta hud_chat_pos "0 0.760000"
+seta hud_chat_size "0.420000 0.130000"
+seta hud_chat_bg ""
+seta hud_chat_bg_color ""
+seta hud_chat_bg_color_team ""
+seta hud_chat_bg_alpha "0"
+seta hud_chat_bg_border ""
+seta hud_chat_bg_padding ""
+
+seta hud_engineinfo 1
+seta hud_engineinfo_pos "0.020000 0.820000"
+seta hud_engineinfo_size "0.112500 0.030000"
+seta hud_engineinfo_bg ""
+seta hud_engineinfo_bg_color ""
+seta hud_engineinfo_bg_color_team ""
+seta hud_engineinfo_bg_alpha "0"
+seta hud_engineinfo_bg_border ""
+seta hud_engineinfo_bg_padding ""
+
diff --git a/hud_wickedhud_big.cfg b/hud_wickedhud_big.cfg
new file mode 100644 (file)
index 0000000..f41dcb5
--- /dev/null
@@ -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 "dock"
+seta hud_dock_color "0 0.1875 0.4375"
+seta hud_dock_color_team "0.700000"
+seta hud_dock_alpha "1"
+
+seta hud_progressbar_alpha 0.500000
+seta hud_progressbar_strength_color "0 0 0.6"
+seta hud_progressbar_shield_color "0.6 0 0.6"
+seta hud_progressbar_health_color "0.6 0 0"
+seta hud_progressbar_armor_color "0 0.6 0"
+seta hud_progressbar_fuel_color "0.6 0.6 0"
+seta hud_progressbar_nexball_color "0.7 0.1 0"
+
+seta hud_weaponicons 1
+seta hud_weaponicons_pos "0.940000 0.110000"
+seta hud_weaponicons_size "0.040000 0.440000"
+seta hud_weaponicons_bg "border_weaponicons"
+seta hud_weaponicons_bg_color ""
+seta hud_weaponicons_bg_color_team ""
+seta hud_weaponicons_bg_alpha ""
+seta hud_weaponicons_bg_border ""
+seta hud_weaponicons_bg_padding ""
+seta hud_weaponicons_accuracy_yellow 40
+
+seta hud_inventory 1
+seta hud_inventory_pos "0.710000 0.900000"
+seta hud_inventory_size "0.150000 0.080000"
+seta hud_inventory_bg "border_inventory"
+seta hud_inventory_bg_color ""
+seta hud_inventory_bg_color_team ""
+seta hud_inventory_bg_alpha ""
+seta hud_inventory_bg_border ""
+seta hud_inventory_bg_padding ""
+seta hud_inventory_onlycurrent 0
+
+seta hud_powerups 1
+seta hud_powerups_pos "0.400000 0.130000"
+seta hud_powerups_size "0.200000 0.050000"
+seta hud_powerups_bg "border_powerups"
+seta hud_powerups_bg_color ""
+seta hud_powerups_bg_color_team ""
+seta hud_powerups_bg_alpha ""
+seta hud_powerups_bg_border ""
+seta hud_powerups_bg_padding ""
+seta hud_powerups_flip 1
+seta hud_powerups_mirror 0
+
+seta hud_healtharmor 1
+seta hud_healtharmor_pos "0.330000 0.850000"
+seta hud_healtharmor_size "0.340000 0.090000"
+seta hud_healtharmor_bg "border_healtharmor"
+seta hud_healtharmor_bg_color ""
+seta hud_healtharmor_bg_color_team ""
+seta hud_healtharmor_bg_alpha ""
+seta hud_healtharmor_bg_border ""
+seta hud_healtharmor_bg_padding ""
+seta hud_healtharmor_flip 0
+seta hud_healtharmor_mirror 0
+
+seta hud_notify 1
+seta hud_notify_pos "0.710000 0.570000"
+seta hud_notify_size "0.270000 0.280000"
+seta hud_notify_bg "border_modicons"
+seta hud_notify_bg_color ""
+seta hud_notify_bg_color_team ""
+seta hud_notify_bg_alpha "0"
+seta hud_notify_bg_border ""
+seta hud_notify_bg_padding ""
+seta hud_notify_flip 0
+seta hud_notify_info_top 1
+
+seta hud_timer 1
+seta hud_timer_pos "0.820000 0.017967"
+seta hud_timer_size "0.160000 0.052033"
+seta hud_timer_bg "border_timer"
+seta hud_timer_bg_color ""
+seta hud_timer_bg_color_team ""
+seta hud_timer_bg_alpha ""
+seta hud_timer_bg_border ""
+seta hud_timer_bg_padding "0"
+
+seta hud_radar 2
+seta hud_radar_pos "0.030000 0.080000"
+seta hud_radar_size "0.210000 0.250000"
+seta hud_radar_bg "border_radar"
+seta hud_radar_bg_color ""
+seta hud_radar_bg_color_team ""
+seta hud_radar_bg_alpha ""
+seta hud_radar_bg_border ""
+seta hud_radar_bg_padding "-3"
+seta hud_radar_foreground_alpha 0.800000
+seta hud_radar_alreadyvoted_alpha 0
+
+seta hud_score 1
+seta hud_score_pos "0.050000 0.900000"
+seta hud_score_size "0.240000 0.080000"
+seta hud_score_bg "border_score"
+seta hud_score_bg_color ""
+seta hud_score_bg_color_team ""
+seta hud_score_bg_alpha ""
+seta hud_score_bg_border ""
+seta hud_score_bg_padding ""
+
+seta hud_racetimer 1
+seta hud_racetimer_pos "0.360000 0.010000"
+seta hud_racetimer_size "0.280000 0.093333"
+seta hud_racetimer_bg "border_timer"
+seta hud_racetimer_bg_color ""
+seta hud_racetimer_bg_color_team ""
+seta hud_racetimer_bg_alpha 0
+seta hud_racetimer_bg_border ""
+seta hud_racetimer_bg_padding ""
+
+seta hud_vote 1
+seta hud_vote_pos "0.020000 0.600000"
+seta hud_vote_size "0.240000 0.080000"
+seta hud_vote_bg "border_vote"
+seta hud_vote_bg_color ""
+seta hud_vote_bg_color_team ""
+seta hud_vote_bg_alpha ""
+seta hud_vote_bg_border ""
+seta hud_vote_bg_padding ""
+seta hud_vote_alreadyvoted_alpha 0.750000
+
+seta hud_modicons 1
+seta hud_modicons_pos "0.880000 0.900000"
+seta hud_modicons_size "0.105000 0.070000"
+seta hud_modicons_bg "border_modicons"
+seta hud_modicons_bg_color ""
+seta hud_modicons_bg_color_team ""
+seta hud_modicons_bg_alpha ""
+seta hud_modicons_bg_border ""
+seta hud_modicons_bg_padding ""
+
+seta hud_pressedkeys 1
+seta hud_pressedkeys_pos "0.460000 0.740000"
+seta hud_pressedkeys_size "0.080000 0.062912"
+seta hud_pressedkeys_bg "border_modicons"
+seta hud_pressedkeys_bg_color ""
+seta hud_pressedkeys_bg_color_team ""
+seta hud_pressedkeys_bg_alpha "0"
+seta hud_pressedkeys_bg_border ""
+seta hud_pressedkeys_bg_padding ""
+
+seta hud_chat 1
+seta hud_chat_pos "0.020000 0.710000"
+seta hud_chat_size "0.360000 0.100000"
+seta hud_chat_bg "border_chat"
+seta hud_chat_bg_color ""
+seta hud_chat_bg_color_team ""
+seta hud_chat_bg_alpha "0"
+seta hud_chat_bg_border ""
+seta hud_chat_bg_padding ""
+
+seta hud_engineinfo 1
+seta hud_engineinfo_pos "0.020000 0.820000"
+seta hud_engineinfo_size "0.112500 0.030000"
+seta hud_engineinfo_bg "border_modicons"
+seta hud_engineinfo_bg_color ""
+seta hud_engineinfo_bg_color_team ""
+seta hud_engineinfo_bg_alpha "0"
+seta hud_engineinfo_bg_border ""
+seta hud_engineinfo_bg_padding ""
+
diff --git a/hud_wickedhud_default.cfg b/hud_wickedhud_default.cfg
new file mode 100644 (file)
index 0000000..62d9d11
--- /dev/null
@@ -0,0 +1,185 @@
+seta hud_skin "wickedhud" "skin folder where to look for images"
+seta hud_bg "border" "default background for the panels, file must exist in gfx/hud/[skin name]/, 0 = disable background by default"
+seta hud_bg_color "0.875 0.375 0" "default background color for the panels, accepts \"shirt\" and \"pants\""
+seta hud_bg_color_team 0 "default setting for overriding panel color with team color in team games, 0.5 = less saturated"
+seta hud_bg_alpha 1 "default alpha of the background"
+seta hud_bg_border 6 "default border size for the panels"
+seta hud_bg_padding 2 "default padding of contents from the border"
+seta hud_fg_alpha 1 "alpha of the foreground"
+
+seta hud_dock "dock_small" "enable a fullscreen background for the hud, useful for creating artificial docks, \"\" = disable"
+seta hud_dock_color "0 0.1875 0.4375" "dock color, accepts \"shirt\" and \"pants\""
+seta hud_dock_color_team 0.7 "override dock color with team color in team games"
+seta hud_dock_alpha 1 "alpha of the dock"
+
+seta hud_progressbar_alpha "0.5" "alpha of progressbars"
+seta hud_progressbar_strength_color "0 0 0.6" "R G B vector of the progress bar background color"
+seta hud_progressbar_shield_color "0.6 0 0.6" "R G B vector of the progress bar background color"
+seta hud_progressbar_health_color "0.6 0 0" "R G B vector of the progress bar background color"
+seta hud_progressbar_armor_color "0 0.6 0" "R G B vector of the progress bar background color"
+seta hud_progressbar_fuel_color "0.6 0.6 0" "R G B vector of the progress bar background color"
+seta hud_progressbar_nexball_color "0.7 0.1 0" "R G B vector of the progress bar background color"
+
+seta hud_weaponicons 1 "enable/disable this panel"
+seta hud_weaponicons_pos "0.930000 0.090000" "position of this panel"
+seta hud_weaponicons_size "0.040000 0.490000" "size of this panel"
+seta hud_weaponicons_number 1 "show number of weapon"
+seta hud_weaponicons_accuracy_yellow 40 "percentage at which the accuracy color is yellow"
+seta hud_weaponicons_bg "border_weaponicons" "if set to something else than \"\" = override default background"
+seta hud_weaponicons_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_weaponicons_bg_color_team "" "override panel color with team color in team based games"
+seta hud_weaponicons_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_weaponicons_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_weaponicons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_inventory 1 "enable/disable this panel"
+seta hud_inventory_pos "0.190000 0.930000" "position of this panel"
+seta hud_inventory_size "0.093750 0.050000" "size of this panel"
+seta hud_inventory_onlycurrent 1 "1 = show only current ammo type"
+seta hud_inventory_bg "border_inventory" "if set to something else than \"\" = override default background"
+seta hud_inventory_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_inventory_bg_color_team "" "override panel color with team color in team based games"
+seta hud_inventory_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_inventory_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_inventory_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_powerups 1 "enable/disable this panel"
+seta hud_powerups_pos "0.400000 0.130000" "position of this panel"
+seta hud_powerups_size "0.200000 0.050000" "size of this panel"
+seta hud_powerups_flip 1 "flip strength/shield positions"
+seta hud_powerups_mirror 0 "mirror alignment of panel items"
+seta hud_powerups_bg "border_powerups" "if set to something else than \"\" = override default background"
+seta hud_powerups_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_powerups_bg_color_team "" "override panel color with team color in team based games"
+seta hud_powerups_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_powerups_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_powerups_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_healtharmor 1 "enable/disable this panel, 2 = combined health/armor display"
+seta hud_healtharmor_pos "0.300000 0.930000" "position of this panel"
+seta hud_healtharmor_size "0.240000 0.050000" "size of this panel"
+seta hud_healtharmor_flip 0 "flip health/armor positions"
+seta hud_healtharmor_mirror 0 "mirror alignment of panel items"
+seta hud_healtharmor_bg "border_healtharmor" "if set to something else than \"\" = override default background"
+seta hud_healtharmor_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_healtharmor_bg_color_team "" "override panel color with team color in team based games"
+seta hud_healtharmor_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_healtharmor_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_healtharmor_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_notify 1 "enable/disable this panel"
+seta hud_notify_pos "0.660000 0.600000" "position of this base of the panel"
+seta hud_notify_size "0.320000 0.330000" "size of this panel with all notifications on"
+seta hud_notify_bg "border_modicons" "if set to something else than \"\" = override default background"
+seta hud_notify_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_notify_bg_color_team "" "override panel color with team color in team based games"
+seta hud_notify_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha"
+seta hud_notify_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_notify_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_notify_flip 0 "order the list top to bottom instead of bottom to top"
+seta hud_notify_print 0 "also con_notify print the messages that are shown on the notify panel"
+seta hud_notify_time 10 "time that a new entry stays until it fades out"
+seta hud_notify_fadetime 3 "fade out time"
+seta hud_notify_info_top 1 "show info messages at top of panel"
+
+seta hud_timer 1 "enable/disable this panel"
+seta hud_timer_pos "0.880000 0.015000" "position of this base of the panel"
+seta hud_timer_size "0.100000 0.032520" "size of this panel"
+seta hud_timer_increment 0 "show elapsed time instead of remaining time"
+seta hud_timer_bg "border_timer" "if set to something else than \"\" = override default background"
+seta hud_timer_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_timer_bg_color_team "" "override panel color with team color in team based games"
+seta hud_timer_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_timer_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_timer_bg_padding "0" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_radar 2 "enable/disable this panel, 2 = also enable in non-teambased gamemodes"
+seta hud_radar_pos "0.030000 0.020000" "position of this base of the panel"
+seta hud_radar_size "0.190000 0.230000" "size of this panel"
+seta hud_radar_bg "border_radar" "if set to something else than \"\" = override default background"
+seta hud_radar_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_radar_bg_color_team "" "override panel color with team color in team based games"
+seta hud_radar_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_radar_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_radar_bg_padding "-3" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_radar_foreground_alpha 0.8    "alpha of the map"
+seta hud_radar_scale 4096 "distance you can see on the team radar"
+seta hud_radar_rotation 0      "rotation mode: you set what points up. 0 = player, 1 = west, 2 = south, 3 = east, 4 = north"
+seta hud_radar_zoommode 0      "zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out"
+alias hud_radar_rotate "toggle hud_radar_rotation 0 1 2 3 4"
+
+seta hud_score 1 "enable/disable this panel"
+seta hud_score_pos "0.020000 0.930000" "position of this base of the panel"
+seta hud_score_size "0.150000 0.050000" "size of this panel"
+seta hud_score_bg "border_score" "if set to something else than \"\" = override default background"
+seta hud_score_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_score_bg_color_team "" "override panel color with team color in team based games"
+seta hud_score_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_score_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_score_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_racetimer 1 "enable/disable this panel"
+seta hud_racetimer_pos "0.360000 0.010000" "position of this base of the panel"
+seta hud_racetimer_size "0.280000 0.093333" "size of this panel"
+seta hud_racetimer_bg "border_timer" "if set to something else than \"\" = override default background"
+seta hud_racetimer_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_racetimer_bg_color_team "" "override panel color with team color in team based games"
+seta hud_racetimer_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha"
+seta hud_racetimer_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_racetimer_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_vote 1 "enable/disable this panel"
+seta hud_vote_pos "0.400000 0.800000" "position of this base of the panel"
+seta hud_vote_size "0.240000 0.080000" "size of this panel"
+seta hud_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted"
+seta hud_vote_bg "border_vote" "if set to something else than \"\" = override default background"
+seta hud_vote_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_vote_bg_color_team "" "override panel color with team color in team based games"
+seta hud_vote_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_vote_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_vote_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_modicons 1 "enable/disable this panel"
+seta hud_modicons_pos "0.560000 0.930000" "position of this base of the panel"
+seta hud_modicons_size "0.075000 0.050000" "size of this panel"
+seta hud_modicons_bg "border_modicons" "if set to something else than \"\" = override default background"
+seta hud_modicons_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_modicons_bg_color_team "" "override panel color with team color in team based games"
+seta hud_modicons_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_modicons_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_modicons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_pressedkeys 1 "enable/disable this panel, 1 = show only when spectating other players, 2 = show always"
+seta hud_pressedkeys_pos "0.460000 0.730000" "position of this base of the panel"
+seta hud_pressedkeys_size "0.080000 0.062912" "size of this panel"
+seta hud_pressedkeys_bg "border_modicons" "if set to something else than \"\" = override default background"
+seta hud_pressedkeys_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_pressedkeys_bg_color_team "" "override panel color with team color in team based games"
+seta hud_pressedkeys_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha"
+seta hud_pressedkeys_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_pressedkeys_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_chat 1 "enable/disable this panel"
+seta hud_chat_pos "0.020000 0.790000" "position of this base of the panel"
+seta hud_chat_size "0.360000 0.100000" "size of this panel"
+seta hud_chat_bg "border_chat" "if set to something else than \"\" = override default background"
+seta hud_chat_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_chat_bg_color_team "" "override panel color with team color in team based games"
+seta hud_chat_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha"
+seta hud_chat_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_chat_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_engineinfo 1 "enable/disable this panel
+seta hud_engineinfo_pos "0.860000 0.950000" "position of this base of the panel"
+seta hud_engineinfo_size "0.130000 0.034667" "size of this panel"
+seta hud_engineinfo_bg "border_modicons" "if set to something else than \"\" = override default background"
+seta hud_engineinfo_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_engineinfo_bg_color_team "" "override panel color with team color in team based games"
+seta hud_engineinfo_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha"
+seta hud_engineinfo_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_engineinfo_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_engineinfo_framecounter_time 1 "time between framerate display updates, smaller values yield less accuracy"
+seta hud_engineinfo_framecounter_decimals 0 "amount of decimals to show"
+seta hud_engineinfo_framecounter_exponentialmovingaverage 1 "use an averaging method for calculating fps instead of counting frametime like engine does"
+seta hud_engineinfo_framecounter_exponentialmovingaverage_new_weight 0.1 "weight of latest data point"
+seta hud_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold 0.5 "threshold for fps change when to update instantly, to make big fps changes update faster"
index 31822ff57635e98231e1d67bfd9101fe2e39eef9..1aee5d8189a56169f1e9bf8d6c7fd507a800105a 100644 (file)
@@ -33,7 +33,6 @@
 "+showscores"                           "show scores"
 "+showaccuracy"                                "show accuracy"
 "screenshot"                            "screen shot"
-"radar"                                 "toggle full radar"
 ""                                      ""
 ""                                      "Communicate"
 "messagemode"                           "public chat"
diff --git a/loadfonts.cfg b/loadfonts.cfg
deleted file mode 100644 (file)
index dd3b637..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-// When freetype support is in SVN, remove the space between vera-sans and the comma :)
-// like: loadfont user0 gfx/vera-sans,gfx/fallback 8 12 16 24 32
-// loadfont console     gfx/vera-mono,gfx/fallback $con_textsize 9 10 11
-// loadfont sbar        gfx/vera-mono
-loadfont notify      gfx/vera-sans,gfx/fallback 8 12 16 24 32
-loadfont chat        gfx/vera-sans,gfx/fallback 8 13 16 24 32
-// loadfont centerprint gfx/vera-mono
-// loadfont infobar     gfx/vera-mono
-loadfont user0       gfx/vera-sans,gfx/fallback 8 12 16 24 32
-
-// now create the real sbar_font alias
-alias sbar_font "loadfont user1 ${1},gfx/fallback ${2-}; loadfont user2 ${1}-big,gfx/fallback ${2-}; sbar_columns_set"
-// if _requested_sbar_font is empty, the string becaomse "nonempty: "
-// for the case "nonempty: " a default value is used
-// in any other case, the _requested_sbar_font is sued
-set _used_sbar_font "nonempty: $_requested_sbar_font"
-toggle _used_sbar_font "$_requested_sbar_font" "nonempty: " "gfx/vera-sans 8 12 16 24 32"
-toggle _requested_sbar_font "" "gfx/vera-sans 8 12 16 24 32" "gfx/vera-sans 8 12 16 24 32" "$_requested_sbar_font"
-sbar_font ${_requested_sbar_font asis}
-
-set menu_font_size_snapping_fix 1
index 28a3c07cc38032d61ca4ab40da7402bb83263012..ebd112b84aa04b52e7c98f48233aa48a17721677 100644 (file)
Binary files a/models/player/erebus.iqm and b/models/player/erebus.iqm differ
index ee7fb587718aa4fb54d0c621f0cb146e8a03cfd0..4fedf7713d5d990cca362a32750f2ec6add7b622 100644 (file)
Binary files a/models/player/erebus.iqm_0.tga and b/models/player/erebus.iqm_0.tga differ
index 22a1975517fa37fc75ca2449342e5d76ddde5b17..dccf325bcaacae7c8bb1b35ec515235ca5e789a5 100644 (file)
Binary files a/models/player/gak.iqm and b/models/player/gak.iqm differ
index 093b7f061deeb1fd653e17ff1181c5c18fdc119a..38a72739c1e7660414c3022bff8251c6b29ad873 100644 (file)
Binary files a/models/player/gak.iqm_0.tga and b/models/player/gak.iqm_0.tga differ
index 9df6bdb33a8ca2d4e45a264f021469a5711bb1f5..c4b574a074680ee489fe744a8ffe3e818dfaa472 100644 (file)
Binary files a/models/player/gakarmored.iqm and b/models/player/gakarmored.iqm differ
index b4a58ea31b55ff19794a3554e1630f5ee7c1bae2..0fbb375cdddee31738e590554f5e4542e547da7a 100644 (file)
Binary files a/models/player/gakarmored.iqm_0.tga and b/models/player/gakarmored.iqm_0.tga differ
index 275953dff302feae71bc5b3c10ea45fe41ce386b..646c628f86af40a66c99ae2a374169fa2bcfb93d 100644 (file)
Binary files a/models/player/gakmasked.iqm and b/models/player/gakmasked.iqm differ
index 40d2958a7e30e1801e392ab7c18733eca5449323..7b30802fc3c02533b9bdabbd1215d2347a11a0fd 100644 (file)
Binary files a/models/player/gakmasked.iqm_0.tga and b/models/player/gakmasked.iqm_0.tga differ
index cccb00c319317c96f918bc3f5d50da8f88d1fd3c..2e4749346439daa40f72b49fc420cc99d0323c62 100644 (file)
Binary files a/models/player/ignis.iqm and b/models/player/ignis.iqm differ
index 990538486d3ef5ba43bbb9df4959b71384a3262f..3ad24e0dc1efafb05dcabe885d510cd9129251ca 100644 (file)
Binary files a/models/player/ignis.iqm_0.tga and b/models/player/ignis.iqm_0.tga differ
index 5a823e2424f23877cc8dc872724e57c394f7fe40..7f5a51295eb8284bc33edbc5a0b14c642b528eb1 100644 (file)
Binary files a/models/player/ignishalfmasked.iqm and b/models/player/ignishalfmasked.iqm differ
index c0beb4ac351ee7ede131b44446093b46aec9f2f5..487a131163665f1d890e1d3af118777fc9fb3ad0 100644 (file)
Binary files a/models/player/ignishalfmasked.iqm_0.tga and b/models/player/ignishalfmasked.iqm_0.tga differ
index a165aac0733d91f010b3a5158464fe2c6d75a63b..fbf2b00faedbbadeca6ef20a2a21ff8117bd9abe 100644 (file)
Binary files a/models/player/ignismasked.iqm and b/models/player/ignismasked.iqm differ
index 572e8fe877ace319a222542f568e2c437e332bc4..8a29f813665e85140916b8aac06c27ae7b524540 100644 (file)
Binary files a/models/player/ignismasked.iqm_0.tga and b/models/player/ignismasked.iqm_0.tga differ
index 85cc5f5439f6e1f3538e50e5bf01dc68bdf18c78..505fcb9f198b0c2dbd448fc80cf4706c683b7595 100644 (file)
Binary files a/models/player/nyx.iqm and b/models/player/nyx.iqm differ
index da5cbe7f2b997de2380e20883ce2789882219621..f6bcb017c85aa62378480e80a604e8acd1cd8bc5 100644 (file)
Binary files a/models/player/nyx.iqm_0.tga and b/models/player/nyx.iqm_0.tga differ
index c4e75396f798873099880c6ced57dd3823e091db..ef2ef0509233d5810e965a83ab210f7acecb5e20 100644 (file)
Binary files a/models/player/pyria.iqm and b/models/player/pyria.iqm differ
index b155a57ec7b802501eb6e716b9b59e3ecb388f35..730ade37a7a216429447a3ec98cc40c2f17c8597 100644 (file)
Binary files a/models/player/pyria.iqm_0.tga and b/models/player/pyria.iqm_0.tga differ
index 716bcc072530c9ba20a1f78da0c4a719121880e6..7e6dbc224abbedecddc0d9d2731488d46a289bc8 100644 (file)
Binary files a/models/player/seraphina.iqm and b/models/player/seraphina.iqm differ
index 299f5a37297959123fd90a7ee7ca32a32d66e329..4a0215b832e18a36de870c373795a39d1599c536 100644 (file)
Binary files a/models/player/seraphina.iqm_0.tga and b/models/player/seraphina.iqm_0.tga differ
index 98f29be98ea7bd7f1becd1f0417b2a2329c36a79..f65dce6f0af1d489da71f59d9e25628f79168b16 100644 (file)
Binary files a/models/player/seraphinamasked.iqm and b/models/player/seraphinamasked.iqm differ
index e5a61dbef023e324facee885c33d5acf61be8e8c..7a2dc98c579c09dcb622f3bc6def59ad6d34b010 100644 (file)
Binary files a/models/player/seraphinamasked.iqm_0.tga and b/models/player/seraphinamasked.iqm_0.tga differ
index 2b53ad252d5f8e30fa18530a012b7bcb5dceacc8..f43ad6778e8dd16dfcd72f9e710816a5c81c5710 100644 (file)
Binary files a/models/player/umbra.iqm and b/models/player/umbra.iqm differ
index d3b3cc4c127a70bfbd161d1f011e37522c5ee827..4fb0941c839674ff331e4caa5a10e8d8f6c301f3 100644 (file)
Binary files a/models/player/umbra.iqm_0.tga and b/models/player/umbra.iqm_0.tga differ
index 8020d1a96a08cdafde018a2316d596453a99fd58..80bd84a0768432f114133f5f3e0aee01265059a4 100644 (file)
@@ -149,9 +149,8 @@ void                end_sys_fields;                 // flag for structure dumping
 
 // Additional OPTIONAL Fields and Globals
 float          intermission;
-float          sb_showscores;
-float          sb_showaccuracy;
-float          sbar_currentammo;
+float          scoreboard_showscores;
+float          scoreboard_showaccuracy;
 .string                message;
 .float renderflags;
 // float               coop;
@@ -212,7 +211,7 @@ float race_othercheckpointtime;
 float race_othercheckpointdelta;
 float race_othercheckpointlapsdelta;
 string race_othercheckpointenemy;
-float sb_showscores_force;
+float scoreboard_showscores_force;
 float race_status;
 string race_status_name;
 float race_myrank;
@@ -249,3 +248,11 @@ float ticrate;
 // only for Porto
 float angles_held_status;
 vector angles_held;
+
+// weapons
+.float silent;
+
+float w_deathtype, w_issilent, w_random;
+string w_deathtypestring;
+vector w_org, w_backoff;
+
index 575f8b0622deb1b433f54702e79c17a2cf10a352..b34e843793311ddfc9a13b9dcd3450daf24409a7 100644 (file)
@@ -86,12 +86,15 @@ void CSQC_Init(void)
        // localcmd("alias order \"cmd order $*\""); enable if ctf-command thingy is used
        //registercmd("ctf_menu");
        registercmd("ons_map");
+       registercmd("hud_configure");
+       registercmd("hud_save");
        //registercmd("menu_action");
 
        registercmd("+button3");
        registercmd("-button3");
        registercmd("+button4");
        registercmd("-button4");
+       registercmd("+showscores");registercmd("-showscores");
        registercmd("+showaccuracy");registercmd("-showaccuracy");
 
 #ifndef CAMERATEST
@@ -109,14 +112,14 @@ void CSQC_Init(void)
 #ifndef CAMERATEST
        }
 #endif
-       registercvar("sbar_usecsqc", "1");
-       registercvar("sbar_columns", "default", CVAR_SAVE);
+       registercvar("hud_usecsqc", "1");
+       registercvar("scoreboard_columns", "default", CVAR_SAVE);
 
        gametype = 0;
 
-       // sbar_fields uses strunzone on the titles!
-       for(i = 0; i < MAX_SBAR_FIELDS; ++i)
-               sbar_title[i] = strzone("(null)");
+       // hud_fields uses strunzone on the titles!
+       for(i = 0; i < MAX_HUD_FIELDS; ++i)
+               hud_title[i] = strzone("(null)");
 
        postinit = false;
 
@@ -127,8 +130,6 @@ void CSQC_Init(void)
 
        GetTeam(COLOR_SPECTATOR, true); // add specs first
 
-       cvar_clientsettemp("_supports_weaponpriority", "1");
-
        RegisterWeapons();
 
        WaypointSprite_Load();
@@ -325,9 +326,9 @@ void Playerchecker_Think()
                                e.ping_packetloss = 0;
                                e.ping_movementloss = 0;
                                //e.gotscores = 0; // we might already have the scores...
-                               SetTeam(e, GetPlayerColor(i)); // will not hurt; later updates come with Sbar_UpdatePlayerTeams
+                               SetTeam(e, GetPlayerColor(i)); // will not hurt; later updates come with HUD_UpdatePlayerTeams
                                RegisterPlayer(e);
-                               Sbar_UpdatePlayerPos(e);
+                               HUD_UpdatePlayerPos(e);
                        }
                }
        }
@@ -339,7 +340,7 @@ void TrueAim_Init();
 void PostInit(void)
 {
        print(strcat("PostInit\n    maxclients = ", ftos(maxclients), "\n"));
-       localcmd(strcat("\nsbar_columns_set ", cvar_string("sbar_columns"), ";\n"));
+       localcmd(strcat("\nscoreboard_columns_set ", cvar_string("scoreboard_columns"), ";\n"));
 
        entity playerchecker;
        playerchecker = spawn();
@@ -355,8 +356,8 @@ void PostInit(void)
 // CSQC_ConsoleCommand : Used to parse commands in the console that have been registered with the "registercmd" function
 // Return value should be 1 if CSQC handled the command, otherwise return 0 to have the engine handle it.
 float button_zoom;
-void Cmd_Sbar_SetFields(float);
-void Cmd_Sbar_Help(float);
+void Cmd_HUD_SetFields(float);
+void Cmd_HUD_Help(float);
 float CSQC_ConsoleCommand(string strMessage)
 {
        float argc;
@@ -368,7 +369,18 @@ float CSQC_ConsoleCommand(string strMessage)
        local string strCmd;
        strCmd = argv(0);
 
-       if(strCmd == "+button4") { // zoom
+       if(strCmd == "hud_configure") { // config hud
+               cvar_set("_hud_configure", ftos(!cvar("_hud_configure")));
+               return true;
+       } else if(strCmd == "hud_save") { // save hud config
+               if(argv(1) == "" || argv(2)) {
+                       print("Usage:\n");
+                       print("hud_save configname   (saves to hud_skinname_configname.cfg)\n");
+               }
+               else
+                       HUD_Panel_ExportCfg(argv(1));
+               return true;
+       } else if(strCmd == "+button4") { // zoom
                // return false, because the message shall be sent to the server anyway (for demos/speccing)
                if(ignore_plus_zoom)
                {
@@ -392,16 +404,16 @@ float CSQC_ConsoleCommand(string strMessage)
                button_attack2 = 0;
                return false;
        } else if(strCmd == "+showscores") {
-               sb_showscores = true;
+               scoreboard_showscores = true;
                return true;
        } else if(strCmd == "-showscores") {
-               sb_showscores = false;
+               scoreboard_showscores = false;
                return true;
        } else if(strCmd == "+showaccuracy") {
-               sb_showaccuracy = true;
+               scoreboard_showaccuracy = true;
                return true;
        } else if(strCmd == "-showaccuracy") {
-               sb_showaccuracy = false;
+               scoreboard_showaccuracy = false;
                return true;
        }
 
@@ -509,9 +521,8 @@ void GameCommand(string msg)
        {
                print("Usage: cl_cmd COMMAND..., where possible commands are:\n");
                print("  settemp cvar value\n");
-               print("  radar\n");
-               print("  sbar_columns_set ...\n");
-               print("  sbar_columns_help\n");
+               print("  scoreboard_columns_set ...\n");
+               print("  scoreboard_columns_help\n");
                GameCommand_Generic("help");
                return;
        }
@@ -527,14 +538,11 @@ void GameCommand(string msg)
        else if(cmd == "settemp") {
                cvar_clientsettemp(argv(1), argv(2));
        }
-       else if(cmd == "radar") {
-               ons_showmap = !ons_showmap;
+       else if(cmd == "scoreboard_columns_set") {
+               Cmd_HUD_SetFields(argc);
        }
-       else if(cmd == "sbar_columns_set") {
-               Cmd_Sbar_SetFields(argc);
-       }
-       else if(cmd == "sbar_columns_help") {
-               Cmd_Sbar_Help(argc);
+       else if(cmd == "scoreboard_columns_help") {
+               Cmd_HUD_Help(argc);
        }
 #ifdef BLURTEST
        else if(cmd == "blurtest") {
@@ -589,15 +597,15 @@ void GameCommand(string msg)
        }
        else if(cmd == "sendcvar") {
                // W_FixWeaponOrder will trash argv, so save what we need.
-               string cvar;
-               cvar = strzone(argv(1));
-               s = cvar_string(cvar);
-               if(cvar == "cl_weaponpriority")
+               string thiscvar;
+               thiscvar = strzone(argv(1));
+               s = cvar_string(thiscvar);
+               if(thiscvar == "cl_weaponpriority")
                        s = W_FixWeaponOrder(W_NumberWeaponOrder(s), 1);
-               else if(substring(cvar, 0, 17) == "cl_weaponpriority" && strlen(cvar) == 18)
+               else if(substring(thiscvar, 0, 17) == "cl_weaponpriority" && strlen(thiscvar) == 18)
                        s = W_FixWeaponOrder(W_NumberWeaponOrder(s), 0);
-               localcmd("cmd sentcvar ", cvar, " \"", s, "\"\n");
-               strunzone(cvar);
+               localcmd("cmd sentcvar ", thiscvar, " \"", s, "\"\n");
+               strunzone(thiscvar);
        }
        else if(cmd == "spawn") {
                s = argv(1);
@@ -628,6 +636,9 @@ float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary)
        local float bSkipKey;
        bSkipKey = false;
 
+       if (HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary))
+               return true;
+
        if (MapVote_InputEvent(bInputType, nPrimary, nSecondary))
                return true;
 
@@ -678,7 +689,7 @@ void Ent_ReadPlayerScore()
        float isNew;
        entity o;
 
-       // damnit -.- don't want to go change every single .sv_entnum in sbar.qc AGAIN
+       // damnit -.- don't want to go change every single .sv_entnum in hud.qc AGAIN
        // (no I've never heard of M-x replace-string, sed, or anything like that)
        isNew = !self.owner; // workaround for DP bug
        n = ReadByte()-1;
@@ -724,7 +735,7 @@ void Ent_ReadPlayerScore()
                }
 
        if(o.sort_prev)
-               Sbar_UpdatePlayerPos(o); // if not registered, we cannot do this yet!
+               HUD_UpdatePlayerPos(o); // if not registered, we cannot do this yet!
 
        self.entremove = Ent_RemovePlayerScore;
 }
@@ -755,7 +766,7 @@ void Ent_ReadTeamScore()
                                o.(teamscores[i]) = ReadChar();
                }
 
-       Sbar_UpdateTeamPos(o);
+       HUD_UpdateTeamPos(o);
 }
 
 void Net_Reset()
@@ -769,7 +780,7 @@ void Ent_ClientData()
 
        f = ReadByte();
 
-       sb_showscores_force = (f & 1);
+       scoreboard_showscores_force = (f & 1);
 
        if(f & 2)
        {
@@ -949,9 +960,6 @@ void Gamemode_Init()
                precache_pic("gfx/ons-cp-blue.tga");
                precache_pic("gfx/ons-frame.tga");
                precache_pic("gfx/ons-frame-team.tga");
-       } else if(gametype == GAME_KEYHUNT) {
-               precache_pic("gfx/sb_key_carrying");
-               precache_pic("gfx/sb_key_carrying_outline");
        }
 
        if not(isdemo())
@@ -1003,7 +1011,7 @@ void Ent_ScoresInfo()
                teamscores_label[i] = strzone(ReadString());
                teamscores_flags[i] = ReadByte();
        }
-       Sbar_InitScores();
+       HUD_InitScores();
        Gamemode_Init();
 }
 
@@ -1229,6 +1237,20 @@ void Net_VoteDialogReset() {
        vote_active = 0;
 }
 
+void Net_Notify() {
+       float type;
+       type = ReadByte();
+
+       if(type == CSQC_KILLNOTIFY)
+       {
+               HUD_KillNotify(ReadString(), ReadString(), ReadString(), ReadShort(), ReadByte());
+       }
+       else if(type == CSQC_CENTERPRINT)
+       {
+               HUD_Centerprint(ReadString(), ReadString(), ReadShort(), ReadByte());
+       }
+}
+
 // 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.
@@ -1295,6 +1317,10 @@ float CSQC_Parse_TempEntity()
                        announce_snd = strzone(ReadString());
                        bHandled = true;
                        break;
+               case TE_CSQC_NOTIFY:
+                       Net_Notify();
+                       bHandled = true;
+                       break;
                default:
                        // No special logic for this temporary entity; return 0 so the engine can handle it
                        bHandled = false;
@@ -1309,7 +1335,7 @@ string getcommandkey(string text, string command)
        string keys;
        float n, j, k, l;
 
-       if (!sbar_showbinds)
+       if (!hud_showbinds)
                return text;
 
        keys = db_get(binddb, command);
@@ -1327,7 +1353,7 @@ string getcommandkey(string text, string command)
                                        keys = strcat(keys, ", ", keynumtostring(k));
 
                                ++l;
-                               if (sbar_showbinds_limit > 0 && sbar_showbinds_limit >= l) break;
+                               if (hud_showbinds_limit > 0 && hud_showbinds_limit >= l) break;
                        }
 
                }
@@ -1335,12 +1361,12 @@ string getcommandkey(string text, string command)
        }
 
        if ("" == keys) {
-               if (sbar_showbinds > 1)
+               if (hud_showbinds > 1)
                        return strcat(text, " (not bound)");
                else
                        return text;
        }
-       else if (sbar_showbinds > 1)
+       else if (hud_showbinds > 1)
                return strcat(text, " (", keys, ")");
        else
                return keys;
index 0557db1160be5c4a8d0e7d4ae9339e9b72837aae..1056fd59ae435b9fbffb334ef20f57fb6590aa42 100644 (file)
@@ -336,11 +336,9 @@ float TrueAimCheck()
 
 void CSQC_common_hud(void);
 
-void CSQC_kh_hud(void);
-void CSQC_ctf_hud(void);
 void PostInit(void);
 void CSQC_Demo_Camera();
-float Sbar_WouldDrawScoreboard ();
+float HUD_WouldDrawScoreboard ();
 float view_set;
 float camera_mode;
 string NextFrameCommand;
@@ -374,7 +372,7 @@ void CSQC_UpdateView(float w, float h)
        input_angles = warpzone_fixview_cl_viewangles;
        view_angles = warpzone_fixview_angles;
 
-       if(cvar("cl_lockview"))
+       if(cvar("cl_lockview") || hud_configure)
        {
                pmove_org = freeze_pmove_org;
                input_angles = view_angles = freeze_input_angles;
@@ -463,17 +461,14 @@ void CSQC_UpdateView(float w, float h)
                }
        }
 
-       sbar_alpha_fg = cvar("sbar_alpha_fg" ) * (1 - cvar("_menu_alpha"));
-       sbar_currentammo = cvar("sbar_showcurrentammo");
-       sbar_hudselector = cvar("sbar_hudselector");
-       sbar_accuracy_hud = cvar_or("sbar_accuracy_hud", 1);
+       hud_accuracy_hud = cvar_or("hud_accuracy_hud", 1);
        ColorTranslateMode = cvar("cl_stripcolorcodes");
        activeweapon = getstati(STAT_SWITCHWEAPON);
        f = cvar("teamplay");
        if(f != teamplay)
        {
                teamplay = f;
-               Sbar_InitScores();
+               HUD_InitScores();
        }
 
        if(last_weapon != activeweapon) {
@@ -523,15 +518,15 @@ void CSQC_UpdateView(float w, float h)
 
        // Draw the Crosshair
        float scoreboard_active;
-       scoreboard_active = Sbar_WouldDrawScoreboard();
+       scoreboard_active = HUD_WouldDrawScoreboard();
        R_SetView(VF_DRAWCROSSHAIR, 0); //Make sure engine crosshairs are always hidden
 
        // Draw the Engine Status Bar (the default Quake HUD)
-       R_SetView(VF_DRAWENGINESBAR, 0);
+       R_SetView(VF_DRAWENGINEHUD, 0);
 
        // fetch this one only once per frame
-       sbar_showbinds = cvar("sbar_showbinds");
-       sbar_showbinds_limit = cvar("sbar_showbinds_limit");
+       hud_showbinds = cvar("hud_showbinds");
+       hud_showbinds_limit = cvar("hud_showbinds_limit");
 
        // Update the mouse position
        /*
@@ -577,37 +572,9 @@ void CSQC_UpdateView(float w, float h)
                        self.draw2d();
        self = e;
 
-       // draw radar
-       if(
-                       ons_showmap
-                       ||
-                       (
-                        !scoreboard_active
-                        &&
-                        cvar_string("cl_teamradar") != "0"
-                        &&
-                        (
-                         cvar("cl_teamradar") == 2
-                         ||
-                         teamplay
-                        )
-                       )
-         )
-               teamradar_view();
-
-       // draw sbar
+       // draw hud
        if(cvar("r_letterbox") == 0) {
-               if (cvar("cl_showpressedkeys")) { // draw pressed keys when spectating and playing
-                       if(spectatee_status > 0 || cvar("cl_showpressedkeys") >= 2)
-                               Sbar_DrawPressedKeys();
-               }
-
-               if (cvar("cl_showspeed"))
-                       Sbar_ShowSpeed();
-               if (cvar("cl_showacceleration"))
-                       Sbar_ShowAcceleration();
-
-               Sbar_DrawCenterPrint(); // draw centerprint messages even if viewsize >= 120
+               HUD_DrawCenterPrint(); // draw centerprint messages even if viewsize >= 120
        }
 
        float hud;
@@ -627,7 +594,7 @@ void CSQC_UpdateView(float w, float h)
                                CSQC_common_hud();
 
                // crosshair goes VERY LAST
-               if(!scoreboard_active && !ons_showmap && !camera_active) {
+               if(!scoreboard_active && !camera_active) {
                        // TrueAim check
                        float shottype;
                        float bullets, ring_scale;
@@ -763,7 +730,7 @@ void CSQC_UpdateView(float w, float h)
                                        bullets = 0;
 
 #define CROSSHAIR_DRAW_RING(i,j,sz,wcross_name,wcross_alpha) \
-                               drawpic(wcross_origin - ('0.5 0 0' * (sz * wcross_size_x * ring_scale + i * wcross_blur) + '0 0.5 0' * (sz * wcross_size_y * ring_scale + j * wcross_blur)), strcat("gfx/hud/rifle_ring_", ftos(bullets)), sz * wcross_size * ring_scale, wcross_color, wcross_alpha, DRAWFLAG_NORMAL)
+                               drawpic(wcross_origin - ('0.5 0 0' * (sz * wcross_size_x * ring_scale + i * wcross_blur) + '0 0.5 0' * (sz * wcross_size_y * ring_scale + j * wcross_blur)), strcat("gfx/hud/", cvar_string("hud_skin"), "/rifle_ring_", ftos(bullets)), sz * wcross_size * ring_scale, wcross_color, wcross_alpha, DRAWFLAG_NORMAL)
 
 #define CROSSHAIR_DO_BLUR(M,sz,wcross_name,wcross_alpha) \
                                do \
@@ -863,19 +830,19 @@ void CSQC_UpdateView(float w, float h)
                cvar_set("vid_conheight", h0);
        }
 
+       if(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
        // unsuspicious
        traceline('0 0 0', '0 0 0', MOVE_WORLDONLY, world);
 }
 
-void Sbar_Draw();
 #define spider_h "gfx/vehicles/hud_bg.tga"
 #define spider_b "gfx/vehicles/sbot.tga"
 #define spider_r "gfx/vehicles/sbot_rpods.tga"
 #define spider_g "gfx/vehicles/sbot_mguns.tga"
 #define spider_s "gfx/vehicles/shiled.tga"
-
 #define spider_a1 "gfx/hud/sb_rocket.tga"
 #define spider_a2 "gfx/sb_bullets.tga"
 
@@ -978,10 +945,10 @@ void CSQC_SPIDER_HUD()
        }
        */
 
-       if (sb_showscores)
+       if (scoreboard_showscores)
        {
-               Sbar_DrawScoreboard();
-               Sbar_DrawCenterPrint();
+               HUD_DrawScoreboard();
+               HUD_DrawCenterPrint();
        }
 
 }
@@ -992,9 +959,6 @@ void CSQC_SPIDER_HUD()
 #define raptor_g2 "gfx/vehicles/raptor_bombs.tga"
 #define raptor_s "gfx/vehicles/shiled.tga"
 
-#define spider_a1 "gfx/hud/sb_rocket.tga"
-#define spider_a2 "gfx/sb_bullets.tga"
-
 void CSQC_RAPTOR_HUD()
 {
        float rockets, reload, heat, hp, shield, energy;
@@ -1048,10 +1012,10 @@ void CSQC_RAPTOR_HUD()
     drawpic(hudloc, raptor_g2, picsize, '1 1 1' * reload + '1 0 0' *  (1 - reload), 1, DRAWFLAG_NORMAL);
 
 
-       if (sb_showscores)
+       if (scoreboard_showscores)
        {
-               Sbar_DrawScoreboard();
-               Sbar_DrawCenterPrint();
+               HUD_DrawScoreboard();
+               HUD_DrawCenterPrint();
        }
 
 }
@@ -1158,10 +1122,10 @@ const float STAT_VEHICLESTAT_RELOAD2 = 66;
 
 
 
-       if (sb_showscores)
+       if (scoreboard_showscores)
        {
-               Sbar_DrawScoreboard();
-               Sbar_DrawCenterPrint();
+               HUD_DrawScoreboard();
+               HUD_DrawCenterPrint();
        }
 
 }
@@ -1169,7 +1133,7 @@ const float STAT_VEHICLESTAT_RELOAD2 = 66;
 
 void CSQC_common_hud(void)
 {
-       // Sbar_SortFrags(); done in Sbar_Draw
+       // HUD_SortFrags(); done in HUD_Draw
        float hud;
        hud = getstati(STAT_HUD);
 
@@ -1177,7 +1141,23 @@ void CSQC_common_hud(void)
        switch(hud)
        {
                case HUD_NORMAL:
-                       Sbar_Draw();
+                       // hud first
+                       HUD_Main();
+
+                       // scoreboard/accuracy
+                       if (intermission == 2 && !scoreboard_showaccuracy && !scoreboard_showscores) // map voting screen
+                       {
+                               HUD_FinaleOverlay();
+                               HUD_Reset();
+                       }
+                       else if(scoreboard_showaccuracy && spectatee_status != -1)
+                               HUD_DrawAccuracyStats();
+                       else
+                               HUD_DrawScoreboard();
+
+                       if (scoreboard_showscores || scoreboard_showaccuracy || scoreboard_showscores_force || getstati(STAT_HEALTH) <= 0 || intermission == 1)
+                               HUD_Reset();
+
                        break;
 
                case HUD_SPIDERBOT:
index 83955df8ca30680f44589f7049427e5a222848c6..ec2ab9a3195892c29191d391e9d30e90cd380ebb 100644 (file)
@@ -281,6 +281,7 @@ string(string info, string key) infoget = #227;
 string(string info, string key, string value, ...) infoadd = #226;
 string(string in) uri_escape = #510;
 
+float stringtokeynum(string keyname) = #341;
 string keynumtostring(float keynum) = #520;
 string findkeysforcommand(string command) = #521;
 
@@ -316,3 +317,4 @@ float particles_alphamin, particles_alphamax;
 #define PARTICLES_USECOLOR 2
 vector particles_colormin, particles_colormax;
 void(float effectindex, entity own, vector org_from, vector org_to, vector dir_from, vector dir_to, float countmultiplier, float flags)        boxparticles = #502;
+string(string format, ...) sprintf = #627;
index a3511b1493551ada1789c2fbaad61883f4ec5ce6..2b2e674c603a2b938aa0f30984ae861a3806be6c 100644 (file)
@@ -32,7 +32,7 @@ const float           VF_ANGLES_X                                             = 16;   //(float)
 const float            VF_ANGLES_Y                                             = 17;   //(float)
 const float            VF_ANGLES_Z                                             = 18;   //(float)
 const float            VF_DRAWWORLD                                    = 19;   //(float)
-const float            VF_DRAWENGINESBAR                               = 20;   //(float)
+const float            VF_DRAWENGINEHUD                                = 20;   //(float)
 const float            VF_DRAWCROSSHAIR                                = 21;   //(float)
 const float            VF_PERSPECTIVE                                  = 200;  //(float)
 
index 1b0138f36b0212f950ebf241c5de37892ae91bba..24c5f0153b35609fc3b455b3bc10013c53c8ac56 100644 (file)
@@ -1,8 +1,3 @@
-.float silent;
-
-float w_deathtype, w_issilent, w_random;
-vector w_org, w_backoff;
-
 void Ent_DamageInfo(float isNew)
 {
        float dmg, rad, edge, thisdmg, forcemul;
diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
new file mode 100644 (file)
index 0000000..1b8b236
--- /dev/null
@@ -0,0 +1,4449 @@
+/*
+==================
+Misc HUD functions
+==================
+*/
+
+// a border picture is a texture containing nine parts:
+//   1/4 width: left part
+//   1/2 width: middle part (stretched)
+//   1/4 width: right part
+// divided into
+//   1/4 height: top part
+//   1/2 height: middle part (stretched)
+//   1/4 height: bottom part
+void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector theColor, float theAlpha, vector theBorderSize)
+{
+       vector dX, dY;
+       vector width, height;
+       vector bW, bH;
+       //pic = draw_UseSkinFor(pic);
+       width = eX * theSize_x;
+       height = eY * theSize_y;
+       if(theSize_x <= theBorderSize_x * 2)
+       {
+               // not wide enough... draw just left and right then
+               bW = eX * (0.25 * theSize_x / (theBorderSize_x * 2));
+               if(theSize_y <= theBorderSize_y * 2)
+               {
+                       // not high enough... draw just corners
+                       bH = eY * (0.25 * theSize_y / (theBorderSize_y * 2));
+                       drawsubpic(theOrigin,                 width * 0.5 + height * 0.5, pic, '0 0 0',           bW + bH, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + width   * 0.5, width * 0.5 + height * 0.5, pic, eX - bW,           bW + bH, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + height  * 0.5, width * 0.5 + height * 0.5, pic, eY - bH,           bW + bH, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + theSize * 0.5, width * 0.5 + height * 0.5, pic, eX + eY - bW - bH, bW + bH, theColor, theAlpha, 0);
+               }
+               else
+               {
+                       dY = theBorderSize_x * eY;
+                       drawsubpic(theOrigin,                             width * 0.5          +     dY, pic, '0 0    0',           '0 0.25 0' + bW, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + width * 0.5,               width * 0.5          +     dY, pic, '0 0    0' + eX - bW, '0 0.25 0' + bW, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin                        + dY, width * 0.5 + height - 2 * dY, pic, '0 0.25 0',           '0 0.5  0' + bW, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + width * 0.5          + dY, width * 0.5 + height - 2 * dY, pic, '0 0.25 0' + eX - bW, '0 0.5  0' + bW, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin               + height - dY, width * 0.5          +     dY, pic, '0 0.75 0',           '0 0.25 0' + bW, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + width * 0.5 + height - dY, width * 0.5          +     dY, pic, '0 0.75 0' + eX - bW, '0 0.25 0' + bW, theColor, theAlpha, 0);
+               }
+       }
+       else
+       {
+               if(theSize_y <= theBorderSize_y * 2)
+               {
+                       // not high enough... draw just top and bottom then
+                       bH = eY * (0.25 * theSize_y / (theBorderSize_y * 2));
+                       dX = theBorderSize_x * eX;
+                       drawsubpic(theOrigin,                                         dX + height * 0.5, pic, '0    0 0',           '0.25 0 0' + bH, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + dX,                        width - 2 * dX + height * 0.5, pic, '0.25 0 0',           '0.5  0 0' + bH, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + width - dX,                            dX + height * 0.5, pic, '0.75 0 0',           '0.25 0 0' + bH, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin              + height * 0.5,             dX + height * 0.5, pic, '0    0 0' + eY - bH, '0.25 0 0' + bH, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + dX         + height * 0.5, width - 2 * dX + height * 0.5, pic, '0.25 0 0' + eY - bH, '0.5  0 0' + bH, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + width - dX + height * 0.5,             dX + height * 0.5, pic, '0.75 0 0' + eY - bH, '0.25 0 0' + bH, theColor, theAlpha, 0);
+               }
+               else
+               {
+                       dX = theBorderSize_x * eX;
+                       dY = theBorderSize_x * eY;
+                       drawsubpic(theOrigin,                                        dX          +     dY, pic, '0    0    0', '0.25 0.25 0', theColor, theAlpha, 0);
+                       drawsubpic(theOrigin                  + dX,      width - 2 * dX          +     dY, pic, '0.25 0    0', '0.5  0.25 0', theColor, theAlpha, 0);
+                       drawsubpic(theOrigin          + width - dX,                  dX          +     dY, pic, '0.75 0    0', '0.25 0.25 0', theColor, theAlpha, 0);
+                       drawsubpic(theOrigin          + dY,                          dX + height - 2 * dY, pic, '0    0.25 0', '0.25 0.5  0', theColor, theAlpha, 0);
+                       drawsubpic(theOrigin          + dY         + dX, width - 2 * dX + height - 2 * dY, pic, '0.25 0.25 0', '0.5  0.5  0', theColor, theAlpha, 0);
+                       drawsubpic(theOrigin          + dY + width - dX,             dX + height - 2 * dY, pic, '0.75 0.25 0', '0.25 0.5  0', theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + height - dY,                          dX          +     dY, pic, '0    0.75 0', '0.25 0.25 0', theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + height - dY         + dX, width - 2 * dX          +     dY, pic, '0.25 0.75 0', '0.5  0.25 0', theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + height - dY + width - dX,             dX          +     dY, pic, '0.75 0.75 0', '0.25 0.25 0', theColor, theAlpha, 0);
+               }
+       }
+}
+
+// drawpic wrapper to draw an image as large as possible with preserved aspect ratio into a box
+void drawpic_aspect(vector pos, string pic, vector sz, vector color, float alpha, float drawflag) {
+       vector imgsize;
+       imgsize = drawgetimagesize(pic);
+       float imgaspect;
+       imgaspect = imgsize_x/imgsize_y;
+
+       vector oldsz;
+       oldsz = sz;
+       float aspect;
+       aspect = sz_x/sz_y;
+
+       if(aspect > imgaspect) {
+               sz_x = sz_y * imgaspect;
+               drawpic(pos + eX * (oldsz_x - sz_x) * 0.5, pic, sz, color, alpha, drawflag);
+       } else {
+               sz_y = sz_x / imgaspect; 
+               drawpic(pos + eY * (oldsz_y - sz_y) * 0.5, pic, sz, color, alpha, drawflag);
+       }
+}
+
+// draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga
+void drawpic_skin(vector pos, string pic, vector sz, vector color, float alpha, float drawflag) {
+       drawpic_aspect(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, color, alpha, drawflag);
+}
+
+// TODO: aspect!
+void drawpic_skin_expanding(vector pos, string pic, vector sz, vector rgb, float alpha, float flag, float fadelerp) {
+       drawpic_expanding(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, rgb, alpha, flag, fadelerp);
+}
+
+void drawpic_skin_expanding_two(vector pos, string pic, vector sz, vector rgb, float alpha, float flag, float fadelerp) {
+       drawpic_expanding_two(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, rgb, alpha, flag, fadelerp);
+}
+
+// return HUD background color
+vector HUD_GetBgColor()
+{
+       vector color;
+       if (teamplay)
+               GetTeamRGB(myteam) * hud_color_bg_team;
+       else {
+               // allow custom HUD colors in non-teamgames
+               color_x = cvar("hud_color_bg_r");
+               color_y = cvar("hud_color_bg_g");
+               color_z = cvar("hud_color_bg_b");
+       }
+       return color;
+}
+
+// return accuracy text color
+vector HUD_AccuracyColor(float accuracy)
+{
+       vector rgb;
+       float yellow_accuracy = cvar("hud_weaponicons_accuracy_yellow"); // value at which this function returns yellow
+       if(accuracy >= 100) {
+               rgb_x = 0;
+               rgb_y = 1;
+       }
+       else if(accuracy > yellow_accuracy) {
+               rgb_x = 1 - (accuracy-yellow_accuracy)/(100-yellow_accuracy); // red value between 1 -> 0
+               rgb_y = 1;
+       }
+       else {
+               rgb_x = 1;
+               rgb_y = accuracy/yellow_accuracy; // green value between 0 -> 1
+       }
+       rgb_z = 0;
+       return rgb;
+}
+
+// draw number in the XSCALE font
+void HUD_DrawXNum (vector pos, float num, float digits, float showsign, float lettersize, vector rgb, float highlighted, float stroke, float alpha, float dflags)
+{
+       float l, i;
+       string str, tmp, l_length;
+       float minus, plus;
+       vector vsize, num_color;
+
+       vsize_x = vsize_y = lettersize;
+       vsize_z = 0;
+
+       // showsign 1: always prefix with minus sign (useful in race distribution display)
+       // showsign 2: always prefix with plus sign (useful in race distribution display)
+       // showsign 3: prefix with minus sign if negative, plus sign if positive (useful in score distribution display)
+
+       if((showsign == 2 && num >= 0) || (num > 0 && showsign == 3))
+       {
+               plus = true;
+               pos_x -= lettersize;
+       } else
+               plus = false;
+
+       if(num < 0 || (num < 0 && showsign == 3) || (showsign == 1 && num <= 0))
+       {
+               minus = true;
+               num = -num;
+               pos_x -= lettersize;
+       } else
+               minus = false;
+
+       if(digits < 0)
+       {
+               tmp = ftos(num);
+               digits = -digits;
+               str = strcat(substring("0000000000", 0, digits - strlen(tmp)), tmp);
+       } else
+               str = ftos(num);
+
+       l = strlen(str);
+       l_length = ftos(l);
+
+       if(l > digits)
+       {
+               str = substring(str, l-digits, 999);
+               l = strlen(str);
+       } else if(l < digits)
+               pos_x += (digits-l) * lettersize;
+
+       if (highlighted == 1) {
+               vector hl_size;
+               hl_size_x = vsize_x * l + vsize_x * 0.2;
+               hl_size_y = vsize_y * 1.1;
+               hl_size_z = 0;
+               if(minus)
+                       hl_size_x = hl_size_x + vsize_x;
+
+               vector hl_pos;
+               hl_pos_x = pos_x - lettersize/10;
+               hl_pos_y = pos_y - lettersize/20;
+               hl_pos_z = 0;
+
+               drawpic_skin(hl_pos, strcat("num_leading_", l_length), hl_size, '1 1 1', alpha, dflags);
+       }
+
+       if (stroke == 1)
+               num_color = '1 1 1';
+       else
+               num_color = rgb;
+
+       if(minus)
+       {
+               if (stroke == 1)
+                       drawpic_skin(pos, "num_minus_stroke", vsize, rgb, alpha, dflags);
+               drawpic_skin(pos, "num_minus", vsize, num_color, alpha, dflags);
+               pos_x += lettersize;
+       } else if(plus)
+       {
+               if (stroke == 1)
+                       drawpic_skin(pos, "num_plus_stroke", vsize, rgb, alpha, dflags);
+               drawpic_skin(pos, "num_plus", vsize, num_color, alpha, dflags);
+               pos_x += lettersize;
+       }
+
+       for(i = 0; i < l; ++i)
+       {
+               tmp = substring(str, i, 1);
+               if (stroke == 1)
+                       drawpic_skin(pos, strcat("num_", tmp, "_stroke"), vsize, rgb, alpha, dflags);
+               drawpic_skin(pos, strcat("num_", tmp), vsize, num_color, alpha, dflags);
+               pos_x += lettersize;
+       }
+}
+
+vector HUD_Get_Num_Color (float x, float maxvalue)
+{
+       vector color;
+       if(x > maxvalue) {
+               color_x = 0;
+               color_y = 1;
+               color_z = 0;
+       }
+       else if(x > maxvalue * 0.75) {
+               color_x = 0.4 - (x-150)*0.02 * 0.4; //red value between 0.4 -> 0
+               color_y = 0.9 + (x-150)*0.02 * 0.1; // green value between 0.9 -> 1
+               color_z = 0;
+       }
+       else if(x > maxvalue * 0.5) {
+               color_x = 1 - (x-100)*0.02 * 0.6; //red value between 1 -> 0.4
+               color_y = 1 - (x-100)*0.02 * 0.1; // green value between 1 -> 0.9
+               color_z = 1 - (x-100)*0.02; // blue value between 1 -> 0
+       }
+       else if(x > maxvalue * 0.25) {
+               color_x = 1;
+               color_y = 1;
+               color_z = 0.2 + (x-50)*0.02 * 0.8; // blue value between 0.2 -> 1
+       }
+       else if(x > maxvalue * 0.1) {
+               color_x = 1;
+               color_y = (x-20)*90/27/100; // green value between 0 -> 1
+               color_z = (x-20)*90/27/100 * 0.2; // blue value between 0 -> 0.2
+       }
+       else {
+               color_x = 1;
+               color_y = 0;
+               color_z = 0;
+       }
+       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)
+{
+       return stringwidth(s, TRUE, theSize);
+}
+
+float stringwidth_nocolors(string s, vector theSize)
+{
+       return stringwidth(s, FALSE, theSize);
+}
+
+#define CENTERPRINT_MAX_LINES 30
+string centerprint_messages[CENTERPRINT_MAX_LINES];
+float centerprint_width[CENTERPRINT_MAX_LINES];
+vector centerprint_start;
+float centerprint_expire;
+float centerprint_num;
+float centerprint_offset_hint;
+vector centerprint_fontsize;
+
+void centerprint(string strMessage)
+{
+       float i, j, n, hcount;
+       string s;
+
+       centerprint_fontsize = HUD_GetFontsize("scr_centersize");
+
+       centerprint_expire = min(centerprint_expire, time); // if any of the returns happens, this message will fade out
+
+       if(cvar("scr_centertime") <= 0)
+               return;
+
+       if(strMessage == "")
+               return;
+
+       // strip trailing newlines
+       j = strlen(strMessage) - 1;
+       while(substring(strMessage, j, 1) == "\n" && j >= 0)
+               j = j - 1;
+       strMessage = substring(strMessage, 0, j + 1);
+
+       if(strMessage == "")
+               return;
+
+       // strip leading newlines and remember them, they are a hint that the message should be lower on the screen
+       j = 0;
+       while(substring(strMessage, j, 1) == "\n" && j < strlen(strMessage))
+               j = j + 1;
+       strMessage = substring(strMessage, j, strlen(strMessage) - j);
+       centerprint_offset_hint = j;
+
+       if(strMessage == "")
+               return;
+
+       // if we get here, we have a message. Initialize its height.
+       centerprint_num = 0;
+
+       n = tokenizebyseparator(strMessage, "\n");
+       i = hcount = 0;
+       for(j = 0; j < n; ++j)
+       {
+               getWrappedLine_remaining = argv(j);
+               while(getWrappedLine_remaining)
+               {
+                       s = getWrappedLine(vid_conwidth * 0.75, centerprint_fontsize, stringwidth_colors);
+                       if(centerprint_messages[i])
+                               strunzone(centerprint_messages[i]);
+                       centerprint_messages[i] = strzone(s);
+                       centerprint_width[i] = stringwidth(s, TRUE, centerprint_fontsize);
+                       ++i;
+
+                       // half height for empty lines looks better
+                       if(s == "")
+                               hcount += 0.5;
+                       else
+                               hcount += 1;
+
+                       if(i >= CENTERPRINT_MAX_LINES)
+                               break;
+               }
+       }
+
+       float h, havail;
+       h = centerprint_fontsize_y*hcount;
+
+       havail = vid_conheight;
+       if(cvar("con_chatpos") < 0)
+               havail -= (-cvar("con_chatpos") + cvar("con_chat")) * cvar("con_chatsize"); // avoid overlapping chat
+       if(havail > vid_conheight - 70)
+               havail = vid_conheight - 70; // avoid overlapping HUD
+
+       centerprint_start_x = 0;
+
+#if 0
+       float forbiddenmin, forbiddenmax, allowedmin, allowedmax, preferred;
+
+       // here, the centerprint would cover the crosshair. REALLY BAD.
+       forbiddenmin = vid_conheight * 0.5 - h - 16;
+       forbiddenmax = vid_conheight * 0.5 + 16;
+
+       allowedmin = scoreboard_bottom;
+       allowedmax = havail - h;
+       preferred = (havail - h)/2;
+
+
+       // possible orderings (total: 4! / 4 = 6)
+       //  allowedmin allowedmax forbiddenmin forbiddenmax
+       //  forbiddenmin forbiddenmax allowedmin allowedmax
+       if(allowedmax < forbiddenmin || allowedmin > forbiddenmax)
+       {
+               // forbidden doesn't matter in this case
+               centerprint_start_y = bound(allowedmin, preferred, allowedmax);
+       }
+       //  allowedmin forbiddenmin allowedmax forbiddenmax
+       else if(allowedmin < forbiddenmin && allowedmax < forbiddenmax)
+       {
+               centerprint_start_y = bound(allowedmin, preferred, forbiddenmin);
+       }
+       //  allowedmin forbiddenmin forbiddenmax allowedmax
+       else if(allowedmin < forbiddenmin)
+       {
+               // make sure the forbidden zone is not covered
+               if(preferred > (forbiddenmin + forbiddenmax) * 0.5)
+                       centerprint_start_y = bound(allowedmin, preferred, forbiddenmin);
+               else
+                       centerprint_start_y = bound(forbiddenmax, preferred, allowedmin);
+       }
+       //  forbiddenmin allowedmin allowedmax forbiddenmax
+       else if(allowedmax < forbiddenmax)
+       {
+               // it's better to leave the allowed zone (overlap with scoreboard) than
+               // to cover the forbidden zone (crosshair)
+               if(preferred > (forbiddenmin + forbiddenmax) * 0.5)
+                       centerprint_start_y = forbiddenmax;
+               else
+                       centerprint_start_y = forbiddenmin;
+       }
+       //  forbiddenmin allowedmin forbiddenmax allowedmax
+       else
+       {
+               centerprint_start_y = bound(forbiddenmax, preferred, allowedmax);
+       }
+#else
+       centerprint_start_y =
+               min(
+                       max(
+                               max(scoreboard_bottom, vid_conheight * 0.5 + 16),
+                               (havail - h)/2
+                       ),
+                       havail - h
+               );
+#endif
+
+       centerprint_num = i;
+       centerprint_expire = time + cvar("scr_centertime");
+}
+
+void HUD_DrawCenterPrint (void)
+{
+       float i;
+       vector pos;
+       string ts;
+       float a;
+
+       //if(time > centerprint_expire)
+       //      return;
+
+       //a = bound(0, 1 - 2 * (time - centerprint_expire), 1);
+       a = bound(0, 1 - 4 * (time - centerprint_expire), 1);
+       //sz = 1.2 / (a + 0.2);
+
+       if(a <= 0)
+               return;
+
+       pos = centerprint_start;
+       for (i=0; i<centerprint_num; i = i + 1)
+       {
+               pos_x = (vid_conwidth - centerprint_width[i]) * 0.5;
+               ts = centerprint_messages[i];
+               if (ts != "")
+               {
+                       dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
+                       drawcolorcodedstring(pos, ts, centerprint_fontsize, a, DRAWFLAG_NORMAL);
+                       //  - '0 0.5 0' * (sz - 1) * centerprint_fontsize_x - '0.5 0 0' * (sz - 1) * centerprint_width[i] * centerprint_fontsize_y, centerprint_fontsize * sz
+                       pos_y = pos_y + centerprint_fontsize_y;
+               }
+               else
+                       // half height for empty lines looks better
+                       pos_y = pos_y + centerprint_fontsize_y * 0.5;
+       }
+}
+
+void drawstringright(vector position, string text, vector scale, vector rgb, float alpha, float flag)
+{
+       position_x -= 2 / 3 * strlen(text) * scale_x;
+       drawstring(position, text, scale, rgb, alpha, flag);
+}
+
+void drawstringcenter(vector position, string text, vector scale, vector rgb, float alpha, float flag)
+{
+       position_x = 0.5 * (vid_conwidth - 0.6025 * strlen(text) * scale_x);
+       drawstring(position, text, scale, rgb, alpha, flag);
+}
+
+// return the string of the given race place
+string race_PlaceName(float pos) {
+       if(pos == 1)
+               return "1st";
+       else if(pos == 2)
+               return "2nd";
+       else if(pos == 3)
+               return "3rd";
+       else
+               return strcat(ftos(pos), "th");
+}
+
+// return the string of the onscreen race timer
+string MakeRaceString(float cp, float mytime, float histime, float lapdelta, string hisname)
+{
+       string col;
+       string timestr;
+       string cpname;
+       string lapstr;
+       lapstr = "";
+
+       if(histime == 0) // goal hit
+       {
+               if(mytime > 0)
+               {
+                       timestr = strcat("+", ftos_decimals(+mytime, TIME_DECIMALS));
+                       col = "^1";
+               }
+               else if(mytime == 0)
+               {
+                       timestr = "+0.0";
+                       col = "^3";
+               }
+               else
+               {
+                       timestr = strcat("-", ftos_decimals(-mytime, TIME_DECIMALS));
+                       col = "^2";
+               }
+
+               if(lapdelta > 0)
+               {
+                       lapstr = strcat(" (-", ftos(lapdelta), "L)");
+                       col = "^2";
+               }
+               else if(lapdelta < 0)
+               {
+                       lapstr = strcat(" (+", ftos(-lapdelta), "L)");
+                       col = "^1";
+               }
+       }
+       else if(histime > 0) // anticipation
+       {
+               if(mytime >= histime)
+                       timestr = strcat("+", ftos_decimals(mytime - histime, TIME_DECIMALS));
+               else
+                       timestr = TIME_ENCODED_TOSTRING(TIME_ENCODE(histime));
+               col = "^3";
+       }
+       else
+               col = "^7";
+
+       if(cp == 254)
+               cpname = "Start line";
+       else if(cp == 255)
+               cpname = "Finish line";
+       else if(cp)
+               cpname = strcat("Intermediate ", ftos(cp));
+       else
+               cpname = "Finish line";
+
+       if(histime < 0)
+               return strcat(col, cpname);
+       else if(hisname == "")
+               return strcat(col, cpname, " (", timestr, ")");
+       else
+               return strcat(col, cpname, " (", timestr, " ", strcat(hisname, col, lapstr), ")");
+}
+
+// Check if the given name already exist in race rankings? In that case, where? (otherwise return 0)
+float race_CheckName(string net_name) {
+       float i;
+       for (i=RANKINGS_CNT-1;i>=0;--i)
+               if(grecordholder[i] == net_name)
+                       return i+1;
+       return 0;
+}
+
+/*
+==================
+HUD panels
+==================
+*/
+
+// Save the config
+void HUD_Panel_ExportCfg(string cfgname)
+{
+       float fh;
+       fh = fopen(strcat("hud_", cvar_string("hud_skin"), "_", cfgname, ".cfg"), FILE_WRITE);
+       if(fh >= 0)
+       {
+               fputs(fh, strcat("seta hud_skin \"", cvar_string("hud_skin"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_bg \"", cvar_string("hud_bg"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_bg_color \"", cvar_string("hud_bg_color"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_bg_color_team \"", cvar_string("hud_bg_color_team"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_bg_alpha \"", cvar_string("hud_bg_alpha"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_bg_border \"", cvar_string("hud_bg_border"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_bg_padding \"", cvar_string("hud_bg_padding"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_fg_alpha \"", cvar_string("hud_fg_alpha"), "\"", "\n"));
+               fputs(fh, "\n");
+
+               fputs(fh, strcat("seta hud_dock \"", cvar_string("hud_dock"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_dock_color \"", cvar_string("hud_dock_color"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_dock_color_team \"", cvar_string("hud_dock_color_team"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_dock_alpha \"", ftos(cvar("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_strength_color \"", cvar_string("hud_progressbar_strength_color"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_progressbar_shield_color \"", cvar_string("hud_progressbar_shield_color"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_progressbar_health_color \"", cvar_string("hud_progressbar_health_color"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_progressbar_armor_color \"", cvar_string("hud_progressbar_armor_color"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_progressbar_fuel_color \"", cvar_string("hud_progressbar_fuel_color"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_progressbar_nexball_color \"", cvar_string("hud_progressbar_nexball_color"), "\"", "\n"));
+               fputs(fh, "\n");
+
+               // 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"));
+                       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"));
+                                       break;
+                               case 1:
+                                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_onlycurrent ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_onlycurrent"))), "\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"));
+                                       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"));
+                                       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"));
+                                       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"));
+                                       break;
+                       }
+                       fputs(fh, "\n");
+               }
+
+               print("^2Successfully exported to hud_", cvar_string("hud_skin"), "_", cfgname, ".cfg! (Note: It's saved in data/data/)\n");
+       }
+       fclose(fh);
+}
+
+// return active status of panel
+float HUD_Panel_CheckActive(float id)
+{
+       if (cvar_or(strcat("hud_", HUD_Panel_GetName(id)), 1))
+               return 1;
+       return 0;
+}
+
+// return size of given panel
+vector HUD_Panel_GetSize(float id)
+{
+       vector mySize;
+       mySize = stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_size")));
+
+       mySize = eX * mySize_x * vid_conwidth + eY * mySize_y * vid_conheight;
+
+       if(disable_menu_alphacheck == 2 && id == highlightedPanel)
+       {
+               vector menu_enable_maxsize, menu_enable_size;
+               menu_enable_maxsize = '0 0 0'; // shut up FTEQCC
+               menu_enable_maxsize_x = 0.3 * vid_conwidth;
+               menu_enable_maxsize_y = 0.18 * vid_conheight;
+               if(mySize_x > mySize_y)
+               {
+                       if(mySize_y > menu_enable_maxsize_y)
+                       {
+                               menu_enable_size_y = menu_enable_maxsize_y;
+                               menu_enable_size_x = mySize_x * (menu_enable_maxsize_y/mySize_y);
+                               mySize = (1 - cvar("_menu_alpha")) * mySize + (cvar("_menu_alpha")) * menu_enable_size;
+                       }
+               }
+               else
+               {
+                       if(mySize_x > menu_enable_maxsize_x)
+                       {
+                               menu_enable_size_x = menu_enable_maxsize_x;
+                               menu_enable_size_y = mySize_y * (menu_enable_maxsize_x/mySize_x);
+                               mySize = (1 - cvar("_menu_alpha")) * mySize + (cvar("_menu_alpha")) * menu_enable_size;
+                       }
+               }
+       }
+       return mySize;
+}
+
+// return pos of given panel
+vector HUD_Panel_GetPos(float id)
+{
+       vector pos;
+       pos = stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_pos")));
+
+       pos = eX * pos_x * vid_conwidth + eY * pos_y * vid_conheight;
+
+       if(disable_menu_alphacheck == 2 && id == highlightedPanel)
+       {
+               vector mySize, menu_enable_panelpos;
+               mySize = HUD_Panel_GetSize(id);
+               if(mySize_x > mySize_y)
+                       menu_enable_panelpos = eX * 0.5 * vid_conwidth - eX * 0.5 * mySize_x + eY * 0.82 * vid_conheight;
+               else
+                       menu_enable_panelpos = eY * 0.5 * vid_conheight - eY * 0.5 * mySize_y + eX * 0.7 * vid_conwidth;
+               pos = (1 - cvar("_menu_alpha")) * pos + (cvar("_menu_alpha")) * menu_enable_panelpos;
+       }
+       return pos;
+}
+
+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)
+{
+       float alpha;
+       alpha = hud_fg_alpha;
+
+       if(hud_configure && !cvar(strcat("hud_", HUD_Panel_GetName(id)))) // ALWAYS show disabled panels at 0.25 alpha when in config mode
+               return 0.25;
+
+       if(disable_menu_alphacheck == 2 && highlightedPanel == id) // don't fade this panel when showing the panel-specific menu dialog
+               return alpha;
+       else
+               return alpha * menu_fade_alpha;
+}
+
+float HUD_Panel_GetPadding(float id)
+{
+       string padding;
+       padding = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_padding"));
+       if(padding == "")
+               padding = cvar_string("hud_bg_padding");
+
+       vector mySize;
+       mySize = HUD_Panel_GetSize(id);
+       float smallestsize;
+       smallestsize = min(mySize_x, mySize_y);
+       return min(smallestsize/2 - 5, stof(padding));
+}
+
+// draw the background/borders
+void HUD_Panel_DrawBg(float id, vector pos, vector mySize, float alpha)
+{
+       if(!hud_configure && cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg")) == "0")
+               return;
+
+       string bg;
+       bg = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg"));
+       if(bg == "")
+               bg = cvar_string("hud_bg");
+
+       if(bg == "0" && hud_configure) {
+               bg = "border"; // we probably want to see a background in config mode at all times...
+       }
+
+       if(bg != "0")
+       {
+               float border;
+               border = max(0.0000001, HUD_Panel_GetBorder(id)); // draw_BorderPicture does not like border = 0
+
+               vector color;
+               color = HUD_Panel_GetColor(id);
+
+               if(alpha)
+                       alpha = HUD_Panel_GetBgAlpha(id) * alpha; // allow panels to fade in/out by passing an alpha value
+               else
+                       alpha = HUD_Panel_GetBgAlpha(id);
+
+               draw_BorderPicture(pos - '1 1 0' * border, strcat("gfx/hud/", cvar_string("hud_skin"), "/", bg), mySize + '1 1 0' * 2 * border, color, alpha, '1 1 0' * (border/BORDER_MULTIPLIER));
+       }
+}
+
+void HUD_Panel_DrawProgressBar(vector pos, float vertical, vector mySize, vector color, float alpha, float drawflag)
+{
+//float        drawsubpic(vector position, vector size, string pic, vector srcPosition, vector srcSize, vector rgb, float alpha, float flag) = #328;
+       string pic;
+       pic = strcat("gfx/hud/", cvar_string("hud_skin"), "/");
+       if(vertical) {
+               drawsubpic(pos, eY * min(mySize_y * 0.5, mySize_x) + eX * mySize_x, strcat(pic, "statusbar_vertical"), '0 0 0', '1 0.25 0', color, alpha, drawflag);
+               if(mySize_y/mySize_x > 2)
+                       drawsubpic(pos + eY * mySize_x, eY * (mySize_y - 2 * mySize_x) + eX * mySize_x, strcat(pic, "statusbar_vertical"), '0 0.25 0', '1 0.5 0', color, alpha, drawflag);
+               drawsubpic(pos + eY * mySize_y - eY * min(mySize_y * 0.5, mySize_x), eY * min(mySize_y * 0.5, mySize_x) + eX * mySize_x, strcat(pic, "statusbar_vertical"), '0 0.75 0', '1 0.25 0', color, alpha, drawflag);
+       } else {
+               drawsubpic(pos, eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, strcat(pic, "statusbar"), '0 0 0', '0.25 1 0', color, alpha, drawflag);
+               if(mySize_x/mySize_y > 2)
+                       drawsubpic(pos + eX * mySize_y, eX * (mySize_x - 2 * mySize_y) + eY * mySize_y, strcat(pic, "statusbar"), '0.25 0 0', '0.5 1 0', color, alpha, drawflag);
+               drawsubpic(pos + eX * mySize_x - eX * min(mySize_x * 0.5, mySize_y), eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, strcat(pic, "statusbar"), '0.75 0 0', '0.25 1 0', color, alpha, drawflag);
+       }
+}
+
+vector HUD_Panel_GetProgressBarColor(string item)
+{
+       return stov(cvar_string(strcat("hud_progressbar_", item, "_color")));
+}
+
+// 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)
+{
+       float i;
+
+       vector myTarget;
+       myTarget = myPos;
+
+       vector targPos;
+       vector targSize;
+       vector myCenter;
+       vector targCenter;
+       myCenter = '0 0 0'; // shut up fteqcc, there IS a reference
+       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))
+                       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);
+
+               if(myPos_y + mySize_y < targPos_y)
+                       continue;
+               if(myPos_y > targPos_y + targSize_y)
+                       continue;
+
+               if(myPos_x + mySize_x < targPos_x)
+                       continue;
+               if(myPos_x > targPos_x + targSize_x)
+                       continue;
+
+               // OK, there IS a collision.
+
+               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;
+
+               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;
+                       else // push it upwards
+                               myTarget_y = targPos_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;
+                       else // push it upwards
+                               myTarget_y = targPos_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;
+                       else // push it downwards
+                               myTarget_y = targPos_y + targSize_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;
+                       else // push it downwards
+                               myTarget_y = targPos_y + targSize_y;
+               }
+       }
+
+       return myTarget;
+}
+
+void HUD_Panel_SetPos(float id, vector pos)
+{
+       vector oldPos;
+       oldPos = HUD_Panel_GetPos(id);
+
+       vector mySize;
+       mySize = HUD_Panel_GetSize(id);
+
+       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_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;
+       }
+
+       string s;
+       s = strcat(ftos(pos_x/vid_conwidth), " ", ftos(pos_y/vid_conheight));
+
+       cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_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) {
+       float i;
+
+       float targBorder;
+       vector targPos;
+       vector targSize;
+       vector targEndPos;
+       vector dist;
+
+       for (i = 0; i < HUD_PANEL_NUM; ++i) {
+               if(i == id || !HUD_Panel_CheckActive(i))
+                       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;
+
+               // 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)
+                       continue;
+
+               if (resizeCorner == 1)
+               {
+                       // check if this panel is on our way
+                       if (resizeorigin_x <= targPos_x)
+                               continue;
+                       if (resizeorigin_y <= targPos_y)
+                               continue;
+                       if (targEndPos_x <= resizeorigin_x - mySize_x)
+                               continue;
+                       if (targEndPos_y <= resizeorigin_y - mySize_y)
+                               continue;
+
+                       // there is a collision:
+                       // detect which side of the panel we are facing is actually limiting the resizing
+                       // (which side the resize direction finds for first) and reduce the size up to there
+                       //
+                       // dist is the distance between resizeorigin and the "analogous" point of the panel
+                       // 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)
+                               mySize_x = min(mySize_x, dist_x);
+                       else
+                               mySize_y = min(mySize_y, dist_y);
+               }
+               else if (resizeCorner == 2)
+               {
+                       if (resizeorigin_x >= targEndPos_x)
+                               continue;
+                       if (resizeorigin_y <= targPos_y)
+                               continue;
+                       if (targPos_x >= resizeorigin_x + mySize_x)
+                               continue;
+                       if (targEndPos_y <= resizeorigin_y - mySize_y)
+                               continue;
+
+                       dist_x = targPos_x - resizeorigin_x;
+                       dist_y = resizeorigin_y - targEndPos_y;
+                       if (dist_y < 0)
+                               mySize_x = min(mySize_x, dist_x);
+                       else
+                               mySize_y = min(mySize_y, dist_y);
+               }
+               else if (resizeCorner == 3)
+               {
+                       if (resizeorigin_x <= targPos_x)
+                               continue;
+                       if (resizeorigin_y >= targEndPos_y)
+                               continue;
+                       if (targEndPos_x <= resizeorigin_x - mySize_x)
+                               continue;
+                       if (targPos_y >= resizeorigin_y + mySize_y)
+                               continue;
+
+                       dist_x = resizeorigin_x - targEndPos_x;
+                       dist_y = targPos_y - resizeorigin_y;
+                       if (dist_y < 0)
+                               mySize_x = min(mySize_x, dist_x);
+                       else
+                               mySize_y = min(mySize_y, dist_y);
+               }
+               else if (resizeCorner == 4)
+               {
+                       if (resizeorigin_x >= targEndPos_x)
+                               continue;
+                       if (resizeorigin_y >= targEndPos_y)
+                               continue;
+                       if (targPos_x >= resizeorigin_x + mySize_x)
+                               continue;
+                       if (targPos_y >= resizeorigin_y + mySize_y)
+                               continue;
+
+                       dist_x = targPos_x - resizeorigin_x;
+                       dist_y = targPos_y - resizeorigin_y;
+                       if (dist_y < 0)
+                               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);
+       }
+
+       return mySize;
+}
+
+void HUD_Panel_SetPosSize(float id)
+{
+       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);
+       }
+
+       // 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.
+       {
+               mySize_x = max(17 * cvar("con_chatsize"), mySize_x);
+               mySize_y = max(2 * cvar("con_chatsize") + 2 * HUD_Panel_GetPadding(id), mySize_y);
+       }
+
+       // collision testing|
+       // -----------------+
+
+       // we need to know pos at this stage, but it might still change later if we hit a screen edge/other panel (?)
+       if(resizeCorner == 1) {
+               myPos_x = resizeorigin_x - mySize_x;
+               myPos_y = resizeorigin_y - mySize_y;
+       } else if(resizeCorner == 2) {
+               myPos_x = resizeorigin_x;
+               myPos_y = resizeorigin_y - mySize_y;
+       } else if(resizeCorner == 3) {
+               myPos_x = resizeorigin_x - mySize_x;
+               myPos_y = resizeorigin_y;
+       } else { // resizeCorner == 4
+               myPos_x = resizeorigin_x;
+               myPos_y = resizeorigin_y;
+       }
+
+       // left/top screen edges
+       if(myPos_x < 0)
+               mySize_x = mySize_x + myPos_x;
+       if(myPos_y < 0)
+               mySize_y = mySize_y + myPos_y;
+
+       // bottom/right screen edges
+       if(myPos_x + mySize_x > vid_conwidth)
+               mySize_x = vid_conwidth - myPos_x;
+       if(myPos_y + mySize_y > vid_conheight)
+               mySize_y = vid_conheight - myPos_y;
+
+       if(cvar("hud_configure_checkcollisions_debug"))
+               drawfill(myPos, mySize, '1 1 1', .2, DRAWFLAG_NORMAL);
+
+       // before checkresize, otherwise panel can be snapped partially inside another panel or panel aspect ratio can be broken
+       if(cvar("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;
+       }
+
+       if(cvar("hud_configure_checkcollisions"))
+       {
+               mySize = HUD_Panel_CheckResize(id, mySize, resizeorigin);
+       }
+
+       // minimum panel size cap, do this once more so we NEVER EVER EVER have a panel smaller than this, JUST IN CASE above code still makes the panel eg negative (impossible to resize back without changing cvars manually then)
+       mySize_x = max(0.025 * vid_conwidth, mySize_x);
+       mySize_y = max(0.025 * vid_conheight, mySize_y);
+
+       // do another pos check, as size might have changed by now
+       if(resizeCorner == 1) {
+               myPos_x = resizeorigin_x - mySize_x;
+               myPos_y = resizeorigin_y - mySize_y;
+       } else if(resizeCorner == 2) {
+               myPos_x = resizeorigin_x;
+               myPos_y = resizeorigin_y - mySize_y;
+       } else if(resizeCorner == 3) {
+               myPos_x = resizeorigin_x - mySize_x;
+               myPos_y = resizeorigin_y;
+       } else { // resizeCorner == 4
+               myPos_x = resizeorigin_x;
+               myPos_y = resizeorigin_y;
+       }
+
+       if(cvar("hud_configure_checkcollisions_debug"))
+       if(cvar("hud_configure_checkcollisions"))
+               drawfill(myPos, mySize, '0 1 0', .3, DRAWFLAG_NORMAL);
+
+       string s;
+       s = strcat(ftos(mySize_x/vid_conwidth), " ", ftos(mySize_y/vid_conheight));
+       cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_size"), s);
+
+       s = strcat(ftos(myPos_x/vid_conwidth), " ", ftos(myPos_y/vid_conheight));
+       cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_pos"), s);
+}
+
+float mouseClicked;
+float prevMouseClicked; // previous state
+float prevMouseClickedTime; // time during previous mouse click, to check for doubleclicks
+vector prevMouseClickedPos; // pos during previous mouse click, to check for doubleclicks
+
+float menu_enabled;
+float menu_enabled_time;
+float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary)
+{
+       if(!hud_configure)
+               return false;
+
+       // allow console bind to work
+       string con_keys;
+       float keys;
+       con_keys = findkeysforcommand("toggleconsole");
+       keys = tokenize(con_keys);
+
+       float hit_con_bind, i;
+       for (i = 0; i < keys; ++i)
+       {
+               if(nPrimary == stof(argv(i)))
+                       hit_con_bind = 1;
+       }
+
+       if(nPrimary == K_MOUSE1)
+       {
+               if(bInputType == 0) { // key pressed
+                       mouseClicked = 1;
+                       return true;
+               }
+               else if(bInputType == 1) {// key released
+                       mouseClicked = 0;
+                       return true;
+               }
+       }
+       else if(nPrimary == K_ESCAPE)
+       {
+               disable_menu_alphacheck = 1;
+               menu_enabled = 1;
+               menu_enabled_time = time;
+               localcmd("menu_showhudexit\n");
+       }
+
+       else if(hit_con_bind)
+               return false;
+
+       return true; // Suppress ALL other input
+}
+
+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)
+               menu_enabled = 0;
+
+       /*
+       print("Disable menu_alphacheck: ", ftos(disable_menu_alphacheck), "\n");
+       print("Highlighted: ", ftos(highlightedPanel), "\n");
+       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!
+               highlightedPanel = -1;
+               highlightedAction = 0;
+       }
+
+       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(cvar("hud_configure_checkcollisions_debug"))
+                                       drawfill(panelPos, panelSize, '1 0 0', .3, DRAWFLAG_NORMAL);
+
+                               if(highlightedAction == 1)
+                                       HUD_Panel_SetPos(i, mousepos - panel_click_distance);
+                               else if(highlightedAction == 2)
+                                       HUD_Panel_SetPosSize(i);
+                       }
+               }
+
+               // doubleclick check
+               if(time - prevMouseClickedTime < 0.4 && prevMouseClicked == 0 && prevMouseClickedPos == mousepos && highlightedPanel >= 0)
+               {
+                       mouseClicked = 0; // to prevent spam, I guess.
+                       disable_menu_alphacheck = 2;
+                       menu_enabled = 1;
+                       menu_enabled_time = time;
+                       localcmd("menu_showhudoptions ", ftos(highlightedPanel), "\n");
+                       return;
+               }
+               if(prevMouseClicked == 0)
+               {
+                       prevMouseClickedTime = time;
+                       prevMouseClickedPos = mousepos;
+               }
+       }
+       prevMouseClicked = mouseClicked;
+}
+
+// Weapon icons (#0)
+//
+float weaponspace[10];
+void 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)
+{
+       entity h;
+       h = weaponorder[i];
+       weaponorder[i] = weaponorder[j];
+       weaponorder[j] = h;
+}
+
+string weaponorder_cmp_str_save;
+string weaponorder_cmp_str;
+float weaponorder_cmp(float i, float j, entity pass)
+{
+       float ai, aj;
+       ai = strstrofs(weaponorder_cmp_str, sprintf(" %d ", weaponorder[i].weapon), 0);
+       aj = strstrofs(weaponorder_cmp_str, sprintf(" %d ", weaponorder[j].weapon), 0);
+       return aj - ai; // the string is in REVERSE order (higher prio at the right is what we want, but higher prio first is the string)
+}
+
+void HUD_WeaponIcons(void)
+{
+       float id = HUD_PANEL_WEAPONICONS;
+       float alpha, stat_weapons; // "constants"
+       vector pos, mySize, accuracy_color;
+       float i, weapid, fade, weapon_stats, weapon_hit, weapon_damage, weapon_cnt; // variables
+
+       pos = HUD_Panel_GetPos(id);
+       mySize = HUD_Panel_GetSize(id);
+
+       stat_weapons = getstati(STAT_WEAPONS);
+       weapon_cnt = 0;
+       for(i = WEP_FIRST; i <= WEP_LAST; ++i)
+       {
+               self = get_weaponinfo(i);
+               if(self.impulse >= 0)
+                       ++weapon_cnt;
+       }
+
+       // TODO make this configurable
+       weaponorder_cmp_str = strcat(" ", weaponorder_byimpulse, " ");
+
+       if(weaponorder_cmp_str != weaponorder_cmp_str_save)
+       {
+               if(weaponorder_cmp_str_save)
+                       strunzone(weaponorder_cmp_str_save);
+               weaponorder_cmp_str_save = strzone(weaponorder_cmp_str);
+               weapon_cnt = 0;
+               for(i = WEP_FIRST; i <= WEP_LAST; ++i)
+               {
+                       self = get_weaponinfo(i);
+                       if(self.impulse >= 0)
+                       {
+                               weaponorder[weapon_cnt] = self;
+                               ++weapon_cnt;
+                       }
+               }
+               heapsort(weapon_cnt, weaponorder_swap, weaponorder_cmp, world);
+       }
+
+       HUD_Panel_DrawBg(id, pos, mySize, 0);
+       float padding;
+       padding = HUD_Panel_GetPadding(id);
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
+
+       // hits
+       weapon_stats = getstati(STAT_DAMAGE_HITS);
+       weapon_number = weapon_stats & 63;
+       weapon_hits[weapon_number-WEP_FIRST] = floor(weapon_stats / 64);
+       // fired
+       weapon_stats = getstati(STAT_DAMAGE_FIRED);
+       weapon_number = weapon_stats & 63;
+       weapon_fired[weapon_number-WEP_FIRST] = floor(weapon_stats / 64);
+
+       if(cvar_or("hud_weaponicons_fade", 1))
+       {
+               fade = 3.2 - 2 * (time - weapontime);
+               fade = bound(0.7, fade, 1);
+       }
+       else
+               fade = 1;
+
+       HUD_WeaponIcons_Clear();
+
+       float rows, columns;
+       rows = mySize_y/mySize_x;
+       rows = bound(1, floor((sqrt(4 * (2/1) * rows * WEP_COUNT + rows * rows) + rows + 0.5) / 2), WEP_COUNT);
+       //                               ^^^ weapon icon aspect goes here
+
+       columns = ceil(WEP_COUNT/rows);
+       float row, column;
+       for(i = 0; i < weapon_cnt; ++i)
+       {
+               self = weaponorder[i];
+               weapid = self.impulse;
+
+               alpha = (self.weapon == activeweapon) ? 1 : 0.6;
+
+               weapon_hit = weapon_hits[self.weapon-WEP_FIRST];
+               weapon_damage = weapon_fired[self.weapon-WEP_FIRST];
+
+               // draw background behind currently selected weapon
+               if(self.weapon == activeweapon)
+                       drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "weapon_current_bg", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+
+               // draw the weapon accuracy on the HUD
+               if(hud_accuracy_hud && !(gametype == GAME_RACE || gametype == GAME_CTS))
+               {
+                       if(weapon_damage)
+                               weapon_stats = floor(100 * weapon_hit / weapon_damage);
+
+                       accuracy_color = HUD_AccuracyColor(weapon_stats);
+                       if(weapon_damage)
+                               drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "weapon_accuracy", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), accuracy_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+               }
+
+               // 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);
+
+                       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);
+               }
+               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);
+               }
+
+               ++row;
+               if(row >= rows)
+               {
+                       row = 0;
+                       ++column;
+               }
+       }
+
+}
+
+// Inventory (#1)
+//
+float GetAmmoStat(float i)
+{
+       switch(i)
+       {
+               case 0: return STAT_SHELLS;
+               case 1: return STAT_NAILS;
+               case 2: return STAT_ROCKETS;
+               case 3: return STAT_CELLS;
+               case 4: return STAT_FUEL;
+               default: return -1;
+       }
+}
+
+float GetAmmoItemCode(float i)
+{
+       switch(i)
+       {
+               case 0: return IT_SHELLS;
+               case 1: return IT_NAILS;
+               case 2: return IT_ROCKETS;
+               case 3: return IT_CELLS;
+               case 4: return IT_FUEL;
+               default: return -1;
+       }
+}
+
+string GetAmmoPicture(float i)
+{
+       switch(i)
+       {
+               case 0: return "ammo_shells";
+               case 1: return "ammo_bullets";
+               case 2: return "ammo_rockets";
+               case 3: return "ammo_cells";
+               case 4: return "ammo_fuel";
+               default: return "";
+       }
+}
+
+void HUD_Inventory(void)
+{
+       float id = HUD_PANEL_INVENTORY;
+       float i;
+       float stat_items;
+
+       vector pos, mySize, mysize, mypos;
+       pos = HUD_Panel_GetPos(id);
+       mySize = HUD_Panel_GetSize(id);
+
+       HUD_Panel_DrawBg(id, pos, mySize, 0);
+       float padding;
+       padding = HUD_Panel_GetPadding(id);
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
+
+       // 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)
+                               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)
+                               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);
+                               }
+                       }
+               }
+       }
+}
+
+
+// Powerups (#2)
+//
+void HUD_Powerups(void) {
+       float id = HUD_PANEL_POWERUPS;
+       float stat_items;
+       stat_items = getstati(STAT_ITEMS);
+
+       if(!hud_configure)
+       {
+               if not(stat_items & IT_STRENGTH)
+                       if not(stat_items & IT_INVINCIBLE)
+                               return;
+
+               if (getstati(STAT_HEALTH) <= 0)
+                       return;
+       }
+
+       vector pos, mySize;
+       pos = HUD_Panel_GetPos(id);
+       mySize = HUD_Panel_GetSize(id);
+
+       HUD_Panel_DrawBg(id, pos, mySize, 0);
+       float padding;
+       padding = HUD_Panel_GetPadding(id);
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
+
+       float strength_time, shield_time;
+
+       strength_time = bound(0, getstatf(STAT_STRENGTH_FINISHED) - time, 99);
+       shield_time = bound(0, getstatf(STAT_INVINCIBLE_FINISHED) - time, 99);
+
+       if(hud_configure)
+       {
+               strength_time = 15;
+               shield_time = 27;
+       }
+
+       float len;
+
+       vector barpos, barsize;
+       vector picpos;
+       vector numpos;
+
+       string leftname, rightname;
+       float leftcnt, rightcnt;
+       float leftexact, rightexact;
+       float leftalpha, rightalpha;
+       if (cvar(strcat("hud_", HUD_Panel_GetName(id), "_flip"))) {
+               leftname = "strength";
+               leftcnt = ceil(strength_time);
+               leftexact = strength_time;
+
+               rightname = "shield";
+               rightcnt = ceil(shield_time);
+               rightexact = shield_time;
+       } else {
+               leftname = "shield";
+               leftcnt = ceil(shield_time);
+               leftexact = shield_time;
+
+               rightname = "strength";
+               rightcnt = ceil(strength_time);
+               rightexact = strength_time;
+       }
+       leftalpha = bound(0, leftexact, 1);
+       rightalpha = bound(0, rightexact, 1);
+
+       if (mySize_x/mySize_y > 4)
+       {
+               if(leftcnt)
+               {
+                       len = strlen(ftos(leftcnt));
+
+                       if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+                               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 {
+                               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);
+               }
+
+               if(rightcnt)
+               {
+                       len = strlen(ftos(rightcnt));
+
+                       if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+                               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 {
+                               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);
+               }
+       }
+       else if (mySize_x/mySize_y > 1.5)
+       {
+               if(leftcnt)
+               {
+                       len = strlen(ftos(leftcnt));
+
+                       if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+                               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 {
+                               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);
+               }
+
+               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 {
+                               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;
+                       }
+
+                       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);
+               }
+       }
+       else
+       {
+               if(leftcnt)
+               {
+                       len = strlen(ftos(leftcnt));
+
+                       if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+                               barpos = pos;
+                               barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30);
+                               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;
+                       }
+
+                       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);
+               }
+
+               if(rightcnt)
+               {
+                       len = strlen(ftos(rightcnt));
+
+                       if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+                               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 {
+                               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);
+               }
+       }
+}
+
+// Health/armor (#3)
+//
+void HUD_HealthArmor(void)
+{
+       float id = HUD_PANEL_HEALTHARMOR;
+       vector pos, mySize;
+       pos = HUD_Panel_GetPos(id);
+       mySize = HUD_Panel_GetSize(id);
+
+       HUD_Panel_DrawBg(id, pos, mySize, 0);
+       float padding;
+       padding = HUD_Panel_GetPadding(id);
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
+
+       float armor, health;
+       armor = getstati(STAT_ARMOR);
+       health = getstati(STAT_HEALTH);
+
+       float fuel;
+       fuel = getstati(GetAmmoStat(4)); // how much fuel do we have?
+
+       if(hud_configure)
+       {
+               armor = 150;
+               health = 100;
+               fuel = 70;
+       }
+
+       if(health <= 0)
+               return;
+
+       float len;
+       vector barpos, barsize;
+       vector picpos;
+       vector numpos;
+
+       if(cvar("hud_healtharmor") == 2) // combined health and armor display
+       {
+               vector v;
+               v = healtharmor_maxdamage(health, armor, armorblockpercent);
+
+               float x;
+               x = floor(v_x + 1);
+
+               if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+                       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 {
+                       barpos = pos;
+                       barsize = eX * mySize_x * min(1, x/400) + eY * mySize_y;
+                       picpos = pos + eX * 3 * mySize_y;
+                       numpos = pos;
+               }
+
+               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);
+                       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);
+               }
+               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);
+               }
+               HUD_DrawXNum_Colored(numpos, x, 3, mySize_y, HUD_Panel_GetFgAlpha(id)); // draw the combined health and armor
+
+               // 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);
+       }
+
+       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
+                       leftname = "armor";
+                       leftcnt = armor;
+                       if(leftcnt)
+                               leftactive = 1;
+                       leftalpha = min((armor+10)/55, 1);
+
+                       rightname = "health";
+                       rightcnt = health;
+                       rightactive = 1;
+                       rightalpha = 1;
+               } else {
+                       leftname = "health";
+                       leftcnt = health;
+                       leftactive = 1;
+                       leftalpha = 1;
+
+                       rightname = "armor";
+                       rightcnt = armor;
+                       if(rightcnt)
+                               rightactive = 1;
+                       rightalpha = min((armor+10)/55, 1);
+               }
+
+               if (mySize_x/mySize_y > 5)
+               {
+                       if(leftactive)
+                       {
+                               len = strlen(ftos(leftcnt));
+
+                               if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+                                       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 {
+                                       barpos = pos;
+                                       barsize = eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y;
+                                       picpos = pos;
+                                       numpos = picpos + eX * mySize_y + eY * 0.25 * mySize_y;
+                               }
+
+                               HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                               drawpic_skin(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                               HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id));
+                       }
+
+                       if(rightactive)
+                       {
+                               len = strlen(ftos(rightcnt));
+
+                               if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+                                       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 {
+                                       barpos = pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, rightcnt/200);
+                                       barsize = eX * 0.5 * mySize_x * min(1, rightcnt/200) + eY * mySize_y;
+                                       picpos = pos + eX * mySize_x - eX * mySize_y;
+                                       numpos = picpos - eX * 1.5 * mySize_y + eY * 0.25 * mySize_y;
+                               }
+
+                               HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                               drawpic_skin(picpos, rightname, '1 1 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                               HUD_DrawXNum_Colored(numpos, rightcnt, 3, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id));
+                       }
+
+                       if(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);
+               }
+               else if (mySize_x/mySize_y > 2)
+               {
+                       if(leftactive)
+                       {
+                               len = strlen(ftos(leftcnt));
+
+                               if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+                                       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 {
+                                       barpos = pos;
+                                       barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y;
+                                       picpos = pos;
+                                       numpos = picpos + eX * 0.5 * mySize_y;
+                               }
+
+                               HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                               drawpic_skin(picpos, leftname, '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                               HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id));
+                       }
+
+                       if(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 {
+                                       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;
+                               }
+
+                               HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                               drawpic_skin(picpos, rightname, '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                               HUD_DrawXNum_Colored(numpos, rightcnt, len, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id));
+                       }
+
+                       if(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);
+               }
+               else
+               {
+                       if(leftactive)
+                       {
+                               len = strlen(ftos(leftcnt));
+
+                               if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+                                       barpos = pos;
+                                       barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200);
+                                       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;
+                               }
+
+                               HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                               drawpic_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                               HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.166 * mySize_x, HUD_Panel_GetFgAlpha(id));
+                       }
+
+                       if(rightactive)
+                       {
+                               len = strlen(ftos(rightcnt));
+
+                               if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+                                       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 {
+                                       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(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);
+               }
+       }
+}
+
+// ___TODO___ !!!
+// Notification area (#4)
+//
+
+string Weapon_SuicideMessage(float deathtype)
+{
+       w_deathtype = deathtype;
+       get_weaponinfo(DEATH_WEAPONOF(deathtype)).weapon_func(WR_SUICIDEMESSAGE);
+       return w_deathtypestring;
+}
+
+string Weapon_KillMessage(float deathtype)
+{
+       w_deathtype = deathtype;
+       get_weaponinfo(DEATH_WEAPONOF(deathtype)).weapon_func(WR_KILLMESSAGE);
+       return w_deathtypestring;
+}
+
+float killnotify_times[10];
+float killnotify_deathtype[10];
+float killnotify_actiontype[10]; // 0 = "Y [used by] X", 1 = "X [did action to] Y"
+string killnotify_attackers[10];
+string killnotify_victims[10];
+void HUD_KillNotify_Push(string attacker, string victim, float actiontype, float wpn)
+{
+       float i;
+       for (i = 9; i > 0; --i) {
+               killnotify_times[i] = killnotify_times[i-1];
+               killnotify_deathtype[i] = killnotify_deathtype[i-1];
+               killnotify_actiontype[i] = killnotify_actiontype[i-1];
+               if(killnotify_attackers[i])
+                       strunzone(killnotify_attackers[i]);
+               killnotify_attackers[i] = strzone(killnotify_attackers[i-1]);
+               if(killnotify_victims[i])
+                       strunzone(killnotify_victims[i]);
+               killnotify_victims[i] = strzone(killnotify_victims[i-1]);
+       }
+       killnotify_times[0] = time;
+       killnotify_deathtype[0] = wpn;
+       killnotify_actiontype[0] = actiontype;
+       if(killnotify_attackers[0])
+               strunzone(killnotify_attackers[0]);
+       killnotify_attackers[0] = strzone(attacker);
+       if(killnotify_victims[0])
+               strunzone(killnotify_victims[0]);
+       killnotify_victims[0] = strzone(victim);
+}
+
+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
+       
+       if(msg == MSG_SUICIDE) {
+               // TODO: cl_gentle
+               w = DEATH_WEAPONOF(type);
+               if(WEP_VALID(w)) {
+                       HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
+                       if (alsoprint)
+                               print("^1", s1, "^1 ", Weapon_SuicideMessage(type), "\n");
+               } else if (type == DEATH_KILL) {
+                       HUD_KillNotify_Push(s1, "", 0, DEATH_KILL);
+                       if (alsoprint)
+                               print ("^1",s1, "^1 couldn't take it anymore\n");
+               } else if (type == DEATH_ROT) {
+                       HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
+                       if (alsoprint)
+                               print ("^1",s1, "^1 died\n");
+               } else if (type == DEATH_NOAMMO) {
+                       HUD_KillNotify_Push(s1, "", 0, DEATH_NOAMMO);
+                       if (alsoprint)
+                               print ("^7",s1, "^7 committed suicide. What's the point of living without ammo?\n");
+               } else if (type == DEATH_CAMP) {
+                       HUD_KillNotify_Push(s1, "", 0, DEATH_CAMP);
+                       if (alsoprint)
+                               print ("^1",s1, "^1 thought they found a nice camping ground\n");
+               } else if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) {
+                       HUD_KillNotify_Push(s1, "", 0, type);
+                       if (alsoprint)
+                               print ("^1",s1, "^1 didn't become friends with the Lord of Teamplay\n");
+               } else if (type == DEATH_CHEAT) {
+                       HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
+                       if (alsoprint)
+                               print ("^1",s1, "^1 unfairly eliminated themself\n");
+               } else if (type == DEATH_FIRE) {
+                       HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
+                       if (alsoprint)
+                               print ("^1",s1, "^1 burned to death\n");
+               } else if (type != DEATH_TEAMCHANGE && type != DEATH_QUIET) {
+                       HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
+                       if (alsoprint)
+                               print ("^1",s1, "^1 couldn't resist the urge to self-destruct\n");
+               } 
+               
+               if (stof(s2) > 2) // killcount > 2
+                       print ("^1",s1,"^1 ended it all after a ",s2," kill spree\n");
+       } else if(msg == MSG_KILL) {
+               w = DEATH_WEAPONOF(type);
+               if(WEP_VALID(w)) {
+                       HUD_KillNotify_Push(s2, s1, 1, w);
+                       if (alsoprint)
+                               print("^1", s1, "^1 ", Weapon_KillMessage(type), "\n");
+               }
+               else if(type == KILL_TEAM_RED || type == KILL_TEAM_BLUE || type == KILL_TEAM_SPREE) {
+                       HUD_KillNotify_Push(s1, s2, 1, type);
+                       if(alsoprint)
+                       {
+                               if(cvar("cl_gentle")) {
+                                       print ("^1", s1, "^1 took action against a team mate\n");
+                               } else {
+                                       print ("^1", s1, "^1 mows down a team mate\n");
+                               }
+                       }
+                       if (stof(s2) > 2 && type == KILL_TEAM_SPREE) {
+                               if(cvar("cl_gentle"))
+                                       print ("^1",s1,"^1 ended a ",s3," scoring spree by going against a team mate\n");
+                               else
+                                       print ("^1",s1,"^1 ended a ",s3," kill spree by killing a team mate\n");
+                       }
+                       else if (stof(s2) > 2) {
+                               if(cvar("cl_gentle"))
+                                       print ("^1",s1,"'s ^1",s3," scoring spree was ended by a team mate!\n");
+                               else
+                                       print ("^1",s1,"'s ^1",s3," kill spree was ended by a team mate!\n");
+                       }
+               }
+               else if(type == KILL_FIRST_BLOOD)
+                       print("^1",s1, "^1 drew first blood", "\n");
+               // TODO: icon!
+               else if (type == DEATH_TELEFRAG)
+                       print ("^1",s1, "^1 was telefragged by ", s2, "\n");
+               else if (type == DEATH_DROWN) {
+                       HUD_KillNotify_Push(s2, s1, 1, DEATH_DROWN);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 was drowned by ", s2, "\n");
+               }
+               else if (type == DEATH_SLIME) {
+                       HUD_KillNotify_Push(s2, s1, 1, DEATH_SLIME);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 was slimed by ", s2, "\n");
+               }
+               else if (type == DEATH_LAVA) {
+                       HUD_KillNotify_Push(s2, s1, 1, DEATH_LAVA);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 was cooked by ", s2, "\n");
+               }
+               else if (type == DEATH_FALL) {
+                       HUD_KillNotify_Push(s2, s1, 1, DEATH_FALL);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 was grounded by ", s2, "\n");
+               }
+               else if (type == DEATH_SHOOTING_STAR) {
+                       HUD_KillNotify_Push(s2, s1, 1, DEATH_SHOOTING_STAR);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 was shot into space by ", s2, "\n");
+               }
+               else if (type == DEATH_SWAMP) {
+                       HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 was conserved by ", s2, "\n");
+               }
+               else if (type == DEATH_HURTTRIGGER)
+               {
+                       HUD_KillNotify_Push(s2, s1, 1, DEATH_HURTTRIGGER);
+                       if(alsoprint)
+                               print("^1",s1, "^1 was thrown into a world of hurt by ", s2, "\n");
+               } else if(type == DEATH_SBCRUSH) {
+                       HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 was crushed by ^1", s2, "\n");
+               } else if(type == DEATH_SBMINIGUN) {
+                       HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 got shredded by ^1", s2, "\n");
+               } else if(type == DEATH_SBROCKET) {
+                       HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 was blased to bits by ^1", s2, "\n");
+               } else if(type == DEATH_SBBLOWUP) {
+                       HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 got caught in the destruction of ^1", s2, "'s vehicle\n");
+               } else if(type == DEATH_WAKIGUN) {
+                       HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 was bolted down by ^1", s2, "\n");
+               } else if(type == DEATH_WAKIROCKET) {
+                       HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 could find no shelter from ^1", s2, "'s rockets\n");
+               } else if(type == DEATH_WAKIBLOWUP) {
+                       HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 dies when ^1", s2, "'s wakizashi dies.\n");
+               } else if(type == DEATH_TURRET) {
+                       HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 was pushed into the line of fire by ^1", s2, "\n");
+               } else if(type == DEATH_TOUCHEXPLODE) {
+                       HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 was pushed into an accident by ^1", s2, "\n");
+               } else if(type == DEATH_CHEAT) {
+                       HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 was unfairly eliminated by ^1", s2, "\n");
+               } else if (type == DEATH_FIRE) {
+                       HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 was burnt to death by ^1", s2, "\n");
+               } else if (type == DEATH_CUSTOM) {
+                       HUD_KillNotify_Push(s2, s1, 1, DEATH_CUSTOM);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 ", s2, "\n");
+               } else {
+                       HUD_KillNotify_Push(s2, s1, 1, DEATH_GENERIC);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 was fragged by ", s2, "\n");
+               }
+       } else if(msg == MSG_SPREE) {
+               if(type == KILL_END_SPREE) {
+                       if(cvar("cl_gentle"))
+                               print ("^1",s1,"'s ^1", s2, " scoring spree was ended by ", s3, "\n");
+                       else
+                               print ("^1",s1,"'s ^1", s2, " kill spree was ended by ", s3, "\n");
+               } else if(type == KILL_SPREE) {
+                       if(cvar("cl_gentle"))
+                               print ("^1",s1,"^1 made ",s2," scores in a row\n");
+                       else
+                               print ("^1",s1,"^1 has ",s2," frags in a row\n");
+               } else if(type == KILL_SPREE_3) {
+                       if(cvar("cl_gentle"))
+                               print (s1,"^7 made a ^1TRIPLE SCORE\n");
+                       else
+                               print (s1,"^7 made a ^1TRIPLE FRAG\n");
+               } else if(type == KILL_SPREE_5) {
+                       if(cvar("cl_gentle"))
+                               print (s1,"^7 unleashes ^1SCORING RAGE\n");
+                       else
+                               print (s1,"^7 unleashes ^1RAGE\n");
+               } else if(type == KILL_SPREE_10) {
+                       if(cvar("cl_gentle"))
+                               print (s1,"^7 made ^1TEN SCORES IN A ROW!\n");
+                       else
+                               print (s1,"^7 starts the ^1MASSACRE!\n");
+               } else if(type == KILL_SPREE_15) {
+                       if(cvar("cl_gentle"))
+                               print (s1,"^7 made ^1FIFTEEN SCORES IN A ROW!\n");
+                       else
+                               print (s1,"^7 executes ^1MAYHEM!\n");
+               } else if(type == KILL_SPREE_20) {
+                       if(cvar("cl_gentle"))
+                               print (s1,"^7 made ^1TWENTY SCORES IN A ROW!\n");
+                       else
+                               print (s1,"^7 is a ^1BERSERKER!\n");
+               } else if(type == KILL_SPREE_25) {
+                       if(cvar("cl_gentle"))
+                               print (s1,"^7 made ^1TWENTY FIFE SCORES IN A ROW!\n");
+                       else
+                               print (s1,"^7 inflicts ^1CARNAGE!\n");
+               } else if(type == KILL_SPREE_30) {
+                       if(cvar("cl_gentle"))
+                               print (s1,"^7 made ^1THIRTY SCORES IN A ROW!\n");
+                       else
+                               print (s1,"^7 unleashes ^1ARMAGEDDON!\n");
+               }
+       } else if(msg == MSG_KILL_ACTION) { // wtf is this? isnt it basically the same as MSG_SUICIDE?
+               if (type == DEATH_DROWN) {
+                       HUD_KillNotify_Push(s1, "", 0, DEATH_DROWN);
+                       if(alsoprint)
+                       {
+                               if(cvar("cl_gentle"))
+                                       print ("^1",s1, "^1 was in the water for too long\n");
+                               else
+                                       print ("^1",s1, "^1 drowned\n");
+                       }
+               } else if (type == DEATH_SLIME) {
+                       HUD_KillNotify_Push(s1, "", 0, DEATH_SLIME);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 was slimed\n");
+               } else if (type == DEATH_LAVA) {
+                       HUD_KillNotify_Push(s1, "", 0, DEATH_LAVA);
+                       if(alsoprint)
+                       {
+                               if(cvar("cl_gentle"))
+                                       print ("^1",s1, "^1 found a hot place\n");
+                               else
+                                       print ("^1",s1, "^1 turned into hot slag\n");
+                       }
+               } else if (type == DEATH_FALL) {
+                       HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
+                       if(alsoprint)
+                       {
+                               if(cvar("cl_gentle"))
+                                       print ("^1",s1, "^1 tested gravity (and it worked)\n");
+                               else
+                                       print ("^1",s1, "^1 hit the ground with a crunch\n");
+                       }
+               } else if (type == DEATH_SHOOTING_STAR) {
+                       HUD_KillNotify_Push(s1, "", 0, DEATH_SHOOTING_STAR);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 became a shooting star\n");
+               } else if (type == DEATH_SWAMP) {
+                       HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
+                       if(alsoprint)
+                       {
+                               if(cvar("cl_gentle"))
+                                       print ("^1",s1, "^1 discovered a swamp\n");
+                               else
+                                       print ("^1",s1, "^1 is now conserved for centuries to come\n");
+                       }
+               } else if(type == DEATH_TURRET) {
+                       HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 was mowed down by a turret \n");
+               } else if (type == DEATH_CUSTOM) {
+                       HUD_KillNotify_Push(s1, "", 0, DEATH_CUSTOM);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 ", s2, "\n");
+               } else if (type == DEATH_HURTTRIGGER) {
+                       HUD_KillNotify_Push(s1, "", 0, DEATH_HURTTRIGGER);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 was in the wrong place\n");
+               } else if(type == DEATH_TOUCHEXPLODE) {
+                       HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 died in an accident\n");
+               } else if(type == DEATH_CHEAT) {
+                       HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
+                       if(alsoprint)
+                               print ("^1",s1, "^1 was unfairly eliminated\n");
+               } else if(type == DEATH_FIRE) {
+                       HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
+                       if(alsoprint)
+                       {
+                               if(cvar("cl_gentle"))
+                                       print ("^1",s1, "^1 felt a little hot\n");
+                               else
+                                       print ("^1",s1, "^1 burnt to death\n");
+                               }
+               } else {
+                       HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
+                       if(alsoprint)
+                       {
+                               if(cvar("cl_gentle"))
+                                       print ("^1",s1, "^1 needs a restart\n");
+                               else
+                                       print ("^1",s1, "^1 died\n");
+                       }
+               }
+       } else if(msg == MSG_KILL_ACTION_SPREE) {
+               if(cvar("cl_gentle"))
+                       print ("^1",s1,"^1 needs a restart after a ",s2," scoring spree\n");
+               else
+                       print ("^1",s1,"^1 died with a ",s2," kill spree\n");
+       } else if(msg == MSG_INFO) {
+               if(type == INFO_GOTFLAG) { // here, s2 is the flag name
+                       HUD_KillNotify_Push(s1, s2, 0, INFO_GOTFLAG);
+                       print(s1, "^7 got the ", s2, "\n");
+               } else if(type == INFO_LOSTFLAG) {
+                       HUD_KillNotify_Push(s1, s2, 0, INFO_LOSTFLAG);
+                       print(s1, "^7 lost the ", s2, "\n");
+               } else if(type == INFO_PICKUPFLAG) {
+                       HUD_KillNotify_Push(s1, s2, 0, INFO_GOTFLAG);
+                       print(s1, "^7 picked up the ", s2, "\n");
+               } else if(type == INFO_RETURNFLAG) {
+                       HUD_KillNotify_Push(s1, s2, 0, INFO_RETURNFLAG);
+                       print(s1, "^7 returned the ", s2, "\n");
+               }
+       }
+}
+
+#define DAMAGE_CENTERPRINT_SPACER NEWLINES
+
+void HUD_Centerprint(string s1, string s2, float type, float msg)
+{
+       if(msg == MSG_SUICIDE) {
+               if (type == DEATH_TEAMCHANGE) {
+                       centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "You are now on: ", s1));
+               } else if (type == DEATH_AUTOTEAMCHANGE) {
+                       centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "You have been moved into a different team to improve team balance\nYou are now on: ", s1));
+               } else if (type == DEATH_CAMP) {
+                       if(cvar("cl_gentle"))
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Reconsider your tactics, camper!"));
+                       else
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Die camper!"));
+               } else if (type == DEATH_NOAMMO) {
+                       if(cvar("cl_gentle"))
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You are reinserted into the game for running out of ammo..."));
+                       else
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were killed for running out of ammo..."));
+               } else if (type == DEATH_ROT) {
+                       if(cvar("cl_gentle"))
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You need to preserve your health"));
+                       else
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You grew too old without taking your medicine"));
+               } else if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) {
+                       if(cvar("cl_gentle"))
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Don't go against team mates!"));
+                       else
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Don't shoot your team mates!"));
+               } else if (type == DEATH_QUIET) {
+                       // do nothing
+               } else if (type == DEATH_KILL) {
+                       if(cvar("cl_gentle"))
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You need to be more careful!"));
+                       else
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You killed your own dumb self!"));
+               }
+       } else if(msg == MSG_KILL) {
+               if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) {
+                       if(cvar("cl_gentle")) {
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You went against", s1, ",a team mate!"));
+                       } else {
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You fragged ", s1, ", a team mate!"));
+                       }
+               } else if (type == KILL_FIRST_BLOOD) {
+                       if(cvar("cl_gentle")) {
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1First score"));
+                       } else {
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1First blood"));
+                       }
+               } else if (type == KILL_FIRST_VICTIM) {
+                       if(cvar("cl_gentle")) {
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1First casualty"));
+                       } else {
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1First victim"));
+                       }
+               } else if (type == KILL_TYPEFRAG) { // s2 contains "advanced kill messages" such as ping, handicap...
+                       if(cvar("cl_gentle")) {
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You scored against ^7", s1, "^1 who was typing!", s2));
+                       } else {
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You typefragged ^7", s1, s2));
+                       }
+               } else if (type == KILL_TYPEFRAGGED) {
+                       if(cvar("cl_gentle")) {
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were scored against by ^7", s1, "^1 while you were typing!", s2));
+                       } else {
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were typefragged by ^7", s1, s2));
+                       }
+               } else if (type == KILL_FRAG) {
+                       if(cvar("cl_gentle")) {
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You scored against ^7", s1, s2));
+                       } else {
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You fragged ^7", s1, s2));
+                       }
+               } else if (type == KILL_FRAGGED) {
+                       if(cvar("cl_gentle")) {
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were scored against by ^7", s1, s2));
+                       } else {
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were fragged by ^7", s1, s2));
+                       }
+               }
+       } else if(msg == MSG_KILL_ACTION) {
+               // TODO: invent more centerprints here?
+               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Watch your step!"));
+       }
+}
+
+void HUD_Notify (void)
+{
+       float id = HUD_PANEL_NOTIFY;
+       vector pos, mySize;
+       pos = HUD_Panel_GetPos(id);
+       mySize = HUD_Panel_GetSize(id);
+
+       HUD_Panel_DrawBg(id, pos, mySize, 0);
+       float padding;
+       padding = HUD_Panel_GetPadding(id);
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
+
+       float entries, height;
+       entries = bound(1, floor(14 * mySize_y/mySize_x), 12);
+       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");
+       float fadetime;
+       fadetime = cvar("hud_notify_fadetime");
+
+       string s;
+
+       vector pos_attacker, pos_victim;
+       vector weap_pos;
+       float width_attacker, width_victim;
+       string attacker, victim;
+
+       float i, j;
+       for(j = 0; j < entries; ++j)
+       {
+               if(cvar("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)
+               {
+                       if(killnotify_times[j] + when > time)
+                               a = 1;
+                       else
+                               a = bound(0, (killnotify_times[j] + when + fadetime - time) / fadetime, 1);
+               }
+               else
+               {
+                       if(killnotify_times[j] + when > time)
+                               a = 1;
+                       else
+                               a = 0;
+               }
+
+               // 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) 
+               {
+                       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;
+
+                       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);
+                       }
+                       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);
+                       }
+                       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);
+                       }
+                       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);
+                       }
+                       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);
+                       }
+                       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);
+                       }
+                       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);
+                       }
+                       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);
+                       }
+                       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);
+                       }
+                       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);
+                       }
+                       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);
+                       }
+                       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);
+                       }
+                       else if(killnotify_deathtype[j] == INFO_GOTFLAG)
+                       {
+                               if(killnotify_victims[j] == "^1RED^7 flag")
+                                       s = "red";
+                               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);
+                       }
+                       else if(killnotify_deathtype[j] == INFO_RETURNFLAG)
+                       {
+                               if(killnotify_victims[j] == "^1RED^7 flag")
+                                       s = "red";
+                               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);
+                       }
+                       else if(killnotify_deathtype[j] == INFO_LOSTFLAG)
+                       {
+                               if(killnotify_victims[j] == "^1RED^7 flag")
+                                       s = "red";
+                               else
+                                       s = "blue";
+                               drawpic_skin(weap_pos, strcat("flag_", s, "_lost"), '1 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                       }
+               }
+               // X [did action to] Y
+               else
+               {
+                       if(hud_configure)
+                       {
+                               attacker = textShortenToWidth("Player1", 0.5 * mySize_x - height, fontsize, stringwidth_colors);
+                               victim = textShortenToWidth("Player2", 0.5 * 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);
+                       }
+                       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;
+                       weap_pos = pos + eX * 0.5 * mySize_x - eX * height + eY * i * height;
+
+                       if(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);
+                       }
+                       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);
+                       }
+                       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);
+                       }
+                       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);
+                       }
+                       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);
+                       }
+                       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);
+                       }
+                       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);
+                       }
+                       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);
+                       }
+                       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);
+                       }
+                       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);
+                       }
+                       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");
+
+                               drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+                               o += eY * fontsize_y;
+                       }
+               }
+       }
+       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)
+//
+string seconds_tostring(float sec)
+{
+       float minutes;
+       minutes = floor(sec / 60);
+
+       sec -= minutes * 60;
+
+       string s;
+       s = ftos(100 + sec);
+
+       return strcat(ftos(minutes), ":", substring(s, 1, 3));
+}
+
+void HUD_Timer(void)
+{
+       float id = HUD_PANEL_TIMER;
+       vector pos, mySize;
+       pos = HUD_Panel_GetPos(id);
+       mySize = HUD_Panel_GetSize(id);
+
+       HUD_Panel_DrawBg(id, pos, mySize, 0);
+       float padding;
+       padding = HUD_Panel_GetPadding(id);
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
+
+       string timer;
+       float timelimit, elapsedTime, timeleft, minutesLeft;
+
+       timelimit = getstatf(STAT_TIMELIMIT);
+
+       timeleft = max(0, timelimit * 60 + getstatf(STAT_GAMESTARTTIME) - time);
+       timeleft = ceil(timeleft);
+
+       minutesLeft = floor(timeleft / 60);
+
+       vector timer_color;
+       if(minutesLeft >= 5 || warmup_stage || timelimit == 0) //don't use red or yellow in warmup or when there is no timelimit
+               timer_color = '1 1 1'; //white
+       else if(minutesLeft >= 1)
+               timer_color = '1 1 0'; //yellow
+       else
+               timer_color = '1 0 0'; //red
+
+       if (cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) {
+               if (time < getstatf(STAT_GAMESTARTTIME)) {
+                       //while restart is still active, show 00:00
+                       timer = seconds_tostring(0);
+               } else {
+                       elapsedTime = floor(time - getstatf(STAT_GAMESTARTTIME)); //127
+                       timer = seconds_tostring(elapsedTime);
+               }
+       } else {
+               timer = seconds_tostring(timeleft);
+       }
+
+       drawstring_aspect(pos, timer, mySize, mySize_y, timer_color, HUD_Panel_GetFgAlpha(HUD_PANEL_TIMER), DRAWFLAG_NORMAL);
+}
+
+// Radar (#6)
+//
+void HUD_Radar(void)
+{
+       float id = HUD_PANEL_RADAR;
+       vector pos, mySize;
+       pos = HUD_Panel_GetPos(id);
+       mySize = HUD_Panel_GetSize(id);
+
+       HUD_Panel_DrawBg(id, pos, mySize, 0);
+       float padding;
+       padding = HUD_Panel_GetPadding(id);
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
+
+       local float color1, color2; // color already declared as a global in hud.qc
+       local vector rgb;
+       local entity tm;
+       float scale2d, normalsize, bigsize;
+       float f;
+
+       teamradar_origin2d = pos + 0.5 * mySize;
+       teamradar_size2d = mySize;
+
+       if(minimapname == "")
+               return;
+
+       teamradar_loadcvars();
+
+       switch(hud_radar_zoommode)
+       {
+               default:
+               case 0:
+                       f = current_zoomfraction;
+                       break;
+               case 1:
+                       f = 1 - current_zoomfraction;
+                       break;
+               case 2:
+                       f = 0;
+                       break;
+               case 3:
+                       f = 1;
+                       break;
+       }
+
+       switch(hud_radar_rotation)
+       {
+               case 0:
+                       teamradar_angle = view_angles_y - 90;
+                       break;
+               default:
+                       teamradar_angle = 90 * hud_radar_rotation;
+                       break;
+       }
+
+       scale2d = vlen_maxnorm2d(mi_picmax - mi_picmin);
+       teamradar_size2d = mySize;
+
+       teamradar_extraclip_mins = teamradar_extraclip_maxs = '0 0 0'; // we always center
+
+       // pixels per world qu to match the teamradar_size2d_x range in the longest dimension
+       if(hud_radar_rotation == 0)
+       {
+               // max-min distance must fit the radar in any rotation
+               bigsize = vlen_minnorm2d(teamradar_size2d) * scale2d / (1.05 * vlen2d(mi_max - mi_min));
+       }
+       else
+       {
+               vector c0, c1, c2, c3, span;
+               c0 = rotate(mi_min, teamradar_angle * DEG2RAD);
+               c1 = rotate(mi_max, teamradar_angle * DEG2RAD);
+               c2 = rotate('1 0 0' * mi_min_x + '0 1 0' * mi_max_y, teamradar_angle * DEG2RAD);
+               c3 = rotate('1 0 0' * mi_max_x + '0 1 0' * mi_min_y, teamradar_angle * DEG2RAD);
+               span = '0 0 0';
+               span_x = max4(c0_x, c1_x, c2_x, c3_x) - min4(c0_x, c1_x, c2_x, c3_x);
+               span_y = max4(c0_y, c1_y, c2_y, c3_y) - min4(c0_y, c1_y, c2_y, c3_y);
+
+               // max-min distance must fit the radar in x=x, y=y
+               bigsize = min(
+                       teamradar_size2d_x * scale2d / (1.05 * span_x),
+                       teamradar_size2d_y * scale2d / (1.05 * span_y)
+               );
+       }
+
+       normalsize = vlen_maxnorm2d(teamradar_size2d) * scale2d / hud_radar_scale;
+       if(bigsize > normalsize)
+               normalsize = bigsize;
+
+       teamradar_size =
+                 f * bigsize
+               + (1 - f) * normalsize;
+       teamradar_origin3d_in_texcoord = teamradar_3dcoord_to_texcoord(
+                 f * (mi_min + mi_max) * 0.5
+               + (1 - f) * view_origin);
+
+       color1 = GetPlayerColor(player_localentnum-1);
+       rgb = GetTeamRGB(color1);
+
+       drawsetcliparea(
+               pos_x,
+               pos_y,
+               mySize_x,
+               mySize_y
+       );
+
+       draw_teamradar_background(hud_radar_background_alpha, hud_radar_foreground_alpha);
+
+       for(tm = world; (tm = find(tm, classname, "radarlink")); )
+               draw_teamradar_link(tm.origin, tm.velocity, tm.team);
+       for(tm = world; (tm = findflags(tm, teamradar_icon, 0xFFFFFF)); )
+               draw_teamradar_icon(tm.origin, tm.teamradar_icon, tm, tm.teamradar_color, HUD_Panel_GetFgAlpha(id));
+       for(tm = world; (tm = find(tm, classname, "entcs_receiver")); )
+       {
+               color2 = GetPlayerColor(tm.sv_entnum);
+               //if(color == COLOR_SPECTATOR || color == color2)
+                       draw_teamradar_player(tm.origin, tm.angles, GetTeamRGB(color2));
+       }
+       draw_teamradar_player(view_origin, view_angles, '1 1 1');
+
+       drawresetcliparea();
+};
+
+// Score (#7)
+//
+void HUD_Score(void)
+{
+       float id = HUD_PANEL_SCORE;
+       vector pos, mySize;
+       pos = HUD_Panel_GetPos(id);
+       mySize = HUD_Panel_GetSize(id);
+
+       HUD_Panel_DrawBg(id, pos, mySize, 0);
+       float padding;
+       padding = HUD_Panel_GetPadding(id);
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
+
+       float score, distribution, leader;
+       float score_len, distr_len;
+       vector distribution_color;
+       entity tm, pl, me;
+       me = (spectatee_status > 0) ? playerslots[spectatee_status - 1] : playerslots[player_localentnum - 1];
+
+       // TODO... this (race part) still uses constant coordinates :/
+       if((scores_flags[ps_primary] & SFL_TIME) && !teamplay) { // race/cts record display on HUD
+               /*pl = players.sort_next;
+               if(pl == me)
+                       pl = pl.sort_next;
+               if(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)
+                       if(pl.scores[ps_primary] == 0)
+                               pl = world;
+
+               score = me.(scores[ps_primary]);
+
+               float racemin, racesec, racemsec;
+               float distsec, distmsec, minusplus;
+
+               racemin = floor(score/(60 * TIME_FACTOR));
+               racesec = floor((score - racemin*(60 * TIME_FACTOR))/TIME_FACTOR);
+               racemsec = score - racemin*60*TIME_FACTOR - racesec*TIME_FACTOR;
+
+               if (pl && ((!(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)) || score)) {
+                       // distribution display
+                       distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]);
+
+                       if (distribution < TIME_FACTOR && distribution > -TIME_FACTOR)
+                               distmsec = fabs(distribution);
+                       else {
+                               distsec = floor(fabs(distribution)/TIME_FACTOR);
+                               distmsec = fabs(distribution) - distsec*TIME_FACTOR;
+                               if (distribution < 0)
+                                       distsec = -distsec;
+                       }
+
+                       if (distribution <= 0) {
+                               distribution_color = eY;
+                               minusplus = 1; // minusplus 1: always prefix with minus sign
+                       }
+                       else {
+                               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);
+               }
+               // race record display
+               if (distribution <= 0 || distribution == score) // draw the highlight background behind the timer if we have the lead
+                       drawpic_skin(bottomright - '0 32 0' - '32 0 0' * (4 + TIME_DECIMALS), "num_leading_4", '0 28 0' + '32 0 0' * (4 + TIME_DECIMALS), '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+
+               HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0', racemsec, -TIME_DECIMALS, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+               HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0'  - '66 0 0', racesec, -2, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+               drawpic_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '18 0 0', "num_dot", '30 30 0', '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE);
+
+               HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '132 0 0', racemin, -2, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+               drawpic_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '84 0 0', "num_colon", '30 30 0', '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE);
+               */
+       } else if (!teamplay) { // non-teamgames
+               // me vector := [team/connected frags id]
+               pl = players.sort_next;
+               if(pl == me)
+                       pl = pl.sort_next;
+
+               if(hud_configure)
+                       distribution = 42;
+               else if(pl)
+                       distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]);
+               else
+                       distribution = 0;
+
+               score = me.(scores[ps_primary]);
+               if(hud_configure)
+                       score = 123;
+
+               if(distribution >= 5) {
+                       distribution_color = eY;
+                       leader = 1;
+               } else if(distribution >= 0) {
+                       distribution_color = '1 1 1';
+                       leader = 1;
+               } else if(distribution >= -5)
+                       distribution_color = '1 1 0';
+               else
+                       distribution_color = eX;
+
+               score_len = strlen(ftos(score));
+               distr_len = strlen(ftos(distribution));
+
+               HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * 0.33 * mySize_y, distribution, 3, 3, 0.33 * mySize_y, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+               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);
+       } 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
+                               continue;
+                       score = tm.(teamscores[ts_primary]);
+                       if(hud_configure)
+                               score = 123;
+                       leader = 0;
+                       
+                       score_len = strlen(ftos(score));
+
+                       if (score > max_fragcount)
+                               max_fragcount = score;
+
+                       if(tm.team == myteam) {
+                               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);
+                       } 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);
+                               teamnum += 1;
+                       }
+               }
+       }
+}
+
+// Race timer (#8)
+//
+void HUD_RaceTimer (void) {
+       float id = HUD_PANEL_RACETIMER;
+       vector pos, mySize;
+       pos = HUD_Panel_GetPos(id);
+       mySize = HUD_Panel_GetSize(id);
+
+       HUD_Panel_DrawBg(id, pos, mySize, 0);
+       float padding;
+       padding = HUD_Panel_GetPadding(id);
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
+
+       drawfont = hud_bigfont;
+       float a, t;
+       string s, forcetime;
+
+       if(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);
+               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);
+               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);
+       }
+       else if(race_checkpointtime)
+       {
+               a = bound(0, 2 - (time - race_checkpointtime), 1);
+               s = "";
+               forcetime = "";
+               if(a > 0) // just hit a checkpoint?
+               {
+                       if(race_checkpoint != 254)
+                       {
+                               if(race_time && race_previousbesttime)
+                                       s = MakeRaceString(race_checkpoint, TIME_DECODE(race_time) - TIME_DECODE(race_previousbesttime), 0, 0, race_previousbestname);
+                               else
+                                       s = MakeRaceString(race_checkpoint, 0, -1, 0, race_previousbestname);
+                               if(race_time)
+                                       forcetime = TIME_ENCODED_TOSTRING(race_time);
+                       }
+               }
+               else
+               {
+                       if(race_laptime && race_nextbesttime && race_nextcheckpoint != 254)
+                       {
+                               a = bound(0, 2 - ((race_laptime + TIME_DECODE(race_nextbesttime)) - (time + TIME_DECODE(race_penaltyaccumulator))), 1);
+                               if(a > 0) // next one?
+                               {
+                                       s = MakeRaceString(race_nextcheckpoint, (time + TIME_DECODE(race_penaltyaccumulator)) - race_laptime, TIME_DECODE(race_nextbesttime), 0, race_nextbestname);
+                               }
+                       }
+               }
+
+               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);
+               }
+
+               if(race_penaltytime)
+               {
+                       a = bound(0, 2 - (time - race_penaltyeventtime), 1);
+                       if(a > 0)
+                       {
+                               s = strcat("^1PENALTY: ", ftos_decimals(race_penaltytime * 0.1, 1), " (", race_penaltyreason, ")");
+                               dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
+                               //drawcolorcodedstring(m - '0 32 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.8 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                       }
+               }
+
+               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);
+               }
+               else
+                       a = 1;
+
+               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);
+               }
+       }
+       else
+       {
+               if(race_mycheckpointtime)
+               {
+                       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);
+               }
+               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);
+               }
+
+               if(race_penaltytime && !race_penaltyaccumulator)
+               {
+                       t = race_penaltytime * 0.1 + race_penaltyeventtime;
+                       a = bound(0, (1 + t - time), 1);
+                       if(a > 0)
+                       {
+                               if(time < t)
+                                       s = strcat("^1PENALTY: ", ftos_decimals(t - time, 1), " (", race_penaltyreason, ")");
+                               else
+                                       s = strcat("^2PENALTY: 0.0 (", race_penaltyreason, ")");
+                               dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
+                               //drawcolorcodedstring(m - '0 32 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                               drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize_y) + eY * 0.6 * mySize_y, s, '1 1 0' * 0.2 * mySize_y, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+                       }
+               }
+       }
+
+       drawfont = hud_font;
+}
+
+// Vote window (#9)
+//
+float vote_yescount;
+float vote_nocount;
+float vote_needed;
+float vote_highlighted; // currently selected vote
+
+float vote_active; // is there an active vote?
+float vote_prev; // previous state of vote_active to check for a change
+float vote_alpha;
+float vote_change; // "time" when vote_active changed
+
+void HUD_VoteWindow(void) 
+{
+       float id = HUD_PANEL_VOTE;
+       vector pos, mySize;
+       pos = HUD_Panel_GetPos(id);
+       mySize = HUD_Panel_GetSize(id);
+
+       string s;
+       float a;
+       if(vote_active != vote_prev) {
+               vote_change = time;
+               vote_prev = vote_active;
+       }
+
+       if(vote_active || 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)
+       {
+               vote_yescount = 3;
+               vote_nocount = 2;
+               vote_needed = 4;
+       }
+
+       if(!vote_alpha)
+               return;
+
+       a = vote_alpha * bound(cvar_or("hud_vote_alreadyvoted_alpha", 0.75), 1 - vote_highlighted, 1);
+
+       HUD_Panel_DrawBg(id, pos, mySize, a);
+       float padding;
+       padding = HUD_Panel_GetPadding(id);
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
+
+       drawpic_skin(pos, "voteprogress_back", mySize, '1 1 1', a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+
+       s = "A vote has been called for: ";
+       drawstring(pos + '0.5 0 0' * mySize_x + '0 0.1 0' * mySize_y - eX * stringwidth(s, FALSE, '1 1 0' * 0.5 * mySize_y*(1/5)), s, '1 1 0' * mySize_y*(1/5), '1 1 1', a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+       s = textShortenToWidth(vote_called_vote, mySize_x * 0.96, '1 1 0' * mySize_y*(1/5), stringwidth_colors); // TODO: broken?
+       if(hud_configure)
+               s = "Configure the HUD";
+       drawcolorcodedstring(pos + '0.52 0 0' * mySize_x + '0 0.3 0' * mySize_y - eX * stringwidth(s, FALSE, '1 1 0' * 0.5 * mySize_y*(1/6)), s, '1 1 0' * mySize_y*(1/6), a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+
+       // 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);
+
+       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 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);
+       }
+       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);
+       }
+
+       drawresetcliparea();
+
+       if(!vote_active) {
+               vote_highlighted = 0;
+       }
+}
+
+// Mod icons panel (#10)
+//
+
+float mod_active; // is there any active mod icon?
+
+// CTF HUD modicon section
+float redflag_prevframe, blueflag_prevframe; // status during previous frame
+float redflag_prevstatus, blueflag_prevstatus; // last remembered status
+float redflag_statuschange_time, blueflag_statuschange_time; // time when the status changed
+
+void HUD_Mod_CTF_Reset(void)
+{
+       redflag_prevstatus = blueflag_prevstatus = redflag_prevframe = blueflag_prevframe = redflag_statuschange_time = blueflag_statuschange_time = 0;
+}
+
+void HUD_Mod_CTF(vector pos, vector mySize)
+{
+       vector redflag_pos, blueflag_pos;
+       vector flag_size;
+       float f; // every function should have that
+
+       float redflag, blueflag; // current status
+       float redflag_statuschange_elapsedtime, blueflag_statuschange_elapsedtime; // time since the status changed
+       float stat_items;
+
+       stat_items = getstati(STAT_ITEMS);
+       redflag = (stat_items/IT_RED_FLAG_TAKEN) & 3;
+       blueflag = (stat_items/IT_BLUE_FLAG_TAKEN) & 3;
+       
+       if(redflag || blueflag)
+               mod_active = 1;
+       else
+               mod_active = 0;
+
+       if(hud_configure)
+       {
+               redflag = 1;
+               blueflag = 2;
+       }
+
+       // when status CHANGES, set old status into prevstatus and current status into status
+       if (redflag != redflag_prevframe)
+       {
+               redflag_statuschange_time = time;
+               redflag_prevstatus = redflag_prevframe;
+               redflag_prevframe = redflag;
+       }
+
+       if (blueflag != blueflag_prevframe)
+       {
+               blueflag_statuschange_time = time;
+               blueflag_prevstatus = blueflag_prevframe;
+               blueflag_prevframe = blueflag;
+       }
+
+       redflag_statuschange_elapsedtime = time - redflag_statuschange_time;
+       blueflag_statuschange_elapsedtime = time - blueflag_statuschange_time;
+
+       float BLINK_FACTOR = 0.15;
+       float BLINK_BASE = 0.85;
+       // note:
+       //   RMS = sqrt(BLINK_BASE^2 + 0.5 * BLINK_FACTOR^2)
+       // thus
+       //   BLINK_BASE = sqrt(RMS^2 - 0.5 * BLINK_FACTOR^2)
+       // ensure RMS == 1
+       float BLINK_FREQ = 5; // circle frequency, = 2*pi*frequency in hertz
+
+       string red_icon, red_icon_prevstatus;
+       float red_alpha, red_alpha_prevstatus;
+       red_alpha = red_alpha_prevstatus = 1;
+       switch(redflag) {
+               case 1: red_icon = "flag_red_taken"; break;
+               case 2: red_icon = "flag_red_lost"; break;
+               case 3: red_icon = "flag_red_carrying"; red_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;
+               default:
+                       if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM2))
+                               red_icon = "flag_red_shielded";
+                       else
+                               red_icon = string_null;
+                       break;
+       }
+       switch(redflag_prevstatus) {
+               case 1: red_icon_prevstatus = "flag_red_taken"; break;
+               case 2: red_icon_prevstatus = "flag_red_lost"; break;
+               case 3: red_icon_prevstatus = "flag_red_carrying"; red_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;
+               default:
+                       if(redflag == 3)
+                               red_icon_prevstatus = "flag_red_carrying"; // make it more visible
+                       else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM2))
+                               red_icon_prevstatus = "flag_red_shielded";
+                       else
+                               red_icon_prevstatus = string_null;
+                       break;
+       }
+
+       string blue_icon, blue_icon_prevstatus;
+       float blue_alpha, blue_alpha_prevstatus;
+       blue_alpha = blue_alpha_prevstatus = 1;
+       switch(blueflag) {
+               case 1: blue_icon = "flag_blue_taken"; break;
+               case 2: blue_icon = "flag_blue_lost"; break;
+               case 3: blue_icon = "flag_blue_carrying"; blue_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;
+               default:
+                       if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1))
+                               blue_icon = "flag_blue_shielded";
+                       else
+                               blue_icon = string_null;
+                       break;
+       }
+       switch(blueflag_prevstatus) {
+               case 1: blue_icon_prevstatus = "flag_blue_taken"; break;
+               case 2: blue_icon_prevstatus = "flag_blue_lost"; break;
+               case 3: blue_icon_prevstatus = "flag_blue_carrying"; blue_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;
+               default:
+                       if(blueflag == 3)
+                               blue_icon_prevstatus = "flag_blue_carrying"; // make it more visible
+                       else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1))
+                               blue_icon_prevstatus = "flag_blue_shielded";
+                       else
+                               blue_icon_prevstatus = string_null;
+                       break;
+       }
+
+       if(mySize_x > mySize_y) {
+               if (myteam == COLOR_TEAM1) { // always draw own flag on left
+                       redflag_pos = pos;
+                       blueflag_pos = pos + eX * 0.5 * mySize_x;
+               } else {
+                       blueflag_pos = pos;
+                       redflag_pos = pos + eX * 0.5 * mySize_x;
+               }
+               flag_size = eX * 0.5 * mySize_x + eY * mySize_y;
+       } else {
+               if (myteam == COLOR_TEAM1) { // always draw own flag on left
+                       redflag_pos = pos;
+                       blueflag_pos = pos + eY * 0.5 * mySize_y;
+               } else {
+                       blueflag_pos = pos;
+                       redflag_pos = pos + eY * 0.5 * mySize_y;
+               }
+               flag_size = eY * 0.5 * mySize_y + eX * mySize_x;
+       }
+
+       f = bound(0, redflag_statuschange_elapsedtime*2, 1);
+       if(red_icon_prevstatus && f < 1)
+               drawpic_skin_expanding(redflag_pos, red_icon_prevstatus, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha_prevstatus, DRAWFLAG_NORMAL, f);
+       if(red_icon)
+               drawpic_skin(redflag_pos, red_icon, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha * f, DRAWFLAG_NORMAL);
+
+       f = bound(0, blueflag_statuschange_elapsedtime*2, 1);
+       if(blue_icon_prevstatus && f < 1)
+               drawpic_skin_expanding(blueflag_pos, blue_icon_prevstatus, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha_prevstatus, DRAWFLAG_NORMAL, f);
+       if(blue_icon)
+               drawpic_skin(blueflag_pos, blue_icon, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha * f, DRAWFLAG_NORMAL);
+}
+
+// Keyhunt HUD modicon section
+float kh_runheretime;
+
+void HUD_Mod_KH_Reset(void)
+{
+       kh_runheretime = 0;
+}
+
+void HUD_Mod_KH(vector pos, vector mySize)
+{
+       mod_active = 1; // keyhunt should never hide the mod icons panel
+       float kh_keys;
+       float keyteam;
+       float a, aa;
+       vector p, pa, kh_size, kh_asize;
+
+       kh_keys = getstati(STAT_KH_KEYS);
+
+       p_x = pos_x;
+       if(mySize_x > mySize_y)
+       {
+               p_y = pos_y + 0.25 * mySize_y;
+               pa = p - eY * 0.25 * mySize_y;
+
+               kh_size_x = mySize_x * 0.25;
+               kh_size_y = 0.75 * mySize_y;
+               kh_asize_x = mySize_x * 0.25;
+               kh_asize_y = mySize_y * 0.25;
+       }
+       else
+       {
+               p_y = pos_y + 0.125 * mySize_y;
+               pa = p - eY * 0.125 * mySize_y;
+
+               kh_size_x = mySize_x * 0.5;
+               kh_size_y = 0.375 * mySize_y;
+               kh_asize_x = mySize_x * 0.5;
+               kh_asize_y = mySize_y * 0.125;
+       }
+
+       float i, key;
+
+       float keycount;
+       keycount = 0;
+       for(i = 0; i < 4; ++i)
+       {
+               key = floor(kh_keys / pow(32, i)) & 31;
+               keyteam = key - 1;
+               if(keyteam == 30 && keycount <= 4)
+                       keycount += 4;
+               if(keyteam == myteam || keyteam == -1 || keyteam == 30)
+                       keycount += 1;
+       }
+
+       // this yields 8 exactly if "RUN HERE" shows
+
+       if(keycount == 8)
+       {
+               if(!kh_runheretime)
+                       kh_runheretime = time;
+               pa_y -= fabs(sin((time - kh_runheretime) * 3.5)) * 6; // make the arrows jump in case of RUN HERE
+       }
+       else
+               kh_runheretime = 0;
+
+       for(i = 0; i < 4; ++i)
+       {
+               key = floor(kh_keys / pow(32, i)) & 31;
+               keyteam = key - 1;
+               switch(keyteam)
+               {
+                       case 30: // my key
+                               keyteam = myteam;
+                               a = 1;
+                               aa = 1;
+                               break;
+                       case -1: // no key
+                               a = 0;
+                               aa = 0;
+                               break;
+                       default: // owned or dropped
+                               a = 0.2;
+                               aa = 0.5;
+                               break;
+               }
+               a = a * HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS);
+               aa = aa * HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS);
+               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
+                                       break;
+                               case COLOR_TEAM2:
+                                       drawpic_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
+                                       break;
+                               case COLOR_TEAM4:
+                                       drawpic_skin(pa, "kh_pinkarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
+                                       break;
+                               default:
+                                       break;
+                       }
+                       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
+                                       break;
+                               case 1:
+                                       drawpic_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
+                                       break;
+                               case 3:
+                                       drawpic_skin(p, "kh_pink", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
+                                       break;
+                       }
+               }
+               if(mySize_x > mySize_y)
+               {
+                       p_x += 0.25 * mySize_x;
+                       pa_x += 0.25 * mySize_x;
+               }
+               else
+               {
+                       if(i == 1)
+                       {
+                               p_y = pos_y + 0.625 * mySize_y;
+                               pa_y = pos_y + 0.5 * mySize_y;
+                               p_x = pos_x;
+                               pa_x = pos_x;
+                       }
+                       else
+                       {
+                               p_x += 0.5 * mySize_x;
+                               pa_x += 0.5 * mySize_x;
+                       }
+               }
+       }
+}
+
+// Nexball HUD mod icon
+void HUD_Mod_NexBall(vector pos, vector mySize)
+{
+       float stat_items, nb_pb_starttime, dt, p;
+
+       stat_items = getstati(STAT_ITEMS);
+       nb_pb_starttime = getstatf(STAT_NB_METERSTART);
+
+       if (stat_items & IT_KEY1)
+               mod_active = 1;
+       else
+               mod_active = 0;
+
+       //Manage the progress bar if any
+       if (nb_pb_starttime > 0)
+       {
+               dt = mod(time - nb_pb_starttime, nb_pb_period);
+               // one period of positive triangle
+               p = 2 * dt / nb_pb_period;
+               if (p > 1)
+                       p = 2 - p;
+
+               //Draw the filling
+               vector barsize;
+               float vertical;
+               if(mySize_x > mySize_y)
+               {
+                       barsize = eX * p * mySize_x + eY * mySize_y;
+                       vertical = 0;
+               }
+               else
+               {
+                       barsize = eX * mySize_x + eY * p * mySize_y;
+                       vertical = 1;
+               }
+               HUD_Panel_DrawProgressBar(pos, vertical, barsize, HUD_Panel_GetProgressBarColor("nexball"), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL);
+       }
+
+       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);
+}
+
+// Race/CTS HUD mod icons
+float crecordtime_prev; // last remembered crecordtime
+float crecordtime_change_time; // time when crecordtime last changed
+float srecordtime_prev; // last remembered srecordtime
+float srecordtime_change_time; // time when srecordtime last changed
+
+float race_status_time;
+float race_status_prev;
+string race_status_name_prev;
+void HUD_Mod_Race(vector pos, vector mySize)
+{
+       mod_active = 1; // race should never hide the mod icons panel
+       entity me;
+       me = playerslots[player_localentnum - 1];
+       float t, score;
+       float f; // yet another function has this
+       score = me.(scores[ps_primary]);
+
+       if not((scores_flags[ps_primary] & SFL_TIME) && !teamplay) // race/cts record display on HUD
+               return; // no records in the actual race
+
+       drawfont = hud_bigfont;
+
+       // clientside personal record
+       string rr;
+       if(gametype == GAME_CTS)
+               rr = CTS_RECORD;
+       else
+               rr = RACE_RECORD;
+       t = stof(db_get(ClientProgsDB, strcat(shortmapname, rr, "time")));
+
+       if(score && (score < t || !t)) {
+               db_put(ClientProgsDB, strcat(shortmapname, rr, "time"), ftos(score));
+               if(cvar("cl_autodemo_delete_keeprecords"))
+               {
+                       f = cvar("cl_autodemo_delete");
+                       f &~= 1;
+                       cvar_set("cl_autodemo_delete", ftos(f)); // don't delete demo with new record!
+               }
+       }
+
+       if(t != crecordtime_prev) {
+               crecordtime_prev = t;
+               crecordtime_change_time = time;
+       }
+       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);
+       } 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);
+       }
+
+       // server record
+       t = race_server_record;
+       if(t != srecordtime_prev) {
+               srecordtime_prev = t;
+               srecordtime_change_time = time;
+       }
+       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);
+       } 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);
+       }
+
+       if (race_status != race_status_prev || race_status_name != race_status_name_prev) {
+               race_status_time = time + 5;
+               race_status_prev = race_status;
+               if (race_status_name_prev)
+                       strunzone(race_status_name_prev);
+               race_status_name_prev = strzone(race_status_name);
+       }
+
+       pos_x += mySize_x/2;
+       // race "awards"
+       float a;
+       a = bound(0, race_status_time - time, 1);
+
+       string s;
+       s = textShortenToWidth(race_status_name, mySize_y, '1 1 0' * 0.1 * mySize_y, stringwidth_colors);
+
+       float rank;
+       if(race_status > 0)
+               rank = race_CheckName(race_status_name);
+       string rankname;
+       rankname = race_PlaceName(rank);
+
+       vector namepos;
+       namepos = pos + '0.5 0.9 0' * mySize_y - eX * stringwidth(s, TRUE, '1 1 0' * 0.1 * mySize_y);
+       vector rankpos;
+       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);
+       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);
+       } 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);
+               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);
+       } 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);
+       }
+
+       if (race_status_time - time <= 0) {
+               race_status_prev = -1;
+               race_status = -1;
+               if(race_status_name)
+                       strunzone(race_status_name);
+               race_status_name = string_null;
+               if(race_status_name_prev)
+                       strunzone(race_status_name_prev);
+               race_status_name_prev = string_null;
+       }
+       drawfont = hud_font;
+}
+
+float mod_prev; // previous state of mod_active to check for a change
+float mod_alpha;
+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)
+               return;
+
+       float id = HUD_PANEL_MODICONS;
+       vector pos, mySize;
+       pos = HUD_Panel_GetPos(id);
+       mySize = HUD_Panel_GetSize(id);
+
+       if(mod_active != mod_prev) {
+               mod_change = time;
+               mod_prev = mod_active;
+       }
+
+       if(mod_active || 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);
+
+       float padding;
+       padding = HUD_Panel_GetPadding(id);
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * 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)
+               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);
+       else if(gametype == GAME_CTS || gametype == GAME_RACE)
+               HUD_Mod_Race(pos, mySize);
+}
+
+// Draw pressed keys (#11)
+//
+void HUD_DrawPressedKeys(void)
+{
+       float id = HUD_PANEL_PRESSEDKEYS;
+       vector pos, mySize;
+       pos = HUD_Panel_GetPos(id);
+       mySize = HUD_Panel_GetSize(id);
+
+       HUD_Panel_DrawBg(id, pos, mySize, 0);
+       float padding;
+       padding = HUD_Panel_GetPadding(id);
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
+
+       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);
+}
+
+// Handle chat as a panel (#12)
+//
+void HUD_Chat(void)
+{
+       float id = HUD_PANEL_CHAT;
+       vector pos, mySize;
+       pos = HUD_Panel_GetPos(id);
+       mySize = HUD_Panel_GetSize(id);
+
+       HUD_Panel_DrawBg(id, pos, mySize, 0);
+       float padding;
+       padding = HUD_Panel_GetPadding(id);
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
+
+       cvar_set("con_chatrect", "1");
+
+       cvar_set("con_chatrect_x", ftos(pos_x/vid_conwidth));
+       cvar_set("con_chatrect_y", ftos(pos_y/vid_conheight));
+
+       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)
+       {
+               float chatsize;
+               chatsize = cvar("con_chatsize");
+               cvar_set("con_chatrect_x", "9001"); // over 9000, we'll fake it instead for more control over alpha and such
+               float i, a;
+               for(i = 0; i < cvar("con_chat"); ++i)
+               {
+                       if(i == cvar("con_chat") - 1)
+                               a = HUD_Panel_GetFgAlpha(id);
+                       else
+                               a = HUD_Panel_GetFgAlpha(id) * 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);
+               }
+       }
+}
+
+// Engine info panel (#13)
+//
+float prevfps;
+float prevfps_time;
+float framecounter;
+
+float frametimeavg;
+float frametimeavg1; // 1 frame ago
+float frametimeavg2; // 2 frames ago
+void HUD_EngineInfo(void)
+{
+       float id = HUD_PANEL_ENGINEINFO;
+       vector pos, mySize;
+       pos = HUD_Panel_GetPos(id);
+       mySize = HUD_Panel_GetSize(id);
+
+       HUD_Panel_DrawBg(id, pos, mySize, 0);
+       float padding;
+       padding = HUD_Panel_GetPadding(id);
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
+
+       if(cvar("hud_engineinfo_framecounter_exponentialmovingaverage"))
+       {
+               frametimeavg = (frametimeavg + frametimeavg1 + frametimeavg2 + frametime)/4; // average three frametimes into framecounter for slightly more stable fps readings :P
+               frametimeavg2 = frametimeavg1;
+               frametimeavg1 = frametimeavg;
+               
+               float weight;
+               weight = cvar("hud_engineinfo_framecounter_exponentialmovingaverage_new_weight");
+               if(frametime > 0.0001) // filter out insane values which sometimes seem to occur and throw off the average? If you are getting 10,000 fps or more, then you don't need a framerate counter.
+               {
+                       if(fabs(prevfps - (1/frametimeavg)) > prevfps * cvar("hud_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold")) // if there was a big jump in fps, just force prevfps at current (1/frametime) to make big updates instant
+                               prevfps = (1/frametime);
+                       prevfps = (1 - weight) * prevfps + weight * (1/frametimeavg); // framecounter just used so there's no need for a new variable, think of it as "frametime average"
+               }
+       }
+       else
+       {
+               framecounter += 1;
+               if(time - prevfps_time > cvar("hud_engineinfo_framecounter_time"))
+               {
+                       prevfps = framecounter/cvar("hud_engineinfo_framecounter_time");
+                       framecounter = 0;
+                       prevfps_time = time;
+               }
+       }
+
+       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);
+}
+/*
+==================
+Main HUD system
+==================
+*/
+
+void HUD_ShowSpeed(void)
+{
+       vector numsize;
+       float pos, conversion_factor;
+       string speed, zspeed, unit;
+
+       switch(cvar("cl_showspeed_unit"))
+       {
+               default:
+               case 0:
+                       unit = "";
+                       conversion_factor = 1.0;
+                       break;
+               case 1:
+                       unit = " qu/s";
+                       conversion_factor = 1.0;
+                       break;
+               case 2:
+                       unit = " m/s";
+                       conversion_factor = 0.0254;
+                       break;
+               case 3:
+                       unit = " km/h";
+                       conversion_factor = 0.0254 * 3.6;
+                       break;
+               case 4:
+                       unit = " mph";
+                       conversion_factor = 0.0254 * 3.6 * 0.6213711922;
+                       break;
+               case 5:
+                       unit = " knots";
+                       conversion_factor = 0.0254 * 1.943844492; // 1 m/s = 1.943844492 knots, because 1 knot = 1.852 km/h
+                       break;
+       }
+
+       speed = strcat(ftos(floor( vlen(pmove_vel - pmove_vel_z * '0 0 1') * conversion_factor + 0.5 )), unit);
+
+       numsize_x = numsize_y = cvar("cl_showspeed_size");
+       pos = (vid_conheight - numsize_y) * cvar("cl_showspeed_position");
+
+       drawfont = hud_bigfont;
+       drawstringcenter(eX + pos * eY, speed, numsize, '1 1 1', hud_fg_alpha, DRAWFLAG_NORMAL);
+
+       if (cvar("cl_showspeed_z") == 1) {
+               zspeed = strcat(ftos(fabs(floor( pmove_vel_z * conversion_factor + 0.5 ))), unit);
+               drawstringcenter(eX + pos * eY + numsize_y * eY, zspeed, numsize * 0.5, '1 1 1', hud_fg_alpha, DRAWFLAG_NORMAL);
+       }
+
+       drawfont = hud_font;
+}
+
+vector acc_prevspeed;
+float acc_prevtime;
+float acc_avg;
+
+void HUD_ShowAcceleration(void)
+{
+       float acceleration, sz, scale, alpha, f;
+       vector pos, top, rgb;
+       top_x = vid_conwidth/2;
+       top_y = 0;
+
+       f = time - acc_prevtime;
+       if(cvar("cl_showacceleration_z"))
+               acceleration = (vlen(pmove_vel) - vlen(acc_prevspeed)) * (1 / f);
+       else
+               acceleration = (vlen(pmove_vel - '0 0 1' * pmove_vel_z) - vlen(acc_prevspeed - '0 0 1' * acc_prevspeed_z)) * (1 / f);
+       acc_prevspeed = pmove_vel;
+       acc_prevtime = time;
+
+       f = bound(0, f * 10, 1);
+       acc_avg = acc_avg * (1 - f) + acceleration * f;
+       acceleration = acc_avg / getstatf(STAT_MOVEVARS_MAXSPEED);
+
+       pos = top - sz/2 * eY + (cvar("cl_showacceleration_position") * vid_conheight) * eY;
+
+       sz = cvar("cl_showacceleration_size");
+       scale = cvar("cl_showacceleration_scale");
+       alpha = cvar("cl_showacceleration_alpha");
+       if (cvar("cl_showacceleration_color_custom"))
+               rgb = stov(cvar_string("cl_showacceleration_color"));
+       else {
+               rgb = '1 1 1';
+               if (acceleration < 0) {
+                       rgb = '1 .5 .5' - '0 .5 .5' * bound(0, -acceleration * 0.2, 1);
+               } else if (acceleration > 0) {
+                       rgb = '.5 1 .5' - '.5 0 .5' * bound(0, +acceleration * 0.2, 1);
+               }
+       }
+
+       if (acceleration > 0)
+               HUD_Panel_DrawProgressBar(pos, 0, acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_fg_alpha, DRAWFLAG_NORMAL);
+       else if (acceleration < 0)
+               HUD_Panel_DrawProgressBar(pos + acceleration * scale * '40 0 0', 0, -acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_fg_alpha, DRAWFLAG_NORMAL);
+}
+
+void HUD_Reset (void)
+{
+       // reset gametype specific icons
+       if(gametype == GAME_KEYHUNT)
+               HUD_Mod_KH_Reset();
+       else if(gametype == GAME_CTF)
+               HUD_Mod_CTF_Reset();
+}
+
+void HUD_Main (void)
+{
+       if(disable_menu_alphacheck == 1)
+               menu_fade_alpha = 1;
+       else
+               menu_fade_alpha = (1 - cvar("_menu_alpha"));
+       hud_fg_alpha = cvar("hud_fg_alpha");
+
+       hud_border_thickness = bound(0, cvar("hud_border_thickness"), 5);
+       hud_accuracy_border_thickness = bound(0, cvar_or("hud_accuracy_border_thickness", 1), 5);
+       hud_color_bg_team = cvar("hud_color_bg_team");
+
+       hud_fontsize = HUD_GetFontsize("hud_fontsize");
+       hud_fontsize_spec = HUD_GetFontsize("hud_fontsize_spec");
+
+       hud_configure = cvar("_hud_configure");
+
+       // Drawing stuff
+
+       // HUD configure visible grid
+       if(hud_configure && cvar("hud_configure_grid") && cvar("hud_configure_grid_alpha"))
+       {
+               float i;
+               // x-axis
+               for(i = 0; i < 1/bound(0.005, cvar("hud_configure_grid_x"), 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);
+               }
+               // y-axis
+               for(i = 0; i < 1/bound(0.005, cvar("hud_configure_grid_y"), 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);
+               }
+       }
+
+       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();
+       else
+               cvar_set("con_chatrect", "0");
+       if(HUD_Panel_CheckActive(HUD_PANEL_ENGINEINFO) || hud_configure)
+               HUD_EngineInfo();
+
+       // TODO hud_'ify these
+       if (cvar("cl_showspeed"))
+               HUD_ShowSpeed();
+       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)
+               localcmd("cmd selectteam auto; cmd join\n");
+
+       if (!hud_configure) // hud config mode disabled, enable normal alpha stuff again
+               disable_menu_alphacheck = 0;
+}
diff --git a/qcsrc/client/hud.qc.orig b/qcsrc/client/hud.qc.orig
deleted file mode 100644 (file)
index 4a118d4..0000000
+++ /dev/null
@@ -1,2769 +0,0 @@
-/*
-==================
-Misc HUD functions
-==================
-*/
-
-// a border picture is a texture containing nine parts:
-//   1/4 width: left part
-//   1/2 width: middle part (stretched)
-//   1/4 width: right part
-// divided into
-//   1/4 height: top part
-//   1/2 height: middle part (stretched)
-//   1/4 height: bottom part
-void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector theColor, float theAlpha, vector theBorderSize)
-{
-       vector dX, dY;
-       vector width, height;
-       vector bW, bH;
-       //pic = draw_UseSkinFor(pic);
-       width = eX * theSize_x;
-       height = eY * theSize_y;
-       if(theSize_x <= theBorderSize_x * 2)
-       {
-               // not wide enough... draw just left and right then
-               bW = eX * (0.25 * theSize_x / (theBorderSize_x * 2));
-               if(theSize_y <= theBorderSize_y * 2)
-               {
-                       // not high enough... draw just corners
-                       bH = eY * (0.25 * theSize_y / (theBorderSize_y * 2));
-                       drawsubpic(theOrigin,                 width * 0.5 + height * 0.5, pic, '0 0 0',           bW + bH, theColor, theAlpha, 0);
-                       drawsubpic(theOrigin + width   * 0.5, width * 0.5 + height * 0.5, pic, eX - bW,           bW + bH, theColor, theAlpha, 0);
-                       drawsubpic(theOrigin + height  * 0.5, width * 0.5 + height * 0.5, pic, eY - bH,           bW + bH, theColor, theAlpha, 0);
-                       drawsubpic(theOrigin + theSize * 0.5, width * 0.5 + height * 0.5, pic, eX + eY - bW - bH, bW + bH, theColor, theAlpha, 0);
-               }
-               else
-               {
-                       dY = theBorderSize_x * eY;
-                       drawsubpic(theOrigin,                             width * 0.5          +     dY, pic, '0 0    0',           '0 0.25 0' + bW, theColor, theAlpha, 0);
-                       drawsubpic(theOrigin + width * 0.5,               width * 0.5          +     dY, pic, '0 0    0' + eX - bW, '0 0.25 0' + bW, theColor, theAlpha, 0);
-                       drawsubpic(theOrigin                        + dY, width * 0.5 + height - 2 * dY, pic, '0 0.25 0',           '0 0.5  0' + bW, theColor, theAlpha, 0);
-                       drawsubpic(theOrigin + width * 0.5          + dY, width * 0.5 + height - 2 * dY, pic, '0 0.25 0' + eX - bW, '0 0.5  0' + bW, theColor, theAlpha, 0);
-                       drawsubpic(theOrigin               + height - dY, width * 0.5          +     dY, pic, '0 0.75 0',           '0 0.25 0' + bW, theColor, theAlpha, 0);
-                       drawsubpic(theOrigin + width * 0.5 + height - dY, width * 0.5          +     dY, pic, '0 0.75 0' + eX - bW, '0 0.25 0' + bW, theColor, theAlpha, 0);
-               }
-       }
-       else
-       {
-               if(theSize_y <= theBorderSize_y * 2)
-               {
-                       // not high enough... draw just top and bottom then
-                       bH = eY * (0.25 * theSize_y / (theBorderSize_y * 2));
-                       dX = theBorderSize_x * eX;
-                       drawsubpic(theOrigin,                                         dX + height * 0.5, pic, '0    0 0',           '0.25 0 0' + bH, theColor, theAlpha, 0);
-                       drawsubpic(theOrigin + dX,                        width - 2 * dX + height * 0.5, pic, '0.25 0 0',           '0.5  0 0' + bH, theColor, theAlpha, 0);
-                       drawsubpic(theOrigin + width - dX,                            dX + height * 0.5, pic, '0.75 0 0',           '0.25 0 0' + bH, theColor, theAlpha, 0);
-                       drawsubpic(theOrigin              + height * 0.5,             dX + height * 0.5, pic, '0    0 0' + eY - bH, '0.25 0 0' + bH, theColor, theAlpha, 0);
-                       drawsubpic(theOrigin + dX         + height * 0.5, width - 2 * dX + height * 0.5, pic, '0.25 0 0' + eY - bH, '0.5  0 0' + bH, theColor, theAlpha, 0);
-                       drawsubpic(theOrigin + width - dX + height * 0.5,             dX + height * 0.5, pic, '0.75 0 0' + eY - bH, '0.25 0 0' + bH, theColor, theAlpha, 0);
-               }
-               else
-               {
-                       dX = theBorderSize_x * eX;
-                       dY = theBorderSize_x * eY;
-                       drawsubpic(theOrigin,                                        dX          +     dY, pic, '0    0    0', '0.25 0.25 0', theColor, theAlpha, 0);
-                       drawsubpic(theOrigin                  + dX,      width - 2 * dX          +     dY, pic, '0.25 0    0', '0.5  0.25 0', theColor, theAlpha, 0);
-                       drawsubpic(theOrigin          + width - dX,                  dX          +     dY, pic, '0.75 0    0', '0.25 0.25 0', theColor, theAlpha, 0);
-                       drawsubpic(theOrigin          + dY,                          dX + height - 2 * dY, pic, '0    0.25 0', '0.25 0.5  0', theColor, theAlpha, 0);
-                       drawsubpic(theOrigin          + dY         + dX, width - 2 * dX + height - 2 * dY, pic, '0.25 0.25 0', '0.5  0.5  0', theColor, theAlpha, 0);
-                       drawsubpic(theOrigin          + dY + width - dX,             dX + height - 2 * dY, pic, '0.75 0.25 0', '0.25 0.5  0', theColor, theAlpha, 0);
-                       drawsubpic(theOrigin + height - dY,                          dX          +     dY, pic, '0    0.75 0', '0.25 0.25 0', theColor, theAlpha, 0);
-                       drawsubpic(theOrigin + height - dY         + dX, width - 2 * dX          +     dY, pic, '0.25 0.75 0', '0.5  0.25 0', theColor, theAlpha, 0);
-                       drawsubpic(theOrigin + height - dY + width - dX,             dX          +     dY, pic, '0.75 0.75 0', '0.25 0.25 0', theColor, theAlpha, 0);
-               }
-       }
-}
-
-// return HUD background color
-vector HUD_GetBgColor()
-{
-       vector color;
-       if (teamplay)
-               GetTeamRGB(myteam) * hud_color_bg_team;
-       else {
-               // allow custom HUD colors in non-teamgames
-               color_x = cvar("hud_color_bg_r");
-               color_y = cvar("hud_color_bg_g");
-               color_z = cvar("hud_color_bg_b");
-       }
-       return color;
-}
-
-// return accuracy text color
-vector HUD_AccuracyColor(float accuracy)
-{
-       vector rgb;
-       float yellow_accuracy = cvar("hud_accuracy_yellow"); // value at which this function returns yellow
-       if(accuracy >= 100) {
-               rgb_x = 0;
-               rgb_y = 1;
-       }
-       else if(accuracy > yellow_accuracy) {
-               rgb_x = 1 - (accuracy-yellow_accuracy)/(100-yellow_accuracy); // red value between 1 -> 0
-               rgb_y = 1;
-       }
-       else {
-               rgb_x = 1;
-               rgb_y = accuracy/yellow_accuracy; // green value between 0 -> 1
-       }
-       rgb_z = 0;
-       return rgb;
-}
-
-// draw number in the XSCALE font
-void HUD_DrawXNum (vector pos, float num, float digits, float showsign, float lettersize, vector rgb, float highlighted, float stroke, float alpha, float dflags)
-{
-       float l, i;
-       string str, tmp, l_length;
-       float minus, plus;
-       vector vsize, num_color;
-
-       vsize_x = vsize_y = lettersize;
-       vsize_z = 0;
-
-       // showsign 1: always prefix with minus sign (useful in race distribution display)
-       // showsign 2: always prefix with plus sign (useful in race distribution display)
-       // showsign 3: prefix with minus sign if negative, plus sign if positive (useful in score distribution display)
-
-       if((showsign == 2 && num >= 0) || (num > 0 && showsign == 3))
-       {
-               plus = true;
-               pos_x -= lettersize;
-       } else
-               plus = false;
-
-       if(num < 0 || (num < 0 && showsign == 3) || (showsign == 1 && num <= 0))
-       {
-               minus = true;
-               num = -num;
-               pos_x -= lettersize;
-       } else
-               minus = false;
-
-       if(digits < 0)
-       {
-               tmp = ftos(num);
-               digits = -digits;
-               str = strcat(substring("0000000000", 0, digits - strlen(tmp)), tmp);
-       } else
-               str = ftos(num);
-
-       l = strlen(str);
-       l_length = ftos(l);
-
-       if(l > digits)
-       {
-               str = substring(str, l-digits, 999);
-               l = strlen(str);
-       } else if(l < digits)
-               pos_x += (digits-l) * lettersize;
-
-       if (highlighted == 1) {
-               vector hl_size;
-               hl_size_x = vsize_x * l + vsize_x * 0.2;
-               hl_size_y = vsize_y * 1.1;
-               hl_size_z = 0;
-               if(minus)
-                       hl_size_x = hl_size_x + vsize_x;
-
-               vector hl_pos;
-               hl_pos_x = pos_x - lettersize/10;
-               hl_pos_y = pos_y - lettersize/20;
-               hl_pos_z = 0;
-
-               drawpic(hl_pos, strcat("gfx/hud/sb_highlight_", 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(pos, "gfx/hud/num_minus_stroke", vsize, rgb, alpha, dflags);
-               drawpic(pos, "gfx/hud/num_minus", vsize, num_color, alpha, dflags);
-               pos_x += lettersize;
-       } else if(plus)
-       {
-               if (stroke == 1)
-                       drawpic(pos, "gfx/hud/num_plus_stroke", vsize, rgb, alpha, dflags);
-               drawpic(pos, "gfx/hud/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(pos, strcat("gfx/hud/num_", tmp, "_stroke"), vsize, rgb, alpha, dflags);
-               drawpic(pos, strcat("gfx/hud/num_", tmp), vsize, num_color, alpha, dflags);
-               pos_x += lettersize;
-       }
-}
-
-// 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;
-       if(x > 200) {
-               color_x = 0;
-               color_y = 1;
-               color_z = 0;
-       }
-       else if(x > 150) {
-               color_x = 0.4 - (x-150)*0.02 * 0.4; //red value between 0.4 -> 0
-               color_y = 0.9 + (x-150)*0.02 * 0.1; // green value between 0.9 -> 1
-               color_z = 0;
-       }
-       else if(x > 100) {
-               color_x = 1 - (x-100)*0.02 * 0.6; //red value between 1 -> 0.4
-               color_y = 1 - (x-100)*0.02 * 0.1; // green value between 1 -> 0.9
-               color_z = 1 - (x-100)*0.02; // blue value between 1 -> 0
-       }
-       else if(x > 50) {
-               color_x = 1;
-               color_y = 1;
-               color_z = 0.2 + (x-50)*0.02 * 0.8; // blue value between 0.2 -> 1
-       }
-       else if(x > 20) {
-               color_x = 1;
-               color_y = (x-20)*90/27/100; // green value between 0 -> 1
-               color_z = (x-20)*90/27/100 * 0.2; // blue value between 0 -> 0.2
-       }
-       else {
-               color_x = 1;
-               color_y = 0;
-               color_z = 0;
-       }
-       HUD_DrawXNum(pos, x, digits, 0, lettersize, color, 0, 0, alpha, DRAWFLAG_NORMAL);
-}
-
-float stringwidth_colors(string s, vector theSize)
-{
-       return stringwidth(s, TRUE, theSize);
-}
-
-float stringwidth_nocolors(string s, vector theSize)
-{
-       return stringwidth(s, FALSE, theSize);
-}
-
-#define CENTERPRINT_MAX_LINES 30
-string centerprint_messages[CENTERPRINT_MAX_LINES];
-float centerprint_width[CENTERPRINT_MAX_LINES];
-vector centerprint_start;
-float centerprint_expire;
-float centerprint_num;
-float centerprint_offset_hint;
-vector centerprint_fontsize;
-
-void centerprint(string strMessage)
-{
-       float i, j, n, hcount;
-       string s;
-
-       centerprint_fontsize = HUD_GetFontsize("scr_centersize");
-
-       centerprint_expire = min(centerprint_expire, time); // if any of the returns happens, this message will fade out
-
-       if(cvar("scr_centertime") <= 0)
-               return;
-
-       if(strMessage == "")
-               return;
-
-       // strip trailing newlines
-       j = strlen(strMessage) - 1;
-       while(substring(strMessage, j, 1) == "\n" && j >= 0)
-               j = j - 1;
-       strMessage = substring(strMessage, 0, j + 1);
-
-       if(strMessage == "")
-               return;
-
-       // strip leading newlines and remember them, they are a hint that the message should be lower on the screen
-       j = 0;
-       while(substring(strMessage, j, 1) == "\n" && j < strlen(strMessage))
-               j = j + 1;
-       strMessage = substring(strMessage, j, strlen(strMessage) - j);
-       centerprint_offset_hint = j;
-
-       if(strMessage == "")
-               return;
-
-       // if we get here, we have a message. Initialize its height.
-       centerprint_num = 0;
-
-       n = tokenizebyseparator(strMessage, "\n");
-       i = hcount = 0;
-       for(j = 0; j < n; ++j)
-       {
-               getWrappedLine_remaining = argv(j);
-               while(getWrappedLine_remaining)
-               {
-                       s = getWrappedLine(vid_conwidth * 0.75, centerprint_fontsize, stringwidth_colors);
-                       if(centerprint_messages[i])
-                               strunzone(centerprint_messages[i]);
-                       centerprint_messages[i] = strzone(s);
-                       centerprint_width[i] = stringwidth(s, TRUE, centerprint_fontsize);
-                       ++i;
-
-                       // half height for empty lines looks better
-                       if(s == "")
-                               hcount += 0.5;
-                       else
-                               hcount += 1;
-
-                       if(i >= CENTERPRINT_MAX_LINES)
-                               break;
-               }
-       }
-
-       float h, havail;
-       h = centerprint_fontsize_y*hcount;
-
-       havail = vid_conheight;
-       if(cvar("con_chatpos") < 0)
-               havail -= (-cvar("con_chatpos") + cvar("con_chat")) * cvar("con_chatsize"); // avoid overlapping chat
-       if(havail > vid_conheight - 70)
-               havail = vid_conheight - 70; // avoid overlapping HUD
-
-       centerprint_start_x = 0;
-
-#if 0
-       float forbiddenmin, forbiddenmax, allowedmin, allowedmax, preferred;
-
-       // here, the centerprint would cover the crosshair. REALLY BAD.
-       forbiddenmin = vid_conheight * 0.5 - h - 16;
-       forbiddenmax = vid_conheight * 0.5 + 16;
-
-       allowedmin = scoreboard_bottom;
-       allowedmax = havail - h;
-       preferred = (havail - h)/2;
-
-
-       // possible orderings (total: 4! / 4 = 6)
-       //  allowedmin allowedmax forbiddenmin forbiddenmax
-       //  forbiddenmin forbiddenmax allowedmin allowedmax
-       if(allowedmax < forbiddenmin || allowedmin > forbiddenmax)
-       {
-               // forbidden doesn't matter in this case
-               centerprint_start_y = bound(allowedmin, preferred, allowedmax);
-       }
-       //  allowedmin forbiddenmin allowedmax forbiddenmax
-       else if(allowedmin < forbiddenmin && allowedmax < forbiddenmax)
-       {
-               centerprint_start_y = bound(allowedmin, preferred, forbiddenmin);
-       }
-       //  allowedmin forbiddenmin forbiddenmax allowedmax
-       else if(allowedmin < forbiddenmin)
-       {
-               // make sure the forbidden zone is not covered
-               if(preferred > (forbiddenmin + forbiddenmax) * 0.5)
-                       centerprint_start_y = bound(allowedmin, preferred, forbiddenmin);
-               else
-                       centerprint_start_y = bound(forbiddenmax, preferred, allowedmin);
-       }
-       //  forbiddenmin allowedmin allowedmax forbiddenmax
-       else if(allowedmax < forbiddenmax)
-       {
-               // it's better to leave the allowed zone (overlap with scoreboard) than
-               // to cover the forbidden zone (crosshair)
-               if(preferred > (forbiddenmin + forbiddenmax) * 0.5)
-                       centerprint_start_y = forbiddenmax;
-               else
-                       centerprint_start_y = forbiddenmin;
-       }
-       //  forbiddenmin allowedmin forbiddenmax allowedmax
-       else
-       {
-               centerprint_start_y = bound(forbiddenmax, preferred, allowedmax);
-       }
-#else
-       centerprint_start_y =
-               min(
-                       max(
-                               max(scoreboard_bottom, vid_conheight * 0.5 + 16),
-                               (havail - h)/2
-                       ),
-                       havail - h
-               );
-#endif
-
-       centerprint_num = i;
-       centerprint_expire = time + cvar("scr_centertime");
-}
-
-void HUD_DrawCenterPrint (void)
-{
-       float i;
-       vector pos;
-       string ts;
-       float a;
-
-       //if(time > centerprint_expire)
-       //      return;
-
-       //a = bound(0, 1 - 2 * (time - centerprint_expire), 1);
-       a = bound(0, 1 - 4 * (time - centerprint_expire), 1);
-       //sz = 1.2 / (a + 0.2);
-
-       if(a <= 0)
-               return;
-
-       pos = centerprint_start;
-       for (i=0; i<centerprint_num; i = i + 1)
-       {
-               pos_x = (vid_conwidth - centerprint_width[i]) * 0.5;
-               ts = centerprint_messages[i];
-               if (ts != "")
-               {
-                       dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
-                       drawcolorcodedstring(pos, ts, centerprint_fontsize, a, DRAWFLAG_NORMAL);
-                       //  - '0 0.5 0' * (sz - 1) * centerprint_fontsize_x - '0.5 0 0' * (sz - 1) * centerprint_width[i] * centerprint_fontsize_y, centerprint_fontsize * sz
-                       pos_y = pos_y + centerprint_fontsize_y;
-               }
-               else
-                       // half height for empty lines looks better
-                       pos_y = pos_y + centerprint_fontsize_y * 0.5;
-       }
-}
-
-void drawstringright(vector position, string text, vector scale, vector rgb, float alpha, float flag)
-{
-       position_x -= 2 / 3 * strlen(text) * scale_x;
-       drawstring(position, text, scale, rgb, alpha, flag);
-}
-
-void drawstringcenter(vector position, string text, vector scale, vector rgb, float alpha, float flag)
-{
-       position_x = 0.5 * (vid_conwidth - 0.6025 * strlen(text) * scale_x);
-       drawstring(position, text, scale, rgb, alpha, flag);
-}
-
-// return the string of the given race place
-string race_PlaceName(float pos) {
-       if(pos == 1)
-               return "1st";
-       else if(pos == 2)
-               return "2nd";
-       else if(pos == 3)
-               return "3rd";
-       else
-               return strcat(ftos(pos), "th");
-}
-
-// return the string of the onscreen race timer
-string MakeRaceString(float cp, float mytime, float histime, float lapdelta, string hisname)
-{
-       string col;
-       string timestr;
-       string cpname;
-       string lapstr;
-       lapstr = "";
-
-       if(histime == 0) // goal hit
-       {
-               if(mytime > 0)
-               {
-                       timestr = strcat("+", ftos_decimals(+mytime, TIME_DECIMALS));
-                       col = "^1";
-               }
-               else if(mytime == 0)
-               {
-                       timestr = "+0.0";
-                       col = "^3";
-               }
-               else
-               {
-                       timestr = strcat("-", ftos_decimals(-mytime, TIME_DECIMALS));
-                       col = "^2";
-               }
-
-               if(lapdelta > 0)
-               {
-                       lapstr = strcat(" (-", ftos(lapdelta), "L)");
-                       col = "^2";
-               }
-               else if(lapdelta < 0)
-               {
-                       lapstr = strcat(" (+", ftos(-lapdelta), "L)");
-                       col = "^1";
-               }
-       }
-       else if(histime > 0) // anticipation
-       {
-               if(mytime >= histime)
-                       timestr = strcat("+", ftos_decimals(mytime - histime, TIME_DECIMALS));
-               else
-                       timestr = TIME_ENCODED_TOSTRING(TIME_ENCODE(histime));
-               col = "^3";
-       }
-       else
-               col = "^7";
-
-       if(cp == 254)
-               cpname = "Start line";
-       else if(cp == 255)
-               cpname = "Finish line";
-       else if(cp)
-               cpname = strcat("Intermediate ", ftos(cp));
-       else
-               cpname = "Finish line";
-
-       if(histime < 0)
-               return strcat(col, cpname);
-       else if(hisname == "")
-               return strcat(col, cpname, " (", timestr, ")");
-       else
-               return strcat(col, cpname, " (", timestr, " ", strcat(hisname, col, lapstr), ")");
-}
-
-// Check if the given name already exist in race rankings? In that case, where? (otherwise return 0)
-float race_CheckName(string net_name) {
-       float i;
-       for (i=RANKINGS_CNT-1;i>=0;--i)
-               if(grecordholder[i] == net_name)
-                       return i+1;
-       return 0;
-}
-
-/*
-==================
-HUD panels
-==================
-*/
-
-string HUD_Panel_GetName(float id)
-{
-       switch(id) {
-               case 0: return "weaponicons"; break;
-               case 1: return "inventory"; break;
-               case 2: return "powerups"; break;
-               case 3: return "healtharmor"; break;
-               case 4: return "notify"; break;
-               case 5: return "timer"; break;
-               case 6: return "radar"; break;
-               case 7: return "score"; break;
-               case 8: return "racetimer"; break;
-               case 9: return "vote"; break;
-               case 10: return "pressedkeys"; break;
-               default: return "";
-       }
-}
-
-vector HUD_Panel_CheckLimitSize(float id, vector mySize)
-{
-       switch(id) {
-               case 0: 
-                       mySize_x = max(mySize_y * (1/10), mySize_x); // at least 1/10 * height
-                       mySize_y = max(mySize_x * (1/26), mySize_y); // at least 1/26 * width
-                       break;
-               case 1: 
-                       mySize_x = max(mySize_y * 0.7, mySize_x); // at least 0.7 * height
-                       break;
-               case 3: 
-                       mySize_x = max(mySize_y * 2, mySize_x); // at least 2 * height
-                       break;
-               case 5: 
-                       mySize_x = max(mySize_y * 2, mySize_x); // at least 2 * height
-                       break;
-               case 9: 
-                       mySize_y = (1/4) * mySize_x; // 1/4 * width
-                       break;
-               case 10: 
-                       mySize_y = 0.5898 * mySize_x; // 0.5898 * width, reason: bg has weird dimensions...
-                       break;
-       }
-       return mySize;
-}
-
-// 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 stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_size")));
-}
-
-// return pos of given panel
-vector HUD_Panel_GetPos(float id)
-{
-       vector pos;
-       pos = stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_pos")));
-
-       if (pos_x < 0)
-               pos_x = vid_conwidth + pos_x;
-       if (pos_y < 0)
-               pos_y = vid_conheight + pos_y;
-       return pos;
-}
-
-float HUD_Panel_GetMarigin(float id)
-{
-       return bound(1, MARIGIN_MULTIPLIER * cvar_or(strcat("hud_", HUD_Panel_GetName(id), "_marigin"), 30), 200);
-}
-
-vector HUD_Panel_GetColor(float id)
-{
-       if(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_color")) != "")
-               return stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_color")));
-       else
-               return stov(cvar_string("hud_color"));
-}
-
-float HUD_Panel_GetBgActive(float id)
-{
-       if(cvar("_hud_configure"))
-               return 1;
-
-       return cvar_or(strcat("hud_", HUD_Panel_GetName(id), "_bg"), 1);
-}
-
-vector HUD_Panel_GetProgressBarColor(string item)
-{
-       return stov(cvar_string(strcat("hud_progreshud_", item, "_color")));
-}
-
-float resizeCorner; // 1 = topleft, 2 = topright, 3 = bottomleft, 4 = bottomright
-// 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 myPos, vector mySize)
-{
-       float i;
-
-       vector myTarget;
-       myTarget = mySize;
-
-       vector targPos;
-       vector targSize;
-       vector myCenter;
-       vector targCenter;
-
-       for (i = 0; i < panel_cnt; ++i) {
-               if(i == id || !HUD_Panel_CheckActive(i))
-                       continue;
-
-               targPos = HUD_Panel_GetPos(i);
-               targSize = HUD_Panel_GetSize(i);
-
-               targPos = HUD_Panel_GetPos(i) - '1 1 0' * HUD_Panel_GetMarigin(id);
-               targSize = HUD_Panel_GetSize(i) + '2 2 0' * HUD_Panel_GetMarigin(id);
-
-               if(myPos_y + mySize_y < targPos_y)
-                       continue;
-               if(myPos_y > targPos_y + targSize_y)
-                       continue;
-
-               if(myPos_x + mySize_x < targPos_x)
-                       continue;
-               if(myPos_x > targPos_x + targSize_x)
-                       continue;
-
-               // OK, there IS a collision.
-
-               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;
-
-               float k, y;
-               if(myCenter_x < targCenter_x && myCenter_y < targCenter_y && resizeCorner != 1) // top left (of target panel)
-               {
-                       if(myPos_x + mySize_x - targPos_x < myPos_y + mySize_y - targPos_y) // push it to the side
-                               myTarget_x = targPos_x - myPos_x;
-                       else // push it upwards
-                               myTarget_y = targPos_y - myPos_y;
-               }
-               else if(myCenter_x > targCenter_x && myCenter_y < targCenter_y && resizeCorner != 2) // 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;
-                       else // push it upwards
-                               myTarget_y = targPos_y - myPos_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 - myPos_x;
-                       else // push it downwards
-                               myTarget_y = targPos_y + targSize_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;
-                       else // push it downwards
-                               myTarget_y = targPos_y + targSize_y;
-               }
-       }
-
-       return myTarget;
-}
-
-// TODO: checkResize
-float HUD_Panel_SetSize(float id, vector mySize)
-{
-       float didntresize;
-
-       vector oldSize;
-       oldSize = stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_size")));
-
-       vector myPos;
-       myPos = HUD_Panel_GetPos(id);
-
-       // check for collisions
-       mySize = HUD_Panel_CheckResize(id, HUD_Panel_GetPos(id), mySize);
-
-       mySize_x = bound(0.025 * vid_conwidth, mySize_x, vid_conwidth - myPos_x);
-       mySize_y = bound(0.025 * vid_conheight, mySize_y, vid_conheight - myPos_y);
-
-       // cap against panel's own limits
-       mySize = HUD_Panel_CheckLimitSize(id, mySize);
-
-       //mySize_x = bound(0.025 * vid_conwidth, mySize_x, vid_conwidth);
-       //mySize_y = bound(0.025 * vid_conheight, mySize_y, vid_conheight);
-
-       // TODO: is this needed?
-       // this is to check if (and how) SetPos should be called
-       if(mySize_x == oldSize_x && mySize_y == oldSize_y)
-               didntresize = 3; // didnt resize either
-       else if(mySize_x == oldSize_x && mySize_y != oldSize_y)
-               didntresize = 2; // resized Y
-       else if(mySize_y == oldSize_y && mySize_x != oldSize_x)
-               didntresize = 1; // resized X
-
-       string s;
-       s = strcat(ftos(mySize_x), " ", ftos(mySize_y));
-       cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_size"), s);
-       return didntresize;
-}
-
-// 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)
-{
-       float i;
-
-       vector myTarget;
-       myTarget = myPos;
-
-       vector targPos;
-       vector targSize;
-       vector myCenter;
-       vector targCenter;
-
-       for (i = 0; i < panel_cnt; ++i) {
-               if(i == id || !HUD_Panel_CheckActive(i))
-                       continue;
-
-               targPos = HUD_Panel_GetPos(i) - '1 1 0' * HUD_Panel_GetMarigin(id);
-               targSize = HUD_Panel_GetSize(i) + '2 2 0' * HUD_Panel_GetMarigin(id);
-
-               if(myPos_y + mySize_y < targPos_y)
-                       continue;
-               if(myPos_y > targPos_y + targSize_y)
-                       continue;
-
-               if(myPos_x + mySize_x < targPos_x)
-                       continue;
-               if(myPos_x > targPos_x + targSize_x)
-                       continue;
-
-               // OK, there IS a collision.
-
-               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;
-
-               float k, 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;
-                       else // push it upwards
-                               myTarget_y = targPos_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;
-                       else // push it upwards
-                               myTarget_y = targPos_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;
-                       else // push it downwards
-                               myTarget_y = targPos_y + targSize_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;
-                       else // push it downwards
-                               myTarget_y = targPos_y + targSize_y;
-               }
-       }
-
-       return myTarget;
-}
-
-void HUD_Panel_SetPos(float id, vector pos, float didntresize)
-{
-       vector oldPos;
-       oldPos = HUD_Panel_GetPos(id);
-       if(didntresize == 2)
-               pos_x = oldPos_x;
-       else if(didntresize == 1)
-               pos_y = oldPos_y;
-       else if(didntresize == 3)
-               return;
-
-       vector mySize;
-       mySize = HUD_Panel_GetSize(id);
-
-       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 (pos_x + 0.5 * mySize_x > 0.5 * vid_conwidth)
-               pos_x = pos_x - vid_conwidth;
-       if (pos_y + 0.5 * mySize_y > 0.5 * vid_conheight)
-               pos_y = pos_y - vid_conheight;
-
-       string s;
-       s = strcat(ftos(pos_x), " ", ftos(pos_y));
-
-       cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_pos"), s);
-}
-
-float mouseClicked;
-float prevMouseClicked; // previous state
-float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary)
-{
-       prevMouseClicked = mouseClicked;
-       if(nPrimary == K_MOUSE1)
-       {
-               if(bInputType == 0) { // key pressed
-                       mouseClicked = 1;
-                       return true;
-               }
-               if(bInputType == 1) {// key released
-                       mouseClicked = 0;
-                       return true;
-               }
-       }
-       return false;
-}
-
-vector mousepos, mouseprevpos;
-vector panel_click_distance; // mouse cursor distance from the top left corner of the panel (saved only upon a click)
-vector panel_click_pos; // panel pos (saved only upon a click)
-vector panel_click_size; // panel size (saved only upon a click)
-float highlightedPanel;
-float highlightedAction; // 0 = nothing, 1 = move, 2 = resize
-void HUD_Panel_Mouse()
-{
-       if(mouseClicked == 0) {
-               highlightedPanel = -1;
-               highlightedAction = 0;
-       }
-
-       mousepos = mousepos + getmousepos();
-
-       mousepos_x = bound(0, mousepos_x, vid_conwidth);
-       mousepos_y = bound(0, mousepos_y, vid_conheight);
-
-       drawpic(mousepos, "gfx/menu/default/cursor.tga", '32 32 0', '1 1 1', 1, hud_alpha_fg);
-
-       if(mouseClicked)
-       {
-               float i, marigin;
-               vector panelPos;
-               vector panelSize;
-
-               for(i = 0; i <= panel_cnt; i++)
-               {
-                       panelPos = HUD_Panel_GetPos(i);
-                       panelSize = HUD_Panel_GetSize(i);
-                       marigin = HUD_Panel_GetMarigin(i);
-                       if(prevMouseClicked == 0) {
-                               // move
-                               if(mousepos_x >= panelPos_x && mousepos_y >= panelPos_y && mousepos_x <= panelPos_x + panelSize_x && mousepos_y <= panelPos_y + panelSize_y)
-                               {
-                                       highlightedPanel = i;
-                                       highlightedAction = 1;
-                               }
-                               // resize from topleft border
-                               else if(mousepos_x >= panelPos_x - eX * marigin && mousepos_y >= panelPos_y - eX * marigin && 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 - eX * marigin && mousepos_x <= panelPos_x + panelSize_x + eX * marigin && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
-                               {
-                                       highlightedPanel = i;
-                                       highlightedAction = 2;
-                                       resizeCorner = 2;
-                               }
-                               // resize from bottomleft border
-                               else if(mousepos_x >= panelPos_x - eX * marigin && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + panelSize_y + eY * marigin)
-                               {
-                                       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 + eX * marigin && mousepos_y <= panelPos_y + panelSize_y + eY * marigin)
-                               {
-                                       highlightedPanel = i;
-                                       highlightedAction = 2;
-                                       resizeCorner = 4;
-                               }
-                       }
-
-                       if(highlightedPanel == i)
-                       {
-                               if(prevMouseClicked == 0)
-                               {
-                                       panel_click_distance = mousepos - panelPos;
-                                       panel_click_pos = panelPos;
-                                       panel_click_size = panelSize;
-                               }
-
-                               if(highlightedAction == 1)
-                                       HUD_Panel_SetPos(i, mousepos - panel_click_distance, 0);
-                               else if(highlightedAction == 2)
-                               {
-                                       float didntresize; // panel too big/too small, dont resize (also has to affect moving)
-                                       if(resizeCorner == 1) {
-                                               didntresize = HUD_Panel_SetSize(i, panelSize + mouseprevpos - mousepos);
-                                               HUD_Panel_SetPos(i, mousepos - panel_click_distance, didntresize);
-                                       }
-                                       if(resizeCorner == 2) {
-                                               didntresize = HUD_Panel_SetSize(i, eY * panel_click_size_y + eX * (mousepos_x - panelPos_x - (panel_click_distance_x - panel_click_size_x))
-                                                               + eY * (panel_click_distance_y + (panel_click_pos_y - mousepos_y)));
-                                               HUD_Panel_SetPos(i, eX * panelPos_x + eY * (mousepos_y - panel_click_distance_y), didntresize);
-                                       }
-                                       if(resizeCorner == 3) {
-                                               didntresize = HUD_Panel_SetSize(i, panelSize + eX * (mouseprevpos_x - mousepos_x) + eY * (mousepos_y - mouseprevpos_y));
-                                               HUD_Panel_SetPos(i, eX * (mousepos_x - panel_click_distance_x) + eY * panelPos_y, didntresize);
-                                       }
-                                       if(resizeCorner == 4) {
-                                               HUD_Panel_SetSize(i, mousepos - panelPos - (panel_click_distance - panel_click_size));
-                                       }
-                               }
-                       }
-               }
-       }
-       mouseprevpos = mousepos;
-       prevMouseClicked = mouseClicked;
-}
-
-/*void HUD_DrawDockEdge(float id, vector p1, vector p2, float target)
-{
-       vector pos;
-       vector size;
-
-       pos =
-*/ // maybe one day, since this will be quite complicated
-
-// Weapon icons (#0)
-//
-
-float weaponspace[10];
-void HUD_WeaponIcons_Clear()
-{
-       float idx;
-       for(idx = 0; idx < 10; ++idx)
-               weaponspace[idx] = 0;
-}
-
-void HUD_WeaponIcons()
-{
-       float alpha, height, marigin, accuracybar_height, stat_weapons; // "constants"
-       vector pos, mySize, mysize, mypos, color, accuracy_color;
-       float i, id, fade, weapon_stats, weapon_hit, weapon_damage, weapon_cnt; // variables
-
-       marigin = HUD_Panel_GetMarigin(0);
-       pos = HUD_Panel_GetPos(0);
-       mySize = HUD_Panel_GetSize(0);
-       color = HUD_Panel_GetColor(0);
-       accuracybar_height = cvar_or("hud_weaponicons_accuracybar_height", 3);
-
-       stat_weapons = getstati(STAT_WEAPONS);
-       for(i = WEP_FIRST; i <= WEP_LAST; ++i)
-       {
-               self = get_weaponinfo(i);
-               if(self.weapons && self.impulse >= 0 && stat_weapons & self.weapons)
-                       ++weapon_cnt;
-       }
-
-       if(HUD_Panel_GetBgActive(0) && weapon_cnt)
-               draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
-
-       // hits
-       weapon_stats = getstati(STAT_DAMAGE_HITS);
-       weapon_number = weapon_stats & 63;
-       weapon_hits[weapon_number-WEP_FIRST] = floor(weapon_stats / 64);
-       // fired
-       weapon_stats = getstati(STAT_DAMAGE_FIRED);
-       weapon_number = weapon_stats & 63;
-       weapon_fired[weapon_number-WEP_FIRST] = floor(weapon_stats / 64);
-
-       if(cvar_or("hud_weaponicons_fade", 1))
-       {
-               fade = 3.2 - 2 * (time - weapontime);
-               fade = bound(0.7, fade, 1);
-       }
-       else
-               fade = 1;
-
-       HUD_WeaponIcons_Clear();
-
-       float rows, columns;
-       //TODO: yuck. there must be a better way :)
-       //rows = ceil(4 * mySize_y/mySize_x);
-       if(mySize_y/mySize_x < 0.08)
-               rows = 1;
-       else if(mySize_y/mySize_x < 0.25)
-               rows = 2;
-       else if(mySize_y/mySize_x < 0.5)
-               rows = 3;
-       else if(mySize_y/mySize_x < 0.7)
-               rows = 4;
-       else if(mySize_y/mySize_x < 0.9)
-               rows = 5;
-       else if(mySize_y/mySize_x < 1.25)
-               rows = 6;
-       else if(mySize_y/mySize_x < 1.7)
-               rows = 7;
-       else if(mySize_y/mySize_x < 2.5)
-               rows = 8;
-       else if(mySize_y/mySize_x < 4)
-               rows = 12;
-       else if(mySize_y/mySize_x < 6)
-               rows = 14;
-       else
-               rows = 16;
-
-       columns = ceil(16/rows);
-       float row, column;
-       for(i = WEP_FIRST; i <= WEP_LAST; ++i)
-       {
-               self = get_weaponinfo(i);
-               if((self.weapons && self.impulse >= 0 && stat_weapons & self.weapons) || cvar("_hud_configure"))
-               {
-                       id = self.impulse;
-
-                       alpha = (id == activeweapon) ? 1 : 0.6;
-
-                       weapon_hit = weapon_hits[self.weapon-WEP_FIRST];
-                       weapon_damage = weapon_fired[self.weapon-WEP_FIRST];
-                       if(id == 0) // porto and hook should be last
-                               id = 9;
-                       else
-                               id = --id;
-
-                       if(id+1 == activeweapon)
-                               drawpic(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "gfx/hud/sb_ammobg", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), color, fade * hud_alpha_fg, DRAWFLAG_NORMAL);
-                       drawpic(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("gfx/hud/inv_weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * hud_alpha_fg, DRAWFLAG_NORMAL);
-
-                       if(cvar_or("hud_weaponicons_number", 1))
-                               drawstring(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), ftos(id+1), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-
-                       // draw the weapon accuracy on the HUD
-                       if(hud_accuracy_hud && !(gametype == GAME_RACE || gametype == GAME_CTS))
-                       {
-                               if(weapon_damage)
-                                       weapon_stats = floor(100 * weapon_hit / weapon_damage);
-
-                               accuracy_color = HUD_AccuracyColor(weapon_stats);
-                               if(weapon_damage)
-                                       drawpic(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows) - '2 0 0' + eY * (mySize_y/rows - accuracybar_height), "gfx/hud/sb_accuracy_bar.tga", eX * mySize_x*(1/columns) + eY * accuracybar_height, accuracy_color, hud_alpha_fg, DRAWFLAG_NORMAL);
-                       }
-               }
-
-               ++row;
-               if(row >= rows)
-               {
-                       row = 0;
-                       ++column;
-               }
-       }
-
-}
-
-// Inventory (#1)
-//
-
-float GetAmmoStat(float i)
-{
-       switch(i)
-       {
-               case 0: return STAT_SHELLS;
-               case 1: return STAT_NAILS;
-               case 2: return STAT_ROCKETS;
-               case 3: return STAT_CELLS;
-               case 4: return STAT_FUEL;
-               default: return -1;
-       }
-}
-
-float GetAmmoItemCode(float i)
-{
-       switch(i)
-       {
-               case 0: return IT_SHELLS;
-               case 1: return IT_NAILS;
-               case 2: return IT_ROCKETS;
-               case 3: return IT_CELLS;
-               case 4: return IT_FUEL;
-               default: return -1;
-       }
-}
-
-string GetAmmoPicture(float i)
-{
-       switch(i)
-       {
-               case 0: return "gfx/hud/sb_shells";
-               case 1: return "gfx/hud/sb_bullets";
-               case 2: return "gfx/hud/sb_rocket";
-               case 3: return "gfx/hud/sb_cells";
-               case 4: return "gfx/hud/sb_fuel";
-               default: return "";
-       }
-}
-
-void HUD_Inventory()
-{
-       float i;
-       float stat_items;
-       float marigin;
-
-       vector pos, mySize, mysize, mypos, color;
-       marigin = HUD_Panel_GetMarigin(1);
-       pos = HUD_Panel_GetPos(1);
-       mySize = HUD_Panel_GetSize(1);
-       color = HUD_Panel_GetColor(1);
-
-       if(HUD_Panel_GetBgActive(1))
-               draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
-
-       // 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(cvar("_hud_configure"))
-                       a = 100;
-
-               if(cvar("hud_ammo_onlycurrent")) {
-                       if (stat_items & GetAmmoItemCode(i)) {
-                               drawpic(pos - '1 1 0' * marigin, "gfx/hud/sb_ammobg", mysize + '1 1 0' * marigin, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-                               drawpic(pos + eX * mysize_x * 1.7, GetAmmoPicture(i), '24 24 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-                               if(a < 10)
-                                       HUD_DrawXNum(pos + '5 5 0', a, 3, 0, 24, '0.7 0 0', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
-                               else
-                                       HUD_DrawXNum(pos + '5 5 0', a, 3, 0, 24, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
-                       }
-               } 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(mypos, "gfx/hud/sb_ammobg", mysize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-                               drawpic(mypos + eY * 0.05 * mysize_y, GetAmmoPicture(i), '1 1 0' * 0.8 * mysize_y, '1 1 1', hud_alpha_fg, 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_alpha_fg, 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_alpha_fg * 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_alpha_fg, 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_alpha_fg * 0.7, DRAWFLAG_NORMAL);
-                               }
-                       }
-               }
-       }
-
-       // fuel ammo
-       a = getstati(GetAmmoStat(4)); // how much fuel do we have?
-
-       if (a > 0) { // if we have fuel, draw the amount
-               if(pos_x + 0.5 * mySize_x > 0.5 * vid_conwidth)
-                       mypos_x += pos_x + mySize_x - 0; // TODO!
-
-               drawpic(mypos - '0 2 0' + '52 0 0', GetAmmoPicture(4), '20 20 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-               if (a > 10)
-                       HUD_DrawXNum(mypos, a, 3, 0, 16, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
-               else
-                       HUD_DrawXNum(mypos, a, 3, 0, 16, '0.7 0 0', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
-       }
-}
-
-
-// Powerups (#2)
-// TODO!
-void HUD_Powerups() {
-       float stat_items, dt;
-       float marigin;
-
-       vector pos, mySize, color;
-       marigin = HUD_Panel_GetMarigin(2);
-       pos = HUD_Panel_GetPos(2);
-       mySize = HUD_Panel_GetSize(2);
-       color = HUD_Panel_GetColor(2);
-
-       if(HUD_Panel_GetBgActive(2))
-               draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
-
-       stat_items = getstati(STAT_ITEMS);
-       /*
-       if not(stat_items & IT_STRENGTH)
-               if not(stat_items & IT_INVINCIBLE)
-                       return;
-       */
-
-       if (getstati(STAT_HEALTH) <= 0)
-               return;
-
-       float strength_time, invincibility_time, countdown_fontsize;
-
-       //strength
-       strength_time = getstatf(STAT_STRENGTH_FINISHED);
-       invincibility_time = getstatf(STAT_INVINCIBLE_FINISHED);
-
-       if (strength_time) {
-               dt = strength_time - time;
-               if(dt > 0)
-               {
-                       if(dt < 5)
-                       {
-                               drawpic_expanding_two(pos, "gfx/hud/sb_str", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE,
-                                       bound(0, (ceil(dt) - dt) / 0.5, 1));
-                       }
-                       else
-                       {
-                               drawpic(pos, "gfx/hud/sb_str", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE);
-                       }
-                       HUD_DrawXNum(pos - '40 -2 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
-               }
-               else if(dt > -1)
-               {
-                       drawpic_expanding(pos, "gfx/hud/sb_str", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE,
-                               bound(0, -dt / 0.5, 1));
-               }
-       }
-
-       //invincibility
-       if (invincibility_time) {
-               dt = invincibility_time - time;
-               if(dt > 0)
-               {
-                       if(dt < 5)
-                       {
-                               drawpic_expanding_two(pos - '0 -22 0', "gfx/hud/sb_invinc", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE,
-                                       bound(0, (ceil(dt) - dt) / 0.5, 1));
-                       }
-                       else
-                       {
-                               drawpic(pos - '0 -22 0', "gfx/hud/sb_invinc", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE);
-                       }
-                       HUD_DrawXNum(pos - '40 -24 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
-               }
-               else if(dt > -1)
-               {
-                       drawpic_expanding(pos - '0 -22 0', "gfx/hud/sb_invinc", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE,
-                               bound(0, -dt / 0.5, 1));
-               }
-       }
-}
-
-// Health/armor (#3)
-//
-void HUD_HealthArmor(void)
-{
-       float marigin;
-
-       vector pos, mySize, color;
-       marigin = HUD_Panel_GetMarigin(3);
-       pos = HUD_Panel_GetPos(3);
-       mySize = HUD_Panel_GetSize(3);
-       color = HUD_Panel_GetColor(3);
-
-       if(HUD_Panel_GetBgActive(3))
-               draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
-
-       float armor, health, x;
-       armor = getstati(STAT_ARMOR);
-       health = getstati(STAT_HEALTH);
-       if(cvar("_hud_configure"))
-       {
-               armor = 150;
-               health = 100;
-       }
-
-       if(health <= 0)
-               return;
-
-       float numbers;
-
-       // TODO!
-       if(hud_hudselector == 2) // combined health and armor display
-       {
-               vector v;
-               v = healtharmor_maxdamage(health, armor, armorblockpercent);
-
-               vector num_pos;
-               num_pos = - '96 28 0';
-
-               x = floor(v_x + 1);
-
-               if(v_z) // fully armored
-               {
-                       // here, armorideal > armor
-                       drawpic(num_pos + '78 -4.5 0', "gfx/hud/sb_health", '32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-                       drawpic(num_pos + '108 -4.5 0', "gfx/hud/sb_armor", '20 20 0', '1 1 1', hud_alpha_fg * armor / v_y, DRAWFLAG_NORMAL);
-               }
-               else
-               {
-                       drawpic(num_pos + '108 -4.5 0', "gfx/hud/sb_health", '20 20 0', '1 1 1', hud_alpha_fg * v_y / armor, DRAWFLAG_NORMAL);
-                       drawpic(num_pos + '78 -4.5 0', "gfx/hud/sb_armor", '32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-               }
-               HUD_DrawXNum_Colored(num_pos, x, 3, 24, hud_alpha_fg); // draw the combined health and armor
-       }
-
-       else
-       {
-               vector health_pos, armor_pos;
-
-               // TODO!
-               if (hud_hudselector == 0) { // old style layout with armor left of health
-                       armor_pos = pos;
-                       health_pos = pos + eX * 0.5 * mySize_x;
-               } else {
-                       health_pos = pos;
-                       armor_pos = pos + eX * 0.5 * mySize_x;
-               }
-
-
-               if (mySize_x/mySize_y > 5)
-               {
-                       // armor
-                       x = armor;
-                       numbers = strlen(ftos(x));
-
-                       if (x > 0)
-                       {
-                               drawpic(pos, "gfx/hud/statuhud", eX * 0.5 * mySize_x * min(1, x/200) + eY * mySize_y, HUD_Panel_GetProgressBarColor("armor"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL);
-                               if (x > 45)
-                                       drawpic(pos, "gfx/hud/sb_armor", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-                               else
-                                       drawpic(pos, "gfx/hud/sb_armor", '1 1 0' * mySize_y, '1 1 1', (x+10)/55 * hud_alpha_fg, DRAWFLAG_NORMAL);
-                               HUD_DrawXNum_Colored(pos + eX * mySize_y + eY * 0.25 * mySize_y, x, numbers, 0.5 * mySize_y, hud_alpha_fg);
-                       }
-
-                       // health
-                       x = health;
-                       drawpic(pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, x/200), "gfx/hud/statuhud", eX * 0.5 * mySize_x * min(1, x/200) + eY * mySize_y, HUD_Panel_GetProgressBarColor("health"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL);
-                       drawpic(pos + eX * mySize_x - eX * mySize_y, "gfx/hud/sb_health", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-                       HUD_DrawXNum_Colored(pos + eX * mySize_x - eX * 2.5 * mySize_y + eY * 0.25 * mySize_y, x, 3, 0.5 * mySize_y, hud_alpha_fg);
-               }
-               else if (mySize_x/mySize_y > 3.2)
-               {
-                       // armor
-                       x = armor;
-                       numbers = strlen(ftos(x));
-
-                       if (x > 0)
-                       {
-                               drawpic(pos + eY * mySize_y - eY * mySize_y * min(1, x/200), "gfx/hud/statuhud", eX * 0.5 * mySize_x + eY * mySize_y * min(1, x/200), HUD_Panel_GetProgressBarColor("armor"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL);
-                               if (x > 45)
-                                       drawpic(pos + eX * 0.4 * mySize_y, "gfx/hud/sb_armor", '0.7 0.7 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-                               else
-                                       drawpic(pos + eX * 0.4 * mySize_y, "gfx/hud/sb_armor", '0.7 0.7 0' * mySize_y, '1 1 1', (x+10)/55 * hud_alpha_fg, DRAWFLAG_NORMAL);
-                               HUD_DrawXNum_Colored(pos + eY * 0.55 * mySize_y, x, numbers, 0.5 * mySize_y, hud_alpha_fg);
-                       }
-
-                       // health
-                       x = health;
-                       numbers = strlen(ftos(x));
-
-                       drawpic(pos + eX * 0.5 * mySize_x + eY * mySize_y - eY * mySize_y * min(1, x/200), "gfx/hud/statuhud", eX * 0.5 * mySize_x + eY * mySize_y * min(1, x/200), HUD_Panel_GetProgressBarColor("health"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL);
-                       drawpic(pos + eX * mySize_x - eX * 1.1 * mySize_y, "gfx/hud/sb_health", '0.7 0.7 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-                       HUD_DrawXNum_Colored(pos + eX * mySize_x - eX * numbers * 0.5 * mySize_y + eY * 0.55 * mySize_y, x, numbers, 0.5 * mySize_y, hud_alpha_fg);
-               }
-               else
-               {
-                       // armor
-                       x = armor;
-                       numbers = strlen(ftos(x));
-
-                       if (x > 0)
-                       {
-                               drawpic(pos, "gfx/hud/statuhud", eX * mySize_x * min(1, x/200) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor("armor"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL);
-                               if (x > 45)
-                                       drawpic(pos, "gfx/hud/sb_armor", '0.5 0.5 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-                               else
-                                       drawpic(pos, "gfx/hud/sb_armor", '0.5 0.5 0' * mySize_y, '1 1 1', (x+10)/55 * hud_alpha_fg, DRAWFLAG_NORMAL);
-                               HUD_DrawXNum_Colored(pos + eX * 0.5 * mySize_y, x, numbers, 0.5 * mySize_y, hud_alpha_fg);
-                       }
-
-                       // health
-                       x = health;
-                       numbers = strlen(ftos(x));
-
-                       drawpic(pos + eY * 0.5 * mySize_y, "gfx/hud/statuhud", eX * mySize_x * min(1, x/200) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor("health"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL);
-                       drawpic(pos + eY * 0.5 * mySize_y, "gfx/hud/sb_health", '0.5 0.5 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-                       HUD_DrawXNum_Colored(pos + eX * 0.5 * mySize_y + eY * 0.5 * mySize_y, x, numbers, 0.5 * mySize_y, hud_alpha_fg);
-               }
-       }
-}
-
-// Score (#7)
-//
-void HUD_Score()
-{
-       float marigin;
-
-       vector pos, mySize, color;
-       marigin = HUD_Panel_GetMarigin(7);
-       pos = HUD_Panel_GetPos(7);
-       mySize = HUD_Panel_GetSize(7);
-       color = HUD_Panel_GetColor(7);
-
-       if(HUD_Panel_GetBgActive(7))
-               draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
-
-       float score, distribution, leader;
-       vector score_pos, secondary_score_pos, distribution_color;
-       entity tm, pl, me;
-       me = (spectatee_status > 0) ? playerslots[spectatee_status - 1] : playerslots[player_localentnum - 1];
-
-       if (!teamplay) { // non-teamgames
-               // me vector := [team/connected frags id]
-               pl = players.sort_next;
-               if(pl == me)
-                       pl = pl.sort_next;
-
-               if(pl)
-                       distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]);
-               else
-                       distribution = 0;
-
-               score = me.(scores[ps_primary]);
-
-               if(distribution >= 5) {
-                       distribution_color = eY;
-                       leader = 1;
-               } else if(distribution >= 0) {
-                       distribution_color = '1 1 1';
-                       leader = 1;
-               } else if(distribution >= -5)
-                       distribution_color = '1 1 0';
-               else
-                       distribution_color = eX;
-
-               HUD_DrawXNum(pos + eX * mySize_x - eX * 6 * 0.3  * mySize_y, distribution, 6, 3, 0.3 * mySize_y, distribution_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
-               HUD_DrawXNum(pos + eX * mySize_x - eX * 6 * 0.75 * mySize_y + eY * 0.35 * mySize_y, score, 6, 0, 0.75 * mySize_y, distribution_color, leader, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
-       } else { // teamgames
-               float max_fragcount;
-               max_fragcount = -999;
-
-               for(tm = teams.sort_next; tm; tm = tm.sort_next) {
-                       if(tm.team == COLOR_SPECTATOR || !tm.team_size) // no players? don't display
-                               continue;
-                       score = tm.(teamscores[ts_primary]);
-                       leader = 0;
-
-                       if (score > max_fragcount)
-                               max_fragcount = score;
-
-                       if(tm.team == myteam) {
-                               if (max_fragcount == score)
-                                       leader = 1;
-                               HUD_DrawXNum(score_pos, score, 4, 0, 34, GetTeamRGB(tm.team) * 0.8, leader, 1, hud_alpha_fg, DRAWFLAG_NORMAL);
-                       } else {
-                               if (max_fragcount == score)
-                                       leader = 1;
-                               HUD_DrawXNum(secondary_score_pos, score, 6, 0, 16, GetTeamRGB(tm.team) * 0.8, leader, 1, hud_alpha_fg, DRAWFLAG_NORMAL);
-                               secondary_score_pos = secondary_score_pos + '0 16 0';
-                       }
-               }
-       }
-}
-
-// Race timer (#8)
-//
-void HUD_RaceTimer (void) {
-       float marigin;
-
-       vector pos, mySize, color;
-       marigin = HUD_Panel_GetMarigin(8);
-       pos = HUD_Panel_GetPos(8);
-       mySize = HUD_Panel_GetSize(8);
-       color = HUD_Panel_GetColor(8);
-
-       if(HUD_Panel_GetBgActive(8))
-               draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
-
-       drawfont = hud_bigfont;
-       float a, t;
-       string s, forcetime;
-
-       if(race_checkpointtime)
-       {
-               a = bound(0, 2 - (time - race_checkpointtime), 1);
-               s = "";
-               forcetime = "";
-               if(a > 0) // just hit a checkpoint?
-               {
-                       if(race_checkpoint != 254)
-                       {
-                               if(race_time && race_previousbesttime)
-                                       s = MakeRaceString(race_checkpoint, TIME_DECODE(race_time) - TIME_DECODE(race_previousbesttime), 0, 0, race_previousbestname);
-                               else
-                                       s = MakeRaceString(race_checkpoint, 0, -1, 0, race_previousbestname);
-                               if(race_time)
-                                       forcetime = TIME_ENCODED_TOSTRING(race_time);
-                       }
-               }
-               else
-               {
-                       if(race_laptime && race_nextbesttime && race_nextcheckpoint != 254)
-                       {
-                               a = bound(0, 2 - ((race_laptime + TIME_DECODE(race_nextbesttime)) - (time + TIME_DECODE(race_penaltyaccumulator))), 1);
-                               if(a > 0) // next one?
-                               {
-                                       s = MakeRaceString(race_nextcheckpoint, (time + TIME_DECODE(race_penaltyaccumulator)) - race_laptime, TIME_DECODE(race_nextbesttime), 0, race_nextbestname);
-                               }
-                       }
-               }
-
-               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_alpha_fg * a, DRAWFLAG_NORMAL);
-                       drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.25 * mySize_y) + eY * 0.75 * mySize_y, s, '1 1 0' * 0.25 * mySize_y, hud_alpha_fg * a, DRAWFLAG_NORMAL);
-               }
-
-               if(race_penaltytime)
-               {
-                       a = bound(0, 2 - (time - race_penaltyeventtime), 1);
-                       if(a > 0)
-                       {
-                               s = strcat("^1PENALTY: ", ftos_decimals(race_penaltytime * 0.1, 1), " (", race_penaltyreason, ")");
-                               dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
-                               //drawcolorcodedstring(m - '0 32 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', hud_alpha_fg * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos - '0 32 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', hud_alpha_fg * 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_alpha_fg, 0, a);
-                       drawstring_expanding(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(forcetime, FALSE, '1 1 0' * 0.75 * mySize_y), forcetime, '1 1 0' * 0.75 * mySize_y, '1 1 1', hud_alpha_fg, 0, a);
-               }
-               else
-                       a = 1;
-
-               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_alpha_fg * a, DRAWFLAG_NORMAL);
-                       drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.75 0.75 0' * mySize_y), s, '0.75 0.75 0' * mySize_y, '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL);
-               }
-       }
-       else
-       {
-               if(race_mycheckpointtime)
-               {
-                       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_alpha_fg * a, DRAWFLAG_NORMAL);
-                       drawcolorcodedstring(pos - '0 16 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', hud_alpha_fg * 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_alpha_fg * a, DRAWFLAG_NORMAL);
-                       drawcolorcodedstring(pos - '0 0 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', hud_alpha_fg * a, DRAWFLAG_NORMAL);
-               }
-
-               if(race_penaltytime && !race_penaltyaccumulator)
-               {
-                       t = race_penaltytime * 0.1 + race_penaltyeventtime;
-                       a = bound(0, (1 + t - time), 1);
-                       if(a > 0)
-                       {
-                               if(time < t)
-                                       s = strcat("^1PENALTY: ", ftos_decimals(t - time, 1), " (", race_penaltyreason, ")");
-                               else
-                                       s = strcat("^2PENALTY: 0.0 (", race_penaltyreason, ")");
-                               dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
-                               //drawcolorcodedstring(m - '0 32 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', hud_alpha_fg * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(pos - '0 32 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', hud_alpha_fg * a, DRAWFLAG_NORMAL);
-                       }
-               }
-       }
-
-       drawfont = hud_font;
-}
-
-// Notification area (#4)
-void HUD_Notify (void)
-{
-       float marigin;
-
-       vector pos, mySize, color;
-       marigin = HUD_Panel_GetMarigin(4);
-       pos = HUD_Panel_GetPos(4);
-       mySize = HUD_Panel_GetSize(4);
-       color = HUD_Panel_GetColor(4);
-
-       if(HUD_Panel_GetBgActive(4))
-               draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
-
-       string s;
-       entity tm;
-       if(spectatee_status && !intermission)
-       {
-               drawfont = hud_bigfont;
-               if(spectatee_status == -1)
-                       s = "^1Observing";
-               else
-                       s = GetPlayerName(spectatee_status - 1);
-               // spectated player name between HUD and chat area, aligned to the left
-               pos_x = 0;
-               pos_y = - 50 - hud_fontsize_spec_y;
-               s = textShortenToWidth(s, vid_conwidth/2.5, hud_fontsize_spec, stringwidth_colors);
-               drawcolorcodedstring(pos, s, hud_fontsize_spec, hud_alpha_fg, 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(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");
-
-               s = strcat("^1Press ^3", getcommandkey("server info", "+show_info"), "^1 for gamemode info");
-
-               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");
-
-               //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");
-               }
-       }
-       if(warmup_stage && !intermission)
-       {
-               s = "^2Currently in ^1warmup^2 stage!";
-       }
-
-       // move more important stuff more to the middle so its more visible
-
-       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...");
-               }
-       }
-       else if(warmup_stage && !intermission && !spectatee_status)
-       {
-               s = strcat("^2Press ^3", getcommandkey("ready", "ready"), "^2 to end warmup");
-       }
-
-       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");
-
-                       }
-               }
-       }
-}
-
-// Vote window (#9)
-float vote_yescount;
-float vote_nocount;
-float vote_needed;
-float vote_highlighted; // currently selected vote
-
-float vote_active; // is there an active vote?
-float vote_prev; // previous state of vote_active to check for a change
-float vote_alpha;
-float vote_change; // "time" when vote_active changed
-
-void HUD_VoteWindow(void) 
-{
-       float marigin;
-
-       vector pos, mySize, color;
-       marigin = HUD_Panel_GetMarigin(9);
-       pos = HUD_Panel_GetPos(9);
-       mySize = HUD_Panel_GetSize(9);
-       color = HUD_Panel_GetColor(9);
-
-       string s;
-       float a;
-       if(vote_active != vote_prev) {
-               vote_change = time;
-               vote_prev = bound(0, vote_active, 1);
-       }
-
-       if(vote_active)
-               vote_alpha = bound(0, (time - vote_change) * 2, 1);
-       else
-               vote_alpha = bound(0, 1 - (time - vote_change) * 2, 1);
-
-       if(HUD_Panel_GetBgActive(9))
-               draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg * vote_alpha, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
-
-       if(vote_alpha) {
-               a = vote_alpha * bound(cvar_or("hud_vote_alreadyvoted_alpha", 0.75), 1 - vote_highlighted, 1);
-
-               drawpic(pos, "gfx/hud/voteprogress_back", mySize, HUD_GetBgColor(), a * hud_alpha_bg, DRAWFLAG_NORMAL);
-
-               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_alpha_fg, DRAWFLAG_NORMAL);
-               s = textShortenToWidth(vote_called_vote, mySize_x * 0.96, '10 0 0', stringwidth_colors);
-               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_alpha_fg, 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_alpha_fg, 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_alpha_fg, DRAWFLAG_NORMAL);
-
-               // draw the progress bars
-               drawsetcliparea(pos_x, pos_y, mySize_x * 0.5 * (vote_yescount/vote_needed), mySize_y);
-               drawpic(pos, "gfx/hud/voteprogress_prog", mySize, eY, a * hud_alpha_fg, DRAWFLAG_NORMAL);
-
-               drawsetcliparea(pos_x + mySize_x - mySize_x * 0.5 * (vote_nocount/vote_needed), pos_y, mySize_x * 0.5, mySize_y);
-               drawpic(pos, "gfx/hud/voteprogress_prog", mySize, eX, a * hud_alpha_fg, DRAWFLAG_NORMAL);
-
-               // draw the highlights
-               if(vote_highlighted == 1) {
-                       drawsetcliparea(pos_x, pos_y, mySize_x * 0.5, mySize_y);
-                       drawpic(pos, "gfx/hud/voteprogress_voted", mySize, eY, a * hud_alpha_fg, DRAWFLAG_NORMAL);
-               }
-               else if(vote_highlighted == 2) {
-                       drawsetcliparea(pos_x + 0.5 * mySize_x, pos_y, mySize_x * 0.5, mySize_y);
-                       drawpic(pos, "gfx/hud/voteprogress_voted", mySize, eX, a * hud_alpha_fg, DRAWFLAG_NORMAL);
-               }
-
-               drawresetcliparea();
-       }
-       else if(!vote_active) {
-               vote_highlighted = 0;
-       }
-}
-
-// Awards system
-float race_status_time;
-float race_status_prev;
-string race_status_name_prev;
-void HUD_DrawRaceStatus(vector pos)
-{
-       if (race_status != race_status_prev || race_status_name != race_status_name_prev) {
-               race_status_time = time + 5;
-               race_status_prev = race_status;
-               if (race_status_name_prev)
-                       strunzone(race_status_name_prev);
-               race_status_name_prev = strzone(race_status_name);
-       }
-
-       float a;
-       a = bound(0, race_status_time - time, 1);
-
-       string s;
-       s = textShortenToWidth(race_status_name, 120, '10 10 0', stringwidth_colors);
-
-       float rank;
-       if(race_status > 0)
-               rank = race_CheckName(race_status_name);
-       string rankname;
-       rankname = race_PlaceName(rank);
-
-       if(race_status == 0)
-               drawpic(pos, "gfx/hud/race/newfail", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL);
-       else if(race_status == 1) {
-               drawpic(pos, "gfx/hud/race/newtime", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL);
-               drawcolorcodedstring(pos + '40 80 0' - eX * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', hud_alpha_fg * a, DRAWFLAG_NORMAL);
-               drawstring(pos + '40 20 0' - eX * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL);
-       } else if(race_status == 2) {
-               if(race_status_name == GetPlayerName(player_localentnum -1) || !race_myrank || race_myrank < rank)
-                       drawpic(pos, "gfx/hud/race/newrankgreen", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL);
-               else
-                       drawpic(pos, "gfx/hud/race/newrankyellow", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL);
-               drawcolorcodedstring(pos + '40 80 0' - eX * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', hud_alpha_fg * a, DRAWFLAG_NORMAL);
-               drawstring(pos + '40 20 0' - eX * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL);
-       } else if(race_status == 3) {
-               drawpic(pos, "gfx/hud/race/newrecordserver", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL);
-               drawcolorcodedstring(pos + '40 80 0' - eX * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', hud_alpha_fg * a, DRAWFLAG_NORMAL);
-               drawstring(pos + '40 20 0' - eX * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL);
-       }
-
-       if (race_status_time - time <= 0) {
-               race_status_prev = -1;
-               race_status = -1;
-               if(race_status_name)
-                       strunzone(race_status_name);
-               race_status_name = string_null;
-               if(race_status_name_prev)
-                       strunzone(race_status_name_prev);
-               race_status_name_prev = string_null;
-       }
-}
-
-// CTF HUD modicon section
-float redflag_prevframe, blueflag_prevframe; // status during previous frame
-float redflag_prevstatus, blueflag_prevstatus; // last remembered status
-float redflag_statuschange_time, blueflag_statuschange_time; // time when the status changed
-
-void CSQC_ctf_hudreset(void)
-{
-       redflag_prevstatus = blueflag_prevstatus = redflag_prevframe = blueflag_prevframe = redflag_statuschange_time = blueflag_statuschange_time = 0;
-}
-
-void CSQC_ctf_hud(void)
-{
-       vector bottomleft, redflag_pos, blueflag_pos, sz;
-       float f; // every function should have that
-       bottomleft_y = vid_conheight;
-       bottomleft_z = 0;
-
-       float redflag, blueflag; // current status
-       float redflag_statuschange_elapsedtime, blueflag_statuschange_elapsedtime; // time since the status changed
-       float stat_items;
-
-       stat_items = getstati(STAT_ITEMS);
-       redflag = (stat_items/IT_RED_FLAG_TAKEN) & 3;
-       blueflag = (stat_items/IT_BLUE_FLAG_TAKEN) & 3;
-
-       // when status CHANGES, set old status into prevstatus and current status into status
-       if (redflag != redflag_prevframe)
-       {
-               redflag_statuschange_time = time;
-               redflag_prevstatus = redflag_prevframe;
-               redflag_prevframe = redflag;
-       }
-
-       if (blueflag != blueflag_prevframe)
-       {
-               blueflag_statuschange_time = time;
-               blueflag_prevstatus = blueflag_prevframe;
-               blueflag_prevframe = blueflag;
-       }
-
-       redflag_statuschange_elapsedtime = time - redflag_statuschange_time;
-       blueflag_statuschange_elapsedtime = time - blueflag_statuschange_time;
-
-       float BLINK_FACTOR = 0.15;
-       float BLINK_BASE = 0.85;
-       // note:
-       //   RMS = sqrt(BLINK_BASE^2 + 0.5 * BLINK_FACTOR^2)
-       // thus
-       //   BLINK_BASE = sqrt(RMS^2 - 0.5 * BLINK_FACTOR^2)
-       // ensure RMS == 1
-       float BLINK_FREQ = 5; // circle frequency, = 2*pi*frequency in hertz
-
-       string red_icon, red_icon_prevstatus;
-       float red_alpha, red_alpha_prevstatus;
-       red_alpha = red_alpha_prevstatus = 1;
-       switch(redflag) {
-               case 1: red_icon = "gfx/hud/sb_flag_red_taken"; break;
-               case 2: red_icon = "gfx/hud/sb_flag_red_lost"; break;
-               case 3: red_icon = "gfx/hud/sb_flag_red_carrying"; red_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;
-               default:
-                       if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM2))
-                               red_icon = "gfx/hud/sb_flag_red_shielded";
-                       else
-                               red_icon = string_null;
-                       break;
-       }
-       switch(redflag_prevstatus) {
-               case 1: red_icon_prevstatus = "gfx/hud/sb_flag_red_taken"; break;
-               case 2: red_icon_prevstatus = "gfx/hud/sb_flag_red_lost"; break;
-               case 3: red_icon_prevstatus = "gfx/hud/sb_flag_red_carrying"; red_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;
-               default:
-                       if(redflag == 3)
-                               red_icon_prevstatus = "gfx/hud/sb_flag_red_carrying"; // make it more visible
-                       else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM2))
-                               red_icon_prevstatus = "gfx/hud/sb_flag_red_shielded";
-                       else
-                               red_icon_prevstatus = string_null;
-                       break;
-       }
-
-       string blue_icon, blue_icon_prevstatus;
-       float blue_alpha, blue_alpha_prevstatus;
-       blue_alpha = blue_alpha_prevstatus = 1;
-       switch(blueflag) {
-               case 1: blue_icon = "gfx/hud/sb_flag_blue_taken"; break;
-               case 2: blue_icon = "gfx/hud/sb_flag_blue_lost"; break;
-               case 3: blue_icon = "gfx/hud/sb_flag_blue_carrying"; blue_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;
-               default:
-                       if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1))
-                               blue_icon = "gfx/hud/sb_flag_blue_shielded";
-                       else
-                               blue_icon = string_null;
-                       break;
-       }
-       switch(blueflag_prevstatus) {
-               case 1: blue_icon_prevstatus = "gfx/hud/sb_flag_blue_taken"; break;
-               case 2: blue_icon_prevstatus = "gfx/hud/sb_flag_blue_lost"; break;
-               case 3: blue_icon_prevstatus = "gfx/hud/sb_flag_blue_carrying"; blue_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;
-               default:
-                       if(blueflag == 3)
-                               blue_icon_prevstatus = "gfx/hud/sb_flag_blue_carrying"; // make it more visible
-                       else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1))
-                               blue_icon_prevstatus = "gfx/hud/sb_flag_blue_shielded";
-                       else
-                               blue_icon_prevstatus = string_null;
-                       break;
-       }
-
-       if (myteam == COLOR_TEAM1) { // always draw own flag on left
-               redflag_pos = bottomleft - '-4 50 0';
-               blueflag_pos = bottomleft - '-62 50 0';
-       } else {
-               blueflag_pos = bottomleft - '-4 50 0';
-               redflag_pos = bottomleft - '-62 50 0';
-       }
-
-       sz = '52 52 0';
-
-       f = bound(0, redflag_statuschange_elapsedtime*2, 1);
-       if(red_icon_prevstatus && f < 1)
-               drawpic_expanding(redflag_pos, red_icon_prevstatus, sz, '1 1 1', hud_alpha_fg * red_alpha_prevstatus, DRAWFLAG_NORMAL, f);
-       if(red_icon)
-               drawpic(redflag_pos, red_icon, sz, '1 1 1', hud_alpha_fg * red_alpha * f, DRAWFLAG_NORMAL);
-
-       f = bound(0, blueflag_statuschange_elapsedtime*2, 1);
-       if(blue_icon_prevstatus && f < 1)
-               drawpic_expanding(blueflag_pos, blue_icon_prevstatus, sz, '1 1 1', hud_alpha_fg * blue_alpha_prevstatus, DRAWFLAG_NORMAL, f);
-       if(blue_icon)
-               drawpic(blueflag_pos, blue_icon, sz, '1 1 1', hud_alpha_fg * blue_alpha * f, DRAWFLAG_NORMAL);
-}
-
-/*void HUD_Mod_Race (void) {
-       if((scores_flags[ps_primary] & SFL_TIME) && !teamplay) { // race/cts record display on HUD
-               pl = players.sort_next;
-               if(pl == me)
-                       pl = pl.sort_next;
-               if(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)
-                       if(pl.scores[ps_primary] == 0)
-                               pl = world;
-
-               score = me.(scores[ps_primary]);
-
-               float racemin, racesec, racemsec;
-               float distsec, distmsec, minusplus;
-
-               racemin = floor(score/(60 * TIME_FACTOR));
-               racesec = floor((score - racemin*(60 * TIME_FACTOR))/TIME_FACTOR);
-               racemsec = score - racemin*60*TIME_FACTOR - racesec*TIME_FACTOR;
-
-               if (pl && ((!(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)) || score)) {
-                       // distribution display
-                       distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]);
-
-                       if (distribution < TIME_FACTOR && distribution > -TIME_FACTOR)
-                               distmsec = fabs(distribution);
-                       else {
-                               distsec = floor(fabs(distribution)/TIME_FACTOR);
-                               distmsec = fabs(distribution) - distsec*TIME_FACTOR;
-                               if (distribution < 0)
-                                       distsec = -distsec;
-                       }
-
-                       if (distribution <= 0) {
-                               distribution_color = eY;
-                               minusplus = 1; // minusplus 1: always prefix with minus sign
-                       }
-                       else {
-                               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_alpha_fg, DRAWFLAG_NORMAL);
-                       HUD_DrawXNum(bottomright - '68 48 0' - '16 0 0' * TIME_DECIMALS, distsec, 4, minusplus, 16, distribution_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
-                       drawpic(bottomright - '10 48 0' - '16 0 0' * TIME_DECIMALS, "gfx/hud/num_dot", '16 16 0', distribution_color, hud_alpha_fg, DRAWFLAG_ADDITIVE);
-               }
-               // race record display
-               if (distribution <= 0 || distribution == score) // draw the highlight background behind the timer if we have the lead
-                       drawpic(bottomright - '0 32 0' - '32 0 0' * (4 + TIME_DECIMALS), "gfx/hud/sb_highlight_4", '0 28 0' + '32 0 0' * (4 + TIME_DECIMALS), '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-
-               HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0', racemsec, -TIME_DECIMALS, 0, 30, '1 1 1', 0, 0, hud_alpha_fg, 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_alpha_fg, DRAWFLAG_NORMAL);
-               drawpic(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '18 0 0', "gfx/hud/num_dot", '30 30 0', '1 1 1', hud_alpha_fg, 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_alpha_fg, DRAWFLAG_NORMAL);
-               drawpic(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '84 0 0', "gfx/hud/num_colon", '30 30 0', '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE);
-       }
-}*/
-
-// Keyhunt HUD modicon section
-float kh_runheretime;
-
-void CSQC_kh_hudreset(void)
-{
-       kh_runheretime = 0;
-}
-
-void CSQC_kh_hud(void)
-{
-       float kh_keys;
-       float keyteam;
-       float a, aa;
-       vector p, pa, kh_size, kh_asize;
-
-       p_x = 6;
-       p_y = vid_conheight - 34 - 3;
-       p_z = 0;
-
-       kh_keys = getstati(STAT_KH_KEYS);
-
-       kh_size = '19 34 0';
-       kh_asize = '19 10 0';
-       pa = p + '0 -10 0';
-
-       float i, key;
-
-       float keycount;
-       keycount = 0;
-       for(i = 0; i < 4; ++i)
-       {
-               key = floor(kh_keys / pow(32, i)) & 31;
-               keyteam = key - 1;
-               if(keyteam == 30 && keycount <= 4)
-                       keycount += 4;
-               if(keyteam == myteam || keyteam == -1 || keyteam == 30)
-                       keycount += 1;
-       }
-       // this yields 8 exactly if "RUN HERE" shows
-
-       if(keycount == 8)
-       {
-               if(!kh_runheretime)
-                       kh_runheretime = time;
-               pa_y -= fabs(sin((time - kh_runheretime) * 3.5)) * 6; // make the arrows jump in case of RUN HERE
-       }
-       else
-               kh_runheretime = 0;
-
-       for(i = 0; i < 4; ++i)
-       {
-               key = floor(kh_keys / pow(32, i)) & 31;
-               keyteam = key - 1;
-               switch(keyteam)
-               {
-                       case 30: // my key
-                               keyteam = myteam;
-                               a = 1;
-                               aa = 1;
-                               break;
-                       case -1: // no key
-                               a = 0;
-                               aa = 0;
-                               break;
-                       default: // owned or dropped
-                               a = 0.2;
-                               aa = 0.5;
-                               break;
-               }
-               a = a * hud_alpha_fg;
-               aa = aa * hud_alpha_fg;
-               if(a > 0)
-               {
-                       switch(keyteam)
-                       {
-                               case COLOR_TEAM1:
-                                       drawpic (pa, "gfx/hud/sb_kh_redarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                               case COLOR_TEAM2:
-                                       drawpic (pa, "gfx/hud/sb_kh_bluearrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                               case COLOR_TEAM3:
-                                       drawpic (pa, "gfx/hud/sb_kh_yellowarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                               case COLOR_TEAM4:
-                                       drawpic (pa, "gfx/hud/sb_kh_pinkarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                               default:
-                                       break;
-                       }
-                       switch(i) // YAY! switch(i) inside a for loop for i. DailyWTF, here we come!
-                       {
-                               case 0:
-                                       drawpic (p, "gfx/hud/sb_kh_red", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                               case 1:
-                                       drawpic (p, "gfx/hud/sb_kh_blue", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                               case 2:
-                                       drawpic (p, "gfx/hud/sb_kh_yellow", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                               case 3:
-                                       drawpic (p, "gfx/hud/sb_kh_pink", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                       }
-               }
-               p_x += 24;
-               pa_x += 24;
-       }
-}
-
-// Nexball HUD modicon section
-#define NBPB_SIZE '96 38 0'
-#define NBPB_BT 2                   //thickness
-#define NBPB_BRGB '1 1 1'
-#define NBPB_BALPH 1                //alpha
-#define NBPB_BFLAG DRAWFLAG_NORMAL
-#define NBPB_IALPH 0.4
-#define NBPB_IFLAG DRAWFLAG_NORMAL
-#define NBPB_IRGB '0.7 0.1 0'
-
-void CSQC_nb_hud(void)
-{
-       float stat_items, nb_pb_starttime, dt, p;
-       vector pos;
-
-       stat_items = getstati(STAT_ITEMS);
-       nb_pb_starttime = getstatf(STAT_NB_METERSTART);
-
-       pos_x = 4;
-       pos_y = vid_conheight - 42;
-       pos_z = 0;
-
-       //Manage the progress bar if any
-       if (nb_pb_starttime > 0)
-       {
-               vector s;
-               dt = mod(time - nb_pb_starttime, nb_pb_period);
-               // one period of positive triangle
-               p = 2 * dt / nb_pb_period;
-               if (p > 1)
-                       p = 2 - p;
-
-               s = NBPB_SIZE;
-               //Draw the filling
-               drawfill(pos, p * s_x * eX + s_y * eY, NBPB_IRGB, NBPB_IALPH, NBPB_IFLAG);
-
-               //Draw the box
-               s = NBPB_SIZE;
-               drawline(NBPB_BT, pos    , pos + eX * s_x, NBPB_BRGB, NBPB_BALPH, NBPB_BFLAG);
-               drawline(NBPB_BT, pos    , pos + eY * s_y, NBPB_BRGB, NBPB_BALPH, NBPB_BFLAG);
-               drawline(NBPB_BT, pos + s, pos + eX * s_x, NBPB_BRGB, NBPB_BALPH, NBPB_BFLAG);
-               drawline(NBPB_BT, pos + s, pos + eY * s_y, NBPB_BRGB, NBPB_BALPH, NBPB_BFLAG);
-       }
-
-       pos_x += 12; //horizontal margin to the picture
-       pos_y += 2; //vertical margin to the picture
-
-       if (stat_items & IT_KEY1)
-               drawpic(pos, "gfx/hud/sb_nexball_carrying", '80 34 0', '1 1 1', 1, DRAWFLAG_NORMAL);
-}
-
-// Race/CTS HUD modicon section
-float crecordtime_prev; // last remembered crecordtime
-float crecordtime_change_time; // time when crecordtime last changed
-float srecordtime_prev; // last remembered srecordtime
-float srecordtime_change_time; // time when srecordtime last changed
-void CSQC_race_hud(void)
-{
-       entity me;
-       me = playerslots[player_localentnum - 1];
-       float t, score;
-       float f; // yet another function has this
-       score = me.(scores[ps_primary]);
-
-       if not((scores_flags[ps_primary] & SFL_TIME) && !teamplay) // race/cts record display on HUD
-               return; // no records in the actual race
-
-       drawfont = hud_bigfont;
-       vector pos;
-       pos_x = 2;
-       pos_y = vid_conheight - 48;
-
-       // clientside personal record
-       string rr;
-       if(gametype == GAME_CTS)
-               rr = CTS_RECORD;
-       else
-               rr = RACE_RECORD;
-       t = stof(db_get(ClientProgsDB, strcat(shortmapname, rr, "time")));
-
-       if(score && score < t || !t)
-               db_put(ClientProgsDB, strcat(shortmapname, rr, "time"), ftos(score));
-
-       if(t != crecordtime_prev) {
-               crecordtime_prev = t;
-               crecordtime_change_time = time;
-       }
-       f = time - crecordtime_change_time;
-
-       if (f > 1) {
-               drawstring(pos, "Personal best ", '10 10 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-               drawstring(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-       } else {
-               drawstring(pos, "Personal best ", '10 10 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-               drawstring(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-               drawstring_expanding(pos, "Personal best ", '10 10 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL, f);
-               drawstring_expanding(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL, f);
-       }
-
-       // server record
-       pos_y += 26;
-       t = race_server_record;
-       if(t != srecordtime_prev) {
-               srecordtime_prev = t;
-               srecordtime_change_time = time;
-       }
-       f = time - srecordtime_change_time;
-
-       if (f > 1) {
-               drawstring(pos, "Server best ", '10 10 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-               drawstring(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-       } else {
-               drawstring(pos, "Server best ", '10 10 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-               drawstring(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-               drawstring_expanding(pos, "Server best ", '10 10 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL, f);
-               drawstring_expanding(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL, f);
-       }
-       drawfont = hud_font;
-}
-
-// Timer (#5)
-//
-void HUD_Timer()
-{
-       float marigin;
-
-       vector pos, mySize, color;
-       marigin = HUD_Panel_GetMarigin(5);
-       pos = HUD_Panel_GetPos(5);
-       mySize = HUD_Panel_GetSize(5);
-       color = HUD_Panel_GetColor(5);
-
-       if(HUD_Panel_GetBgActive(5))
-               draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
-
-       float timelimit, elapsedTime, minutes, seconds, timeleft, minutesLeft, secondsLeft;
-
-       timelimit = getstatf(STAT_TIMELIMIT);
-
-       HUD_DrawRaceStatus(pos + '0 30 0');
-
-       timeleft = max(0, timelimit * 60 + getstatf(STAT_GAMESTARTTIME) - time);
-       timeleft = ceil(timeleft);
-       minutesLeft = floor(timeleft / 60);
-       secondsLeft = timeleft - minutesLeft*60;
-
-       vector timer_color;
-       if(minutesLeft >= 5 || warmup_stage || timelimit == 0) //don't use red or yellow in warmup or when there is no timelimit
-               timer_color = '1 1 1'; //white
-       else if(minutesLeft >= 1)
-               timer_color = '1 1 0'; //yellow
-       else
-               timer_color = '1 0 0'; //red
-
-       if (cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) {
-               if (time < getstatf(STAT_GAMESTARTTIME)) {
-                       //while restart is still active, show 00:00
-                       minutes = seconds = 0;
-               } else {
-                       elapsedTime = floor(time - getstatf(STAT_GAMESTARTTIME)); //127
-                       minutes = floor(elapsedTime / 60);
-                       seconds = elapsedTime - minutes*60;
-               }
-       } else {
-               minutes = minutesLeft;
-               seconds = secondsLeft;
-       }
-
-       if(mySize_x/mySize_y > 5.1)
-       {
-               if(minutes > 999)
-                       seconds = 99;
-               minutes = min(minutes, 999);
-               if(minutesLeft >= 1 || cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) {
-                       if(minutes < 100)
-                               drawpic(pos + eX * mySize_x - eX * 5.1 * mySize_y, "gfx/hud/sb_timer", '1 1 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL);
-                       HUD_DrawXNum(pos + eX * mySize_x - eX * 5.1 * mySize_y, minutes, 3, 0, mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
-                       drawpic(pos + eX * mySize_x - eX * 2.57 * mySize_y, "gfx/hud/num_colon", '1 1 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL);
-               }
-               HUD_DrawXNum(pos + eX * mySize_x - eX * 2 * mySize_y, seconds, -2, 0, mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
-       }
-       else
-       {
-               if(minutes > 99)
-                       seconds = 99;
-               minutes = min(minutes, 99);
-               if(minutesLeft >= 1 || cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) {
-                       if(minutes < 100)
-                               drawpic(pos + eX * 0.5 * mySize_x - eX * 0.5 * 0.5 * mySize_y, "gfx/hud/sb_timer", '0.5 0.5 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL);
-                       HUD_DrawXNum(pos + eX * 0.5 * mySize_x - eX * mySize_y + eY * 0.5 * mySize_y, minutes, -2, 0, 0.5 * mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
-                       drawpic(pos + eX * 0.5 * mySize_x - eX * 0.5 * 0.5 * mySize_y + eY * 0.5 * mySize_y, "gfx/hud/num_colon", '0.5 0.5 0' * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL);
-               }
-               HUD_DrawXNum(pos + eX * 0.51 * mySize_x + eY * 0.5 * mySize_y, seconds, -2, 0, 0.5 * mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
-       }
-}
-
-// Radar (#6)
-//
-
-void HUD_Radar(void)
-{
-       float marigin;
-
-       vector pos, mySize, color;
-       marigin = HUD_Panel_GetMarigin(6);
-       pos = HUD_Panel_GetPos(6);
-       mySize = HUD_Panel_GetSize(6);
-       color = HUD_Panel_GetColor(6);
-
-       if(HUD_Panel_GetBgActive(6))
-               draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
-
-       local float color1, color2; // color already declared as a global in hud.qc
-       local vector rgb;
-       local entity tm;
-       float scale2d, normalsize, bigsize;
-       float f;
-
-       teamradar_origin2d = pos + 0.5 * mySize; // TODO: stupid compat, should be removed
-       teamradar_size2d = mySize;
-
-       if(minimapname == "" && !ons_showmap)
-               return;
-
-       teamradar_loadcvars();
-
-       switch(cl_teamradar_zoommode)
-       {
-               default:
-               case 0:
-                       f = current_zoomfraction;
-                       break;
-               case 1:
-                       f = 1 - current_zoomfraction;
-                       break;
-               case 2:
-                       f = 0;
-                       break;
-               case 3:
-                       f = 1;
-                       break;
-       }
-
-       switch(cl_teamradar_rotation)
-       {
-               case 0:
-                       teamradar_angle = view_angles_y - 90;
-                       break;
-               default:
-                       teamradar_angle = 90 * cl_teamradar_rotation;
-                       break;
-       }
-
-       scale2d = vlen_maxnorm2d(mi_picmax - mi_picmin);
-       teamradar_size2d = mySize;
-
-       teamradar_extraclip_mins = teamradar_extraclip_maxs = '0 0 0';
-       if(pos == eX * vid_conwidth)
-       {
-               if(cl_teamradar_nohudhack < 2)
-                       pos_y += 25;
-               if(cl_teamradar_nohudhack < 1)
-                       teamradar_extraclip_mins_y -= 25;
-       }
-       else if(pos == eY * vid_conheight || pos == eX * vid_conwidth + eY * vid_conheight)
-       {
-               if(cl_teamradar_nohudhack < 2)
-                       pos_y -= 50;
-               //if(cl_teamradar_nohudhack < 1)
-                       //teamradar_extraclip_size_y += 50; // don't, the HUD looks nice
-       }
-
-       // pixels per world qu to match the teamradar_size2d_x range in the longest dimension
-       if(cl_teamradar_rotation == 0)
-       {
-               // max-min distance must fit the radar in any rotation
-               bigsize = vlen_minnorm2d(teamradar_size2d) * scale2d / (1.05 * vlen2d(mi_max - mi_min));
-       }
-       else
-       {
-               vector c0, c1, c2, c3, span;
-               c0 = rotate(mi_min, teamradar_angle * DEG2RAD);
-               c1 = rotate(mi_max, teamradar_angle * DEG2RAD);
-               c2 = rotate('1 0 0' * mi_min_x + '0 1 0' * mi_max_y, teamradar_angle * DEG2RAD);
-               c3 = rotate('1 0 0' * mi_max_x + '0 1 0' * mi_min_y, teamradar_angle * DEG2RAD);
-               span = '0 0 0';
-               span_x = max4(c0_x, c1_x, c2_x, c3_x) - min4(c0_x, c1_x, c2_x, c3_x);
-               span_y = max4(c0_y, c1_y, c2_y, c3_y) - min4(c0_y, c1_y, c2_y, c3_y);
-
-               // max-min distance must fit the radar in x=x, y=y
-               bigsize = min(
-                       teamradar_size2d_x * scale2d / (1.05 * span_x),
-                       teamradar_size2d_y * scale2d / (1.05 * span_y)
-               );
-       }
-
-       normalsize = vlen_maxnorm2d(teamradar_size2d) * scale2d / cl_teamradar_scale;
-       if(bigsize > normalsize)
-               normalsize = bigsize;
-
-       teamradar_size =
-                 f * bigsize
-               + (1 - f) * normalsize;
-       teamradar_origin3d_in_texcoord = teamradar_3dcoord_to_texcoord(
-                 f * (mi_min + mi_max) * 0.5
-               + (1 - f) * view_origin);
-
-       color1 = GetPlayerColor(player_localentnum-1);
-       rgb = GetTeamRGB(color1);
-
-       drawsetcliparea(
-               pos_x,
-               pos_y,
-               pos_x + mySize_x,
-               pos_y + mySize_y
-       );
-
-       draw_teamradar_background(cl_teamradar_background_alpha, cl_teamradar_foreground_alpha);
-
-       if(ons_showmap)
-       {
-               drawresetcliparea();
-
-               vector frame_origin, frame_size;
-               frame_origin = frame_size = '0 0 0';
-
-               frame_origin_x = pos_x - teamradar_size2d_x * 0.55859375; // matches the picture
-               frame_origin_y = pos_y - teamradar_size2d_y * 0.55859375; // matches the picture
-               frame_size_x = pos_x * 1.1171875; // matches the picture
-               frame_size_y = pos_y * 1.1171875; // matches the picture
-               drawpic(frame_origin, "gfx/ons-frame.tga", frame_size, '1 1 1', hud_alpha_fg, 0);
-               drawpic(frame_origin, "gfx/ons-frame-team.tga", frame_size, rgb, hud_alpha_fg, 0);
-
-               drawsetcliparea(
-                       pos_x - teamradar_size2d_x * 0.5,
-                       pos_y - teamradar_size2d_y * 0.5,
-                       teamradar_size2d_x,
-                       teamradar_size2d_y
-               );
-       }
-
-       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_alpha_fg);
-       for(tm = world; (tm = find(tm, classname, "entcs_receiver")); )
-       {
-               color2 = GetPlayerColor(tm.sv_entnum);
-               //if(color == COLOR_SPECTATOR || color == color2)
-                       draw_teamradar_player(tm.origin, tm.angles, GetTeamRGB(color2));
-       }
-       draw_teamradar_player(view_origin, view_angles, '1 1 1');
-
-       drawresetcliparea();
-};
-
-/*
-==================
-Main HUD system
-==================
-*/
-
-void HUD_DrawPressedKeys(void)
-{
-       float marigin;
-
-       vector pos, mySize, color;
-       marigin = HUD_Panel_GetMarigin(10);
-       pos = HUD_Panel_GetPos(10);
-       mySize = HUD_Panel_GetSize(10);
-       color = HUD_Panel_GetColor(10);
-
-       if(HUD_Panel_GetBgActive(10))
-               draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
-
-       float pressedkeys;
-
-       pressedkeys = getstatf(STAT_PRESSED_KEYS);
-       drawpic(pos, "gfx/hud/keys/key_bg.tga",           mySize, '1 1 1', 0.1 * hud_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + eX * mySize_x - eX * 0.22 * mySize_x +       eY * 0.195 * mySize_y, ((pressedkeys & KEY_CROUCH) ? "gfx/hud/keys/key_crouch_inv.tga" : "gfx/hud/keys/key_crouch.tga"),        '1 1 0' * (1/3) * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + eX * 0.5 * mySize_x - eX * 0.23 * mySize_y + eY * 0.040 * mySize_y, ((pressedkeys & KEY_FORWARD) ? "gfx/hud/keys/key_forward_inv.tga" : "gfx/hud/keys/key_forward.tga"),     '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + eX * 0.023 * mySize_x +                      eY * 0.195 * mySize_y, ((pressedkeys & KEY_JUMP) ? "gfx/hud/keys/key_jump_inv.tga" : "gfx/hud/keys/key_jump.tga"),              '1 1 0' * (1/3) * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + eX * 0.1 * mySize_x +                        eY * 0.486 * mySize_y, ((pressedkeys & KEY_LEFT) ? "gfx/hud/keys/key_left_inv.tga" : "gfx/hud/keys/key_left.tga"),              '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + eX * 0.5 * mySize_x - eX * 0.23 * mySize_y + eY * 0.486 * mySize_y, ((pressedkeys & KEY_BACKWARD) ? "gfx/hud/keys/key_backward_inv.tga" : "gfx/hud/keys/key_backward.tga"),  '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + eX * mySize_x - eX * 0.372 * mySize_x +      eY * 0.486 * mySize_y, ((pressedkeys & KEY_RIGHT) ? "gfx/hud/keys/key_right_inv.tga" : "gfx/hud/keys/key_right.tga"),           '1 1 0' * 0.46 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-}
-
-void HUD_ShowSpeed(void)
-{
-       vector numsize;
-       float pos, conversion_factor;
-       string speed, zspeed, unit;
-
-       switch(cvar("cl_showspeed_unit"))
-       {
-               default:
-               case 0:
-                       unit = "";
-                       conversion_factor = 1.0;
-                       break;
-               case 1:
-                       unit = " qu/s";
-                       conversion_factor = 1.0;
-                       break;
-               case 2:
-                       unit = " m/s";
-                       conversion_factor = 0.0254;
-                       break;
-               case 3:
-                       unit = " km/h";
-                       conversion_factor = 0.0254 * 3.6;
-                       break;
-               case 4:
-                       unit = " mph";
-                       conversion_factor = 0.0254 * 3.6 * 0.6213711922;
-                       break;
-               case 5:
-                       unit = " knots";
-                       conversion_factor = 0.0254 * 1.943844492; // 1 m/s = 1.943844492 knots, because 1 knot = 1.852 km/h
-                       break;
-       }
-
-       speed = strcat(ftos(floor( vlen(pmove_vel - pmove_vel_z * '0 0 1') * conversion_factor + 0.5 )), unit);
-
-       numsize_x = numsize_y = cvar("cl_showspeed_size");
-       pos = (vid_conheight - numsize_y) * cvar("cl_showspeed_position");
-
-       drawfont = hud_bigfont;
-       drawstringcenter(eX + pos * eY, speed, numsize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-
-       if (cvar("cl_showspeed_z") == 1) {
-               zspeed = strcat(ftos(fabs(floor( pmove_vel_z * conversion_factor + 0.5 ))), unit);
-               drawstringcenter(eX + pos * eY + numsize_y * eY, zspeed, numsize * 0.5, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-       }
-
-       drawfont = hud_font;
-}
-
-vector acc_prevspeed;
-float acc_prevtime;
-float acc_avg;
-
-void HUD_ShowAcceleration(void)
-{
-       float acceleration, sz, scale, alpha, f;
-       vector pos, top, rgb;
-       top_x = vid_conwidth/2;
-       top_y = 0;
-
-       f = time - acc_prevtime;
-       if(cvar("cl_showacceleration_z"))
-               acceleration = (vlen(pmove_vel) - vlen(acc_prevspeed)) * (1 / f);
-       else
-               acceleration = (vlen(pmove_vel - '0 0 1' * pmove_vel_z) - vlen(acc_prevspeed - '0 0 1' * acc_prevspeed_z)) * (1 / f);
-       acc_prevspeed = pmove_vel;
-       acc_prevtime = time;
-
-       f = bound(0, f * 10, 1);
-       acc_avg = acc_avg * (1 - f) + acceleration * f;
-       acceleration = acc_avg / getstatf(STAT_MOVEVARS_MAXSPEED);
-
-       pos = top - sz/2 * eY + (cvar("cl_showacceleration_position") * vid_conheight) * eY;
-
-       sz = cvar("cl_showacceleration_size");
-       scale = cvar("cl_showacceleration_scale");
-       alpha = cvar("cl_showacceleration_alpha");
-       if (cvar("cl_showacceleration_color_custom"))
-               rgb = stov(cvar_string("cl_showacceleration_color"));
-       else {
-               rgb = '1 1 1';
-               if (acceleration < 0) {
-                       rgb = '1 .5 .5' - '0 .5 .5' * bound(0, -acceleration * 0.2, 1);
-               } else if (acceleration > 0) {
-                       rgb = '.5 1 .5' - '.5 0 .5' * bound(0, +acceleration * 0.2, 1);
-               }
-       }
-
-       if (acceleration > 0)
-               drawpic(pos, "gfx/hud/statuhud", acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_alpha_fg, DRAWFLAG_NORMAL);
-       else if (acceleration < 0)
-               drawpic(pos + acceleration * scale * '40 0 0', "gfx/hud/statuhud", -acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_alpha_fg, DRAWFLAG_NORMAL);
-}
-
-void HUD_Reset (void)
-{
-       // reset gametype specific icons
-       if(gametype == GAME_KEYHUNT)
-               CSQC_kh_hudreset();
-       else if(gametype == GAME_CTF)
-               CSQC_ctf_hudreset();
-}
-
-void HUD_Main (void)
-{
-       hud_alpha_bg = cvar_or("hud_alpha_bg", 0.8) * (1 - cvar("_menu_alpha"));
-       hud_border_thickness = bound(0, cvar("hud_border_thickness"), 5);
-       hud_accuracy_border_thickness = bound(0, cvar_or("hud_accuracy_border_thickness", 1), 5);
-       hud_color_bg_team = cvar("hud_color_bg_team");
-
-       hud_fontsize = HUD_GetFontsize("hud_fontsize");
-       hud_fontsize_spec = HUD_GetFontsize("hud_fontsize_spec");
-
-       if(HUD_Panel_CheckActive(0))
-               HUD_WeaponIcons();
-       if(HUD_Panel_CheckActive(1))
-               HUD_Inventory();
-       if(HUD_Panel_CheckActive(2))
-               HUD_Powerups();
-       if(HUD_Panel_CheckActive(3))
-               HUD_HealthArmor();
-       if(HUD_Panel_CheckActive(4))
-               HUD_Notify();
-       if(HUD_Panel_CheckActive(5))
-               HUD_Timer();
-       if(HUD_Panel_CheckActive(6))
-               if(ons_showmap || cvar_string("cl_teamradar") != "0" && (cvar("cl_teamradar") == 2 || teamplay))
-                       HUD_Radar();
-       if(HUD_Panel_CheckActive(7))
-               HUD_Score();
-       if(HUD_Panel_CheckActive(8))
-               if(gametype == GAME_RACE || gametype == GAME_CTS || cvar("_hud_configure"))
-                       HUD_RaceTimer();
-       if(HUD_Panel_CheckActive(9))
-               HUD_VoteWindow();
-       if(HUD_Panel_CheckActive(10))
-               if(spectatee_status > 0 || cvar("cl_showpressedkeys") >= 2 || cvar("_hud_configure"))
-                       HUD_DrawPressedKeys();
-
-       // TODO hud_'ify these
-       if (cvar("cl_showspeed"))
-               HUD_ShowSpeed();
-       if (cvar("cl_showacceleration"))
-               HUD_ShowAcceleration();
-
-       // TODO... well make them work in a panel etc
-       if(gametype == GAME_KEYHUNT)
-               CSQC_kh_hud();
-       else if(gametype == GAME_CTF)
-               CSQC_ctf_hud();
-       else if(gametype == GAME_NEXBALL)
-               CSQC_nb_hud();
-       else if(gametype == GAME_CTS || gametype == GAME_RACE)
-               CSQC_race_hud();
-       return;
-}
diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh
new file mode 100644 (file)
index 0000000..6768221
--- /dev/null
@@ -0,0 +1,30 @@
+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;
+float highlightedAction; // 0 = nothing, 1 = move, 2 = resize
+
+const float BORDER_MULTIPLIER = 0.25;
+float hud_color_bg_team;
+float scoreboard_bottom;
+float weapon_hits[WEP_MAXCOUNT];
+float weapon_fired[WEP_MAXCOUNT];
+float weapon_number;
+
+float ps_primary, ps_secondary;
+float ts_primary, ts_secondary;
+
+float last_weapon;
+float weapontime;
+
+float teamnagger;
+float hud_fg_alpha;
+float hud_accuracy_hud;
+float hud_border_thickness;
+float hud_accuracy_border_thickness;
+
+float hud_configure;
+
+float disable_menu_alphacheck; // 0 = enable alpha check, 1 = disable for entire hud, 2 = disable for one panel
+float menu_fade_alpha;
index d2847af00bd7c323d1e439053a72ca002a95c064..f00e49c532a40cc0eaa1086aa143d11dee828955 100644 (file)
@@ -31,7 +31,6 @@ vector mi_center;
 vector mi_scale;
 // Minimap
 string minimapname;
-float ons_showmap;
 
 // --------------------------------------------------------------------------
 // General stuff
@@ -63,7 +62,7 @@ const float COLOR_SPECTATOR = 1337;
 // --------------------------------------------------------------------------
 // Scoreboard stuff
 
-#define MAX_SBAR_FIELDS 16
+#define MAX_HUD_FIELDS 16
 
 #define SP_END -1
 
@@ -76,13 +75,13 @@ const float COLOR_SPECTATOR = 1337;
 
 #define SP_SEPARATOR -100
 
-float sbar_field[MAX_SBAR_FIELDS + 1];
-float sbar_size[MAX_SBAR_FIELDS + 1];
-string sbar_title[MAX_SBAR_FIELDS + 1];
-float sbar_num_fields;
+float hud_field[MAX_HUD_FIELDS + 1];
+float hud_size[MAX_HUD_FIELDS + 1];
+string hud_title[MAX_HUD_FIELDS + 1];
+float hud_num_fields;
 
-float sbar_font;
-float sbar_bigfont;
+float hud_font;
+float hud_bigfont;
 
 string scores_label[MAX_SCORE];
 float scores_flags[MAX_SCORE];
@@ -95,9 +94,8 @@ float teamscores_flags[MAX_SCORE];
 #define IS_DECREASING(x) ( !((x)&SFL_LOWER_IS_BETTER) )
 
 
-vector sbar_fontsize;
-vector sbar_oldfontsize;
-vector sbar_fontsize_spec;
+vector hud_fontsize;
+vector hud_fontsize_spec;
 
 float RANKINGS_RECEIVED_CNT;
 string grecordholder[RANKINGS_CNT];
@@ -127,8 +125,8 @@ float ignore_minus_zoom;
 float warmup_stage;
 
 string getcommandkey(string text, string command);
-float sbar_showbinds;
-float sbar_showbinds_limit;
+float hud_showbinds;
+float hud_showbinds_limit;
 
 string vote_called_vote;
 float ready_waiting;
index 17036a9eb80d2588eec38d5b07ee2a4931629c52..c352cacaea05af16daa4feb922bcc4b8d81bc472 100644 (file)
@@ -51,28 +51,28 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin
        string label;
        float text_size;
        
-       isize -= sbar_fontsize_y; // respect the text when calculating the image size
+       isize -= hud_fontsize_y; // respect the text when calculating the image size
 
        rgb = MapVote_RGB(id);
        
        img_size_y = isize;
        img_size_x = isize / 0.75; // 4:3 x can be stretched easily, height is defined in isize
 
-       drawfont = sbar_font;
+       drawfont = hud_font;
        pos_y = pos_y + img_size_y;
        
-       label = MapVote_FormatMapItem(id, map, count, tsize, sbar_fontsize);
+       label = MapVote_FormatMapItem(id, map, count, tsize, hud_fontsize);
 
-       text_size = stringwidth(label, false, sbar_fontsize);
+       text_size = stringwidth(label, false, hud_fontsize);
        
        pos_x -= text_size*0.5;
-       drawstring(pos, label, sbar_fontsize, rgb, 1, DRAWFLAG_NORMAL);
+       drawstring(pos, label, hud_fontsize, rgb, 1, DRAWFLAG_NORMAL);
        
        pos_x = pos_x + text_size*0.5 - img_size_x*0.5;
        pos_y = pos_y - img_size_y;
 
-       pos += sbar_border_thickness * '1 1 0';
-       img_size -= (sbar_border_thickness * 2) * '1 1 0';
+       pos += hud_border_thickness * '1 1 0';
+       img_size -= (hud_border_thickness * 2) * '1 1 0';
        if(pic == "")
        {
                drawfill(pos, img_size, '.5 .5 .5', .7, DRAWFLAG_NORMAL);
@@ -86,12 +86,12 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin
 
        if(id == mv_ownvote || pic == "")
        {
-               drawborderlines(sbar_border_thickness, pos, img_size, rgb, 1, DRAWFLAG_NORMAL);
+               drawborderlines(hud_border_thickness, pos, img_size, rgb, 1, DRAWFLAG_NORMAL);
                drawpic(pos + '1 0 0', strcat("gfx/hud/num_", ftos(id+1)), (img_size_y / 5) * '1 1 0', rgb, 0.6, DRAWFLAG_NORMAL);
        }
        else
        {
-               drawborderlines(sbar_border_thickness, pos, img_size, '0 0 0', 1, DRAWFLAG_NORMAL);
+               drawborderlines(hud_border_thickness, pos, img_size, '0 0 0', 1, DRAWFLAG_NORMAL);
                drawpic(pos + '1 0 0', strcat("gfx/hud/num_", ftos(id+1)), (img_size_y / 5) * '1 1 0', '1 1 1', 0.6, DRAWFLAG_NORMAL);
        }
 }
@@ -104,15 +104,15 @@ void MapVote_DrawAbstain(vector pos, float isize, float tsize, float count, floa
        
        rgb = MapVote_RGB(id);
 
-       drawfont = sbar_font;
-       pos_y = pos_y + sbar_fontsize_y;
+       drawfont = hud_font;
+       pos_y = pos_y + hud_fontsize_y;
        
-       label = MapVote_FormatMapItem(id, "Don't care", count, tsize, sbar_fontsize);
+       label = MapVote_FormatMapItem(id, "Don't care", count, tsize, hud_fontsize);
 
-       text_size = stringwidth(label, false, sbar_fontsize);
+       text_size = stringwidth(label, false, hud_fontsize);
        
        pos_x -= text_size*0.5;
-       drawstring(pos, label, sbar_fontsize, rgb, 1, DRAWFLAG_NORMAL);
+       drawstring(pos, label, hud_fontsize, rgb, 1, DRAWFLAG_NORMAL);
 }
 
 vector MapVote_GridVec(vector gridspec, float i, float m)
@@ -183,8 +183,8 @@ void MapVote_Draw()
        if(i >= 0 || ymax < (vid_conheight*0.5))
                ymax = vid_conheight - ymin;
 
-       drawfont = sbar_bigfont;
-       sbar_fontsize = Sbar_GetFontsize("sbar_fontsize");
+       drawfont = hud_bigfont;
+       hud_fontsize = HUD_GetFontsize("hud_fontsize");
 
        pos_y = ymin;
        pos_z = 0;
@@ -201,7 +201,7 @@ void MapVote_Draw()
        pos_y += 22;
        pos_x = xmin;
 
-       drawfont = sbar_font;
+       drawfont = hud_font;
        
        // base for multi-column stuff...
        ymin = pos_y;
@@ -244,12 +244,12 @@ void MapVote_Draw()
        
        if(mv_abstain && i < mv_num_maps) {
                tmp = mv_votes[i];
-               pos_y = ymax + isize - sbar_fontsize_y;
+               pos_y = ymax + isize - hud_fontsize_y;
                pos_x = (xmax+xmin)*0.5;
                MapVote_DrawAbstain(pos, isize, xmax - xmin, tmp, i);
        }
 
-       drawpic(mv_mousepos, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor.tga"), '32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+       drawpic(mv_mousepos, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor.tga"), '32 32 0', '1 1 1', hud_fg_alpha, DRAWFLAG_NORMAL);
 }
 
 void Cmd_MapVote_MapDownload(float argc)
@@ -331,9 +331,6 @@ void MapVote_Init()
 
        precache_sound ("misc/invshot.wav");
 
-       registercmd("+showscores");
-       registercmd("-showscores");
-
        mv_active = 1;
 
        mv_mousepos = '0.5 0 0' * vid_conwidth + '0 0.5 0' * vid_conheight;
index 63f0faf76db95481f671445d44763b90e2889e9e..74830223d9306f31cead7823a6f3ff590b593e7f 100644 (file)
@@ -304,11 +304,11 @@ entity GetTeam(float Team, float add)
 
 void CSQC_CheckEngine()
 {
-       sbar_font = FONT_USER+1;
-       sbar_bigfont = FONT_USER+2;
+       hud_font = FONT_USER+1;
+       hud_bigfont = FONT_USER+2;
 }
 
-vector Sbar_GetFontsize(string cvarname)
+vector HUD_GetFontsize(string cvarname)
 {
        vector v;
        v = stov(cvar_string(cvarname));
@@ -320,10 +320,10 @@ vector Sbar_GetFontsize(string cvarname)
        return v;
 }
 
-float Sbar_GetWidth(float teamcolumnwidth)
+float HUD_GetWidth(float teamcolumnwidth)
 {
        float f;
-       f = cvar("sbar_width");
+       f = cvar("hud_width");
        if(f == 0)
                f = 640;
        if(f < 320)
@@ -482,24 +482,41 @@ void drawpic_expanding_two(vector position, string pic, vector scale, vector rgb
        drawpic(position, pic, scale, rgb, alpha * fadelerp, flag);
 }
 
+// drawstring wrapper to draw a string as large as possible with preserved aspect ratio into a box
+void drawstring_aspect(vector pos, string text, vector sz, float fontsize, vector color, float alpha, float drawflag) {
+       vector textsize;
+       textsize = eX * stringwidth(text, FALSE, '1 1 0' * fontsize) + eY * fontsize;
+       
+       float textaspect;
+       textaspect = textsize_x/textsize_y;
+
+       vector oldsz;
+       oldsz = sz;
+       float aspect;
+       aspect = sz_x/sz_y;
+
+       if(aspect > textaspect) {
+               sz_x = sz_y * textaspect;
+               drawstring(pos + eX * (oldsz_x - sz_x) * 0.5, text, '1 1 0' * sz_y, color, alpha, drawflag);
+       } else {
+               sz_y = sz_x / textaspect; 
+               drawstring(pos + eY * (oldsz_y - sz_y) * 0.5, text, '1 1 0' * sz_y, color, alpha, drawflag);
+       }
+}
+
 vector drawfontscale;
 void drawstring_expanding(vector position, string text, vector scale, vector rgb, float alpha, float flag, float fadelerp)
 {
        float sz;
        sz = expandingbox_sizefactor_from_fadelerp(fadelerp);
 
-       if(cvar("menu_font_size_snapping_fix"))
-               drawfontscale = sz * '1 1 0';
-       else
-               drawfontscale = '1 1 0';
+       drawfontscale = sz * '1 1 0';
        dummyfunction(0, 0, 0, 0, 0, 0, 0, 0);
         drawstring(position + expandingbox_resize_centered_box_offset(sz, scale, stringwidth(text, FALSE, scale * (sz / drawfontscale_x)) / (scale_x * sz)), text, scale * (sz / drawfontscale_x), rgb, alpha * (1 - fadelerp), flag);
        // width parameter:
        //    (scale_x * sz / drawfontscale_x) * drawfontscale_x * SIZE1 / (scale_x * sz)
        //    SIZE1
-
-       if(cvar("menu_font_size_snapping_fix"))
-               drawfontscale = '1 1 0';
+       drawfontscale = '1 1 0';
 }
 
 void drawcolorcodedstring_expanding(vector position, string text, vector scale, float alpha, float flag, float fadelerp)
@@ -507,15 +524,10 @@ void drawcolorcodedstring_expanding(vector position, string text, vector scale,
        float sz;
        sz = expandingbox_sizefactor_from_fadelerp(fadelerp);
 
-       if(cvar("menu_font_size_snapping_fix"))
-               drawfontscale = sz * '1 1 0';
-       else
-               drawfontscale = '1 1 0';
+       drawfontscale = sz * '1 1 0';
        dummyfunction(0, 0, 0, 0, 0, 0, 0, 0);
        drawcolorcodedstring(position + expandingbox_resize_centered_box_offset(sz, scale, stringwidth(text, TRUE, scale * (sz / drawfontscale_x)) / (scale_x * sz)), text, scale * (sz / drawfontscale_x), alpha * (1 - fadelerp), flag);
-
-       if(cvar("menu_font_size_snapping_fix"))
-               drawfontscale = '1 1 0';
+       drawfontscale = '1 1 0';
 }
 
 // this draws the triangles of a model DIRECTLY. Don't expect high performance, really...
index cd8b4602e1004bb944ce94c9878f4e034422772a..5e94475ce23fbff63ae8831c0972bb469c990357 100644 (file)
@@ -21,6 +21,7 @@ autocvars.qh
 
 interpolate.qh
 teamradar.qh
+hud.qh
 waypointsprites.qh
 movetypes.qh
 prandom.qh
@@ -34,7 +35,9 @@ teamplay.qc
 
 ctf.qc
 
-sbar.qc
+teamradar.qc
+hud.qc
+scoreboard.qc
 mapvoting.qc
 
 rubble.qc
@@ -55,7 +58,6 @@ target_music.qc
 Main.qc
 View.qc
 interpolate.qc
-teamradar.qc
 waypointsprites.qc
 movetypes.qc
 prandom.qc
diff --git a/qcsrc/client/sbar.qc b/qcsrc/client/sbar.qc
deleted file mode 100644 (file)
index d817590..0000000
+++ /dev/null
@@ -1,3443 +0,0 @@
-void drawstringright(vector, string, vector, vector, float, float);
-void drawstringcenter(vector, string, vector, vector, float, float);
-
-float teamnagger;
-
-float weapon_hits[WEP_MAXCOUNT];
-float weapon_fired[WEP_MAXCOUNT];
-float weapon_number;
-
-float last_weapon;
-float weapontime;
-
-float sbar_alpha_fg;
-float sbar_alpha_bg;
-float sbar_color_bg_team;
-float sbar_border_thickness;
-float sbar_accuracy_border_thickness;
-float sbar_scoreboard_alpha_bg;
-float sbar_scoreboard_alpha_fg;
-float sbar_scoreboard_highlight;
-float sbar_scoreboard_highlight_alpha;
-float sbar_scoreboard_highlight_alpha_self;
-float sbar_hudselector;
-float sbar_accuracy_hud;
-float sbar_scoreboard_alpha_name;
-float sbar_scoreboard_alpha_name_self;
-
-float ps_primary, ps_secondary;
-float ts_primary, ts_secondary;
-
-vector color;
-float SCOREBOARD_OFFSET = 50;
-
-void CSQC_kh_hudreset();
-void CSQC_kh_hud();
-void CSQC_ctf_hudreset();
-void CSQC_ctf_hud();
-void CSQC_nb_hud();
-void CSQC_race_hud();
-void MapVote_Draw();
-void Sbar_FinaleOverlay()
-{
-       /*vector pos;
-       pos_x = (vid_conwidth - 1)/2;
-       pos_y = 16;
-       pos_z = 0;*/
-
-       //drawpic(pos, "gfx/finale", '0 0 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-       //drawstring(pos, "END", sbar_fontsize, '1 1 1', 1, DRAWFLAG_NORMAL);
-       MapVote_Draw();
-}
-
-vector Sbar_AccuracyColor(float accuracy)
-{
-       vector rgb;
-       float yellow_accuracy = cvar("sbar_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;
-}
-
-float weaponspace[10];
-void Sbar_DrawWeapon_Clear()
-{
-       float idx;
-       for(idx = 0; idx < 10; ++idx)
-               weaponspace[idx] = 0;
-}
-void Sbar_DrawWeapon(entity wi, float fade, float active)
-{
-       vector pos, vsize, fill_colour;
-       float value, idx, imp, sp, weapon_hit, weapon_damage, weapon_stats;
-
-       imp = wi.impulse;
-
-       weapon_hit = weapon_hits[wi.weapon-WEP_FIRST];
-       weapon_damage = weapon_fired[wi.weapon-WEP_FIRST];
-       if(imp == 0)
-               idx = 9;
-       else
-               idx = imp - 1;
-
-       value = (active) ? 1 : 0.6;
-       color_x = color_y = color_z = value;
-
-       // width = 300, height = 100
-       const float w_width = 24, w_height = 12, w_space = 2, font_size = 8, accuracybar_height = 3;
-
-       sp = weaponspace[idx] + 1;
-       weaponspace[idx] = sp;
-
-       pos_x = (vid_conwidth + 6 - w_width * 9) * 0.5 + w_width * idx;
-       pos_y = (vid_conheight - w_height * sp) - 38; // move 38 pixels up
-       pos_z = 0;
-       vsize_x = w_width;
-       vsize_y = w_height;
-       vsize_z = 0;
-       if (active)
-               drawpic(pos, "gfx/hud/sb_ammobg", vsize, color, value * fade * sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos, strcat("gfx/hud/inv_weapon", wi.netname), vsize, color, value * fade * sbar_alpha_fg, DRAWFLAG_NORMAL);
-       pos_x += w_space;
-       pos_y += w_space;
-       vsize_x = font_size;
-       vsize_y = font_size;
-       vsize_z = 0;
-       drawstring(pos, ftos(imp), vsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-       // draw the weapon accuracy on the HUD
-       if(sbar_accuracy_hud && !(gametype == GAME_RACE || gametype == GAME_CTS))
-       {
-               if(weapon_damage)
-                       weapon_stats = floor(100 * weapon_hit / weapon_damage);
-
-               fill_colour = Sbar_AccuracyColor(weapon_stats);
-               if(weapon_damage)
-                       drawpic(pos - '2 0 0' + '0 1 0' * (w_height - accuracybar_height), "gfx/hud/sb_accuracy_bar.tga", '1 0 0' * w_width + '0 1 0' * accuracybar_height, fill_colour, sbar_alpha_fg, DRAWFLAG_NORMAL);
-       }
-}
-
-void Sbar_DrawXNum (vector pos, float num, float digits, float showminusplus, 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;
-
-       // showminusplus 1: always prefix with minus sign (useful in race distribution display)
-       // showminusplus 2: always prefix with plus sign (useful in race distribution display)
-       // showminusplus 3: prefix with minus sign if negative, plus sign if positive (useful in score distribution display)
-
-       if((showminusplus == 2 && num >= 0) || (num > 0 && showminusplus == 3))
-       {
-               plus = true;
-               pos_x -= lettersize;
-       } else
-               plus = false;   
-
-       if(num < 0 || (num < 0 && showminusplus == 3) || (showminusplus == 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(hl_pos, strcat("gfx/hud/sb_highlight_", 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(pos, "gfx/hud/num_minus_stroke", vsize, rgb, alpha, dflags);
-               drawpic(pos, "gfx/hud/num_minus", vsize, num_color, alpha, dflags);
-               pos_x += lettersize;
-       } else if(plus)
-       {
-               if (stroke == 1)
-                       drawpic(pos, "gfx/hud/num_plus_stroke", vsize, rgb, alpha, dflags);
-               drawpic(pos, "gfx/hud/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(pos, strcat("gfx/hud/num_", tmp, "_stroke"), vsize, rgb, alpha, dflags);
-               drawpic(pos, strcat("gfx/hud/num_", tmp), vsize, num_color, alpha, dflags);
-               pos_x += lettersize;
-       }
-}
-
-void Sbar_DrawXNum_Colored (vector pos, float x, float lettersize, float alpha)
-{
-       if(x > 200) {
-               color_x = 0;
-               color_y = 1;
-               color_z = 0;
-       }
-       else if(x > 150) {
-               color_x = 0.4 - (x-150)*0.02 * 0.4; //red value between 0.4 -> 0
-               color_y = 0.9 + (x-150)*0.02 * 0.1; // green value between 0.9 -> 1
-               color_z = 0;
-       }
-       else if(x > 100) {
-               color_x = 1 - (x-100)*0.02 * 0.6; //red value between 1 -> 0.4
-               color_y = 1 - (x-100)*0.02 * 0.1; // green value between 1 -> 0.9
-               color_z = 1 - (x-100)*0.02; // blue value between 1 -> 0
-       }
-       else if(x > 50) {
-               color_x = 1;
-               color_y = 1;
-               color_z = 0.2 + (x-50)*0.02 * 0.8; // blue value between 0.2 -> 1
-       }
-       else if(x > 20) {
-               color_x = 1;
-               color_y = (x-20)*90/27/100; // green value between 0 -> 1
-               color_z = (x-20)*90/27/100 * 0.2; // blue value between 0 -> 0.2
-       }
-       else {
-               color_x = 1;
-               color_y = 0;
-               color_z = 0;
-       }
-       Sbar_DrawXNum(pos, x, 3, 0, lettersize, color, 0, 0, alpha, DRAWFLAG_NORMAL);
-}
-
-void Cmd_Sbar_SetFields(float argc);
-void Sbar_InitScores()
-{
-       float i, f;
-
-       ps_primary = ps_secondary = ts_primary = ts_secondary = -1;
-       for(i = 0; i < MAX_SCORE; ++i)
-       {
-               f = (scores_flags[i] & SFL_SORT_PRIO_MASK);
-               if(f == SFL_SORT_PRIO_PRIMARY)
-                       ps_primary = i;
-               if(f == SFL_SORT_PRIO_SECONDARY)
-                       ps_secondary = i;
-       }
-       if(ps_secondary == -1)
-               ps_secondary = ps_primary;
-
-       for(i = 0; i < MAX_TEAMSCORE; ++i)
-       {
-               f = (teamscores_flags[i] & SFL_SORT_PRIO_MASK);
-               if(f == SFL_SORT_PRIO_PRIMARY)
-                       ts_primary = i;
-               if(f == SFL_SORT_PRIO_SECONDARY)
-                       ts_secondary = i;
-       }
-       if(ts_secondary == -1)
-               ts_secondary = ts_primary;
-
-       Cmd_Sbar_SetFields(0);
-}
-
-void Sbar_UpdatePlayerPos(entity pl);
-float SetTeam(entity pl, float Team);
-//float lastpnum;
-void Sbar_UpdatePlayerTeams()
-{
-       float Team;
-       entity pl, tmp;
-       float num;
-
-       num = 0;
-       for(pl = players.sort_next; pl; pl = pl.sort_next)
-       {
-               num += 1;
-               Team = GetPlayerColor(pl.sv_entnum);
-               if(SetTeam(pl, Team))
-               {
-                       tmp = pl.sort_prev;
-                       Sbar_UpdatePlayerPos(pl);
-                       if(tmp)
-                               pl = tmp;
-                       else
-                               pl = players.sort_next;
-               }
-       }
-       /*
-       if(num != lastpnum)
-               print(strcat("PNUM: ", ftos(num), "\n"));
-       lastpnum = num;
-       */
-}
-
-float Sbar_ComparePlayerScores(entity left, entity right)
-{
-       float vl, vr;
-       vl = GetPlayerColor(left.sv_entnum);
-       vr = GetPlayerColor(right.sv_entnum);
-
-       if(!left.gotscores)
-               vl = COLOR_SPECTATOR;
-       if(!right.gotscores)
-               vr = COLOR_SPECTATOR;
-
-       if(vl > vr)
-               return true;
-       if(vl < vr)
-               return false;
-
-       if(vl == COLOR_SPECTATOR)
-       {
-               // FIRST the one with scores (spectators), THEN the ones without (downloaders)
-               // no other sorting
-               if(!left.gotscores && right.gotscores)
-                       return true;
-               return false;
-       }
-
-       vl = left.scores[ps_primary];
-       vr = right.scores[ps_primary];
-       if(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)
-       {
-               if(vl == 0 && vr != 0)
-                       return 1;
-               if(vl != 0 && vr == 0)
-                       return 0;
-       }
-       if(vl > vr)
-               return IS_INCREASING(scores_flags[ps_primary]);
-       if(vl < vr)
-               return IS_DECREASING(scores_flags[ps_primary]);
-
-       vl = left.scores[ps_secondary];
-       vr = right.scores[ps_secondary];
-       if(scores_flags[ps_secondary] & SFL_ZERO_IS_WORST)
-       {
-               if(vl == 0 && vr != 0)
-                       return 1;
-               if(vl != 0 && vr == 0)
-                       return 0;
-       }
-       if(vl > vr)
-               return IS_INCREASING(scores_flags[ps_secondary]);
-       if(vl < vr)
-               return IS_DECREASING(scores_flags[ps_secondary]);
-
-       return false;
-}
-
-void Sbar_UpdatePlayerPos(entity player)
-{
-       for(other = player.sort_next; other && Sbar_ComparePlayerScores(player, other); other = player.sort_next)
-       {
-               SORT_SWAP(player, other);
-       }
-       for(other = player.sort_prev; other != players && Sbar_ComparePlayerScores(other, player); other = player.sort_prev)
-       {
-               SORT_SWAP(other, player);
-       }
-}
-
-float Sbar_CompareTeamScores(entity left, entity right)
-{
-       float vl, vr;
-
-       if(left.team == COLOR_SPECTATOR)
-               return 1;
-       if(right.team == COLOR_SPECTATOR)
-               return 0;
-
-       vl = left.teamscores[ts_primary];
-       vr = right.teamscores[ts_primary];
-       if(vl > vr)
-               return IS_INCREASING(teamscores_flags[ts_primary]);
-       if(vl < vr)
-               return IS_DECREASING(teamscores_flags[ts_primary]);
-
-       vl = left.teamscores[ts_secondary];
-       vr = right.teamscores[ts_secondary];
-       if(vl > vr)
-               return IS_INCREASING(teamscores_flags[ts_secondary]);
-       if(vl < vr)
-               return IS_DECREASING(teamscores_flags[ts_secondary]);
-
-       return false;
-}
-
-void Sbar_UpdateTeamPos(entity Team)
-{
-       for(other = Team.sort_next; other && Sbar_CompareTeamScores(Team, other); other = Team.sort_next)
-       {
-               SORT_SWAP(Team, other);
-       }
-       for(other = Team.sort_prev; other != teams && Sbar_CompareTeamScores(other, Team); other = Team.sort_prev)
-       {
-               SORT_SWAP(other, Team);
-       }
-}
-
-void Cmd_Sbar_Help(float argc)
-{
-       print("You can modify the scoreboard using the ^2sbar_columns_set command.\n");
-       print("^3|---------------------------------------------------------------|\n");
-       print("Usage:\n");
-       print("^2sbar_columns_set default\n");
-       print("^2sbar_columns_set ^7filed1 field2 ...\n");
-       print("The following field names are recognized (case insensitive):\n");
-       print("You can use a ^3|^7 to start the right-aligned fields.\n\n");
-
-       print("^3name^7 or ^3nick^7         Name of a player\n");
-       print("^3ping^7                     Ping time\n");
-       print("^3pl^7                       Packet loss\n");
-       print("^3kills^7                    Number of kills\n");
-       print("^3deaths^7                   Number of deaths\n");
-       print("^3suicides^7                 Number of suicides\n");
-       print("^3frags^7                    kills - suicides\n");
-       print("^3kd^7                       The kill-death ratio\n");
-       print("^3caps^7                     How often a flag (CTF) or a key (KeyHunt) was captured\n");
-       print("^3pickups^7                  How often a flag (CTF) or a key (KeyHunt) was picked up\n");
-       print("^3fckills^7                  Number of flag carrier kills\n");
-       print("^3returns^7                  Number of flag returns\n");
-       print("^3drops^7                    Number of flag drops\n");
-       print("^3lives^7                    Number of lives (LMS)\n");
-       print("^3rank^7                     Player rank\n");
-       print("^3pushes^7                   Number of players pushed into void\n");
-       print("^3destroyed^7                Number of keys destroyed by pushing them into void\n");
-       print("^3kckills^7                  Number of keys carrier kills\n");
-       print("^3losses^7                   Number of times a key was lost\n");
-       print("^3laps^7                     Number of laps finished (race/cts)\n");
-       print("^3time^7                     Total time raced (race/cts)\n");
-       print("^3fastest^7                  Time of fastest lap (race/cts)\n");
-       print("^3ticks^7                    Number of ticks (DOM)\n");
-       print("^3takes^7                    Number of domination points taken (DOM)\n");
-       print("^3score^7                    Total score\n\n");
-
-       print("Before a field you can put a + or - sign, then a comma separated list\n");
-       print("of game types, then a slash, to make the field show up only in these\n");
-       print("or in all but these game types. You can also specify 'all' as a\n");
-       print("field to show all fields available for the current game mode.\n\n");
-       
-       print("The special game type names 'teams' and 'noteams' can be used to\n");
-       print("include/exclude ALL teams/noteams game modes.\n\n");
-
-       print("Example: sbar_columns_set name ping pl | +ctf/field3 -dm/field4\n");
-       print("will display name, ping and pl aligned to the left, and the fields\n");
-       print("right of the vertical bar aligned to the right.\n");
-       print("'field3' will only be shown in CTF, and 'field4' will be shown in all\n");
-       print("other gamemodes except DM.\n");
-}
-
-string Sbar_DefaultColumnLayout()
-{
-       return strcat( // fteqcc sucks
-               "ping pl name | ",
-               "-teams,race,lms/kills -teams,lms/deaths -teams,lms,race/suicides -race,dm,tdm/frags ", // tdm already has this in "score"
-               "+ctf/caps +ctf/pickups +ctf/fckills +ctf/returns ",
-               "+lms/lives +lms/rank ",
-               "+kh/caps +kh/pushes +kh/destroyed ",
-               "?+race/laps ?+race/time ?+race/fastest ",
-               "+as/objectives +nexball/faults +nexball/goals ",
-               "-lms,race,nexball/score");
-}
-
-void Cmd_Sbar_SetFields(float argc)
-{
-       float i, j, slash;
-       string str, pattern;
-       float have_name, have_primary, have_secondary, have_separator;
-       float missing;
-
-       // TODO: re enable with gametype dependant cvars?
-       if(argc < 2) // no arguments provided
-               argc = tokenizebyseparator(strcat("x ", cvar_string("sbar_columns")), " ");
-
-       if(argc < 2)
-               argc = tokenizebyseparator(strcat("x ", Sbar_DefaultColumnLayout()), " ");
-
-       if(argc == 2)
-       {
-               if(argv(1) == "default")
-                       argc = tokenizebyseparator(strcat("x ", Sbar_DefaultColumnLayout()), " ");
-               else if(argv(1) == "all")
-               {
-                       string s;
-                       s = "ping pl color name |";
-                       for(i = 0; i < MAX_SCORE; ++i)
-                       {
-                               if(i != ps_primary)
-                               if(i != ps_secondary)
-                               if(scores_label[i] != "")
-                                       s = strcat(s, " ", scores_label[i]);
-                       }
-                       if(ps_secondary != ps_primary)
-                               s = strcat(s, " ", scores_label[ps_secondary]);
-                       s = strcat(s, " ", scores_label[ps_primary]);
-                       argc = tokenizebyseparator(strcat("x ", s), " ");
-               }
-       }
-
-
-       sbar_num_fields = 0;
-
-       drawfont = sbar_font;
-
-       for(i = 0; i < argc - 1; ++i)
-       {
-               float nocomplain;
-               str = argv(i+1);
-
-               nocomplain = FALSE;
-               if(substring(str, 0, 1) == "?")
-               {
-                       nocomplain = TRUE;
-                       str = substring(str, 1, strlen(str) - 1);
-               }
-
-               slash = strstrofs(str, "/", 0);
-               if(slash >= 0)
-               {
-                       pattern = substring(str, 0, slash);
-                       str = substring(str, slash + 1, strlen(str) - (slash + 1));
-
-                       if not(isGametypeInFilter(gametype, teamplay, pattern))
-                               continue;
-               }
-
-               strunzone(sbar_title[sbar_num_fields]);
-               sbar_title[sbar_num_fields] = strzone(str);
-               sbar_size[sbar_num_fields] = stringwidth(str, FALSE, sbar_fontsize);
-               str = strtolower(str);
-
-               if(str == "ping") {
-                       sbar_field[sbar_num_fields] = SP_PING;
-               } else if(str == "pl") {
-                       sbar_field[sbar_num_fields] = SP_PL;
-               } else if(str == "kd" || str == "kdr" || str == "kdratio" || str == "k/d") {
-                       sbar_field[sbar_num_fields] = SP_KDRATIO;
-               } else if(str == "name" || str == "nick") {
-                       sbar_field[sbar_num_fields] = SP_NAME;
-                       have_name = 1;
-               } else if(str == "|") {
-                       sbar_field[sbar_num_fields] = SP_SEPARATOR;
-                       have_separator = 1;
-               } else {
-                       for(j = 0; j < MAX_SCORE; ++j)
-                               if(str == strtolower(scores_label[j]))
-                                       goto found; // sorry, but otherwise fteqcc -O3 miscompiles this and warns about "unreachable code"
-:notfound
-                       if(str == "frags")
-                       {
-                               j = SP_FRAGS;
-                       }
-                       else
-                       {
-                               if not(nocomplain)
-                                       print(strcat("^1Error:^7 Unknown score field: '", str, "'\n"));
-                               continue;
-                       }
-:found
-                       sbar_field[sbar_num_fields] = j;
-                       if(j == ps_primary)
-                               have_primary = 1;
-                       if(j == ps_secondary)
-                               have_secondary = 1;
-               }
-               ++sbar_num_fields;
-               if(sbar_num_fields >= MAX_SBAR_FIELDS)
-                       break;
-       }
-
-       if(scores_flags[ps_primary] & SFL_ALLOW_HIDE)
-               have_primary = 1;
-       if(scores_flags[ps_secondary] & SFL_ALLOW_HIDE)
-               have_secondary = 1;
-       if(ps_primary == ps_secondary)
-               have_secondary = 1;
-       missing = (!have_primary) + (!have_secondary) + (!have_separator) + (!have_name);
-
-       if(sbar_num_fields+missing < MAX_SBAR_FIELDS)
-       {
-               if(!have_name)
-               {
-                       strunzone(sbar_title[sbar_num_fields]);
-                       for(i = sbar_num_fields; i > 0; --i)
-                       {
-                               sbar_title[i] = sbar_title[i-1];
-                               sbar_size[i] = sbar_size[i-1];
-                               sbar_field[i] = sbar_field[i-1];
-                       }
-                       sbar_title[0] = strzone("name");
-                       sbar_field[0] = SP_NAME;
-                       ++sbar_num_fields;
-                       print("fixed missing field 'name'\n");
-
-                       if(!have_separator)
-                       {
-                               strunzone(sbar_title[sbar_num_fields]);
-                               for(i = sbar_num_fields; i > 1; --i)
-                               {
-                                       sbar_title[i] = sbar_title[i-1];
-                                       sbar_size[i] = sbar_size[i-1];
-                                       sbar_field[i] = sbar_field[i-1];
-                               }
-                               sbar_title[1] = strzone("|");
-                               sbar_field[1] = SP_SEPARATOR;
-                               sbar_size[1] = stringwidth("|", FALSE, sbar_fontsize);
-                               ++sbar_num_fields;
-                               print("fixed missing field '|'\n");
-                       }
-               }
-               else if(!have_separator)
-               {
-                       strunzone(sbar_title[sbar_num_fields]);
-                       sbar_title[sbar_num_fields] = strzone("|");
-                       sbar_size[sbar_num_fields] = stringwidth("|", FALSE, sbar_fontsize);
-                       sbar_field[sbar_num_fields] = SP_SEPARATOR;
-                       ++sbar_num_fields;
-                       print("fixed missing field '|'\n");
-               }
-               if(!have_secondary)
-               {
-                       strunzone(sbar_title[sbar_num_fields]);
-                       sbar_title[sbar_num_fields] = strzone(scores_label[ps_secondary]);
-                       sbar_size[sbar_num_fields] = stringwidth(sbar_title[sbar_num_fields], FALSE, sbar_fontsize);
-                       sbar_field[sbar_num_fields] = ps_secondary;
-                       ++sbar_num_fields;
-                       print("fixed missing field '", scores_label[ps_secondary], "'\n");
-               }
-               if(!have_primary)
-               {
-                       strunzone(sbar_title[sbar_num_fields]);
-                       sbar_title[sbar_num_fields] = strzone(scores_label[ps_primary]);
-                       sbar_size[sbar_num_fields] = stringwidth(sbar_title[sbar_num_fields], FALSE, sbar_fontsize);
-                       sbar_field[sbar_num_fields] = ps_primary;
-                       ++sbar_num_fields;
-                       print("fixed missing field '", scores_label[ps_primary], "'\n");
-               }
-       }
-
-       sbar_field[sbar_num_fields] = SP_END;
-}
-
-// MOVEUP::
-vector sbar_field_rgb;
-string sbar_field_icon0;
-string sbar_field_icon1;
-string sbar_field_icon2;
-vector sbar_field_icon0_rgb;
-vector sbar_field_icon1_rgb;
-vector sbar_field_icon2_rgb;
-float sbar_field_icon0_alpha;
-float sbar_field_icon1_alpha;
-float sbar_field_icon2_alpha;
-string Sbar_GetField(entity pl, float field)
-{
-       float tmp, num, denom, f;
-       string str;
-       sbar_field_rgb = '1 1 1';
-       sbar_field_icon0 = "";
-       sbar_field_icon1 = "";
-       sbar_field_icon2 = "";
-       sbar_field_icon0_rgb = '1 1 1';
-       sbar_field_icon1_rgb = '1 1 1';
-       sbar_field_icon2_rgb = '1 1 1';
-       sbar_field_icon0_alpha = 1;
-       sbar_field_icon1_alpha = 1;
-       sbar_field_icon2_alpha = 1;
-       switch(field)
-       {
-               case SP_PING:
-                       if not(pl.gotscores)
-                               return "\x8D\x8D\x8D"; // >>> sign
-                       //str = getplayerkey(pl.sv_entnum, "ping");
-                       f = pl.ping;
-                       if(f == 0)
-                               return "N/A";
-                       tmp = max(0, min(220, f-80)) / 220;
-                       sbar_field_rgb = '1 1 1' - '0 1 1'*tmp;
-                       return ftos(f);
-
-               case SP_PL:
-                       if not(pl.gotscores)
-                               return "N/A";
-                       f = pl.ping_packetloss;
-                       tmp = pl.ping_movementloss;
-                       if(f == 0 && tmp == 0)
-                               return "";
-                       str = ftos(ceil(f * 100));
-                       if(tmp != 0)
-                               str = strcat(str, "~", ftos(ceil(tmp * 100)));
-                       tmp = bound(0, f / 0.2 + tmp / 0.04, 1); // 20% is REALLY BAD pl
-                       sbar_field_rgb = '1 0.5 0.5' - '0 0.5 0.5'*tmp;
-                       return str;
-
-               case SP_NAME:
-                       if(ready_waiting && pl.ready)
-                       {
-                               sbar_field_icon0 = "gfx/sb_player_ready";
-                       }
-                       else if(!teamplay)
-                       {
-                               f = stof(getplayerkey(pl.sv_entnum, "colors"));
-                               {
-                                       sbar_field_icon0 = "gfx/sb_playercolor_base";
-                                       sbar_field_icon1 = "gfx/sb_playercolor_shirt";
-                                       sbar_field_icon1_rgb = colormapPaletteColor(floor(f / 16), 0);
-                                       sbar_field_icon2 = "gfx/sb_playercolor_pants";
-                                       sbar_field_icon2_rgb = colormapPaletteColor(mod(f, 16), 1);
-                               }
-                       }
-                       return GetPlayerName(pl.sv_entnum);
-
-               case SP_FRAGS:
-                       f = pl.(scores[SP_KILLS]);
-                       f -= pl.(scores[SP_SUICIDES]);
-                       return ftos(f);
-
-               case SP_KDRATIO:
-                       num = pl.(scores[SP_KILLS]);
-                       denom = pl.(scores[SP_DEATHS]);
-
-                       if(denom == 0) {
-                               sbar_field_rgb = '0 1 0';
-                               str = ftos(num);
-                       } else if(num <= 0) {
-                               sbar_field_rgb = '1 0 0';
-                               str = ftos(num/denom);
-                       } else
-                               str = ftos(num/denom);
-
-                       tmp = strstrofs(str, ".", 0);
-                       if(tmp > 0)
-                               str = substring(str, 0, tmp+2);
-                       return str;
-
-               default:
-                       tmp = pl.(scores[field]);
-                       f = scores_flags[field];
-                       if(field == ps_primary)
-                               sbar_field_rgb = '1 1 0';
-                       else if(field == ps_secondary)
-                               sbar_field_rgb = '0 1 1';
-                       else
-                               sbar_field_rgb = '1 1 1';
-                       return ScoreString(f, tmp);
-       }
-       //return "error";
-}
-
-float xmin, xmax, ymin, ymax, sbwidth;
-float sbar_fixscoreboardcolumnwidth_len;
-float sbar_fixscoreboardcolumnwidth_iconlen;
-float sbar_fixscoreboardcolumnwidth_marginlen;
-
-float stringwidth_colors(string s, vector theSize)
-{
-       return stringwidth(s, TRUE, theSize);
-}
-
-float stringwidth_nocolors(string s, vector theSize)
-{
-       return stringwidth(s, FALSE, theSize);
-}
-
-string Sbar_FixScoreboardColumnWidth(float i, string str)
-{
-       float field, f;
-       vector sz;
-       field = sbar_field[i];
-
-       sbar_fixscoreboardcolumnwidth_iconlen = 0;
-
-       if(sbar_field_icon0 != "")
-       {
-               sz = drawgetimagesize(sbar_field_icon0);
-               f = sz_x / sz_y;
-               if(sbar_fixscoreboardcolumnwidth_iconlen < f)
-                       sbar_fixscoreboardcolumnwidth_iconlen = f;
-       }
-
-       if(sbar_field_icon1 != "")
-       {
-               sz = drawgetimagesize(sbar_field_icon1);
-               f = sz_x / sz_y;
-               if(sbar_fixscoreboardcolumnwidth_iconlen < f)
-                       sbar_fixscoreboardcolumnwidth_iconlen = f;
-       }
-
-       if(sbar_field_icon2 != "")
-       {
-               sz = drawgetimagesize(sbar_field_icon2);
-               f = sz_x / sz_y;
-               if(sbar_fixscoreboardcolumnwidth_iconlen < f)
-                       sbar_fixscoreboardcolumnwidth_iconlen = f;
-       }
-
-       sbar_fixscoreboardcolumnwidth_iconlen *= sbar_fontsize_y / sbar_fontsize_x; // fix icon aspect
-
-       if(sbar_fixscoreboardcolumnwidth_iconlen != 0)
-               sbar_fixscoreboardcolumnwidth_marginlen = stringwidth(" ", FALSE, sbar_fontsize);
-       else
-               sbar_fixscoreboardcolumnwidth_marginlen = 0;
-
-       if(field == SP_NAME) // name gets all remaining space
-       {
-               float namesize, j;
-               namesize = sbwidth;// / sbar_fontsize_x;
-               for(j = 0; j < sbar_num_fields; ++j)
-                       if(j != i)
-                               if (sbar_field[i] != SP_SEPARATOR)
-                                       namesize -= sbar_size[j] + 1;
-               namesize += 1;
-               sbar_size[i] = namesize;
-               
-               if (sbar_fixscoreboardcolumnwidth_iconlen != 0)
-                       namesize -= sbar_fixscoreboardcolumnwidth_marginlen + sbar_fixscoreboardcolumnwidth_iconlen;
-               str = textShortenToWidth(str, namesize, sbar_fontsize, stringwidth_colors);
-               sbar_fixscoreboardcolumnwidth_len = stringwidth(str, TRUE, sbar_fontsize);
-       }
-       else
-               sbar_fixscoreboardcolumnwidth_len = stringwidth(str, FALSE, sbar_fontsize);
-       
-       f = sbar_fixscoreboardcolumnwidth_len + sbar_fixscoreboardcolumnwidth_marginlen + sbar_fixscoreboardcolumnwidth_iconlen;
-       if(sbar_size[i] < f)
-               sbar_size[i] = f;
-
-       return str;
-}
-
-void Sbar_PrintScoreboardItem(vector pos, entity pl, float is_self, float pl_number)
-{
-       vector tmp, rgb;
-       rgb = GetTeamRGB(pl.team);
-       string str;
-       float i, field;
-       float is_spec;
-       is_spec = (GetPlayerColor(pl.sv_entnum) == COLOR_SPECTATOR);
-       
-       if((rgb == '1 1 1') && (!is_spec)) {
-               rgb_x = cvar("sbar_color_bg_r") + 0.5;
-               rgb_y = cvar("sbar_color_bg_g") + 0.5;
-               rgb_z = cvar("sbar_color_bg_b") + 0.5; }
-               
-       // Layout:
-       tmp_x = sbwidth;
-       tmp_y = sbar_fontsize_y * 1.25;
-       tmp_z = 0;
-
-       // alternated rows highlighting
-       if(is_self)
-               drawfill(pos - '1 1 0', tmp + '2 0 0', rgb, sbar_scoreboard_highlight_alpha_self, DRAWFLAG_NORMAL);
-       else if((sbar_scoreboard_highlight) && (!mod(pl_number,2)))
-               drawfill(pos - '1 1 0', tmp + '2 0 0', rgb, sbar_scoreboard_highlight_alpha, DRAWFLAG_NORMAL);
-
-       tmp_y = 0;
-
-       for(i = 0; i < sbar_num_fields; ++i)
-       {
-               field = sbar_field[i];
-               if(field == SP_SEPARATOR)
-                       break;
-
-               if(is_spec && field != SP_NAME && field != SP_PING) {
-                       pos_x += sbar_size[i] + sbar_fontsize_x;
-                       continue;
-               }
-               str = Sbar_GetField(pl, field);
-               str = Sbar_FixScoreboardColumnWidth(i, str);
-
-               pos_x += sbar_size[i] + sbar_fontsize_x;
-
-               if(field == SP_NAME) {
-                       tmp_x = sbar_size[i] - sbar_fontsize_x*sbar_fixscoreboardcolumnwidth_iconlen - sbar_fixscoreboardcolumnwidth_marginlen + sbar_fontsize_x;
-                       if (is_self)
-                               drawcolorcodedstring(pos - tmp, str, sbar_fontsize, sbar_scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
-                       else
-                               drawcolorcodedstring(pos - tmp, str, sbar_fontsize, sbar_scoreboard_alpha_name, DRAWFLAG_NORMAL);
-               } else {
-                       tmp_x = sbar_fixscoreboardcolumnwidth_len + sbar_fontsize_x;
-                       if (is_self)
-                               drawstring(pos - tmp, str, sbar_fontsize, sbar_field_rgb, sbar_scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
-                       else
-                               drawstring(pos - tmp, str, sbar_fontsize, sbar_field_rgb, sbar_scoreboard_alpha_name, DRAWFLAG_NORMAL);
-               }
-
-               tmp_x = sbar_size[i] + sbar_fontsize_x;
-               if(sbar_field_icon0 != "")
-                       if (is_self)
-                               drawpic(pos - tmp, sbar_field_icon0, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon1_rgb, sbar_field_icon0_alpha * sbar_scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
-                       else
-                               drawpic(pos - tmp, sbar_field_icon0, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon1_rgb, sbar_field_icon0_alpha * sbar_scoreboard_alpha_name, DRAWFLAG_NORMAL);
-               if(sbar_field_icon1 != "")
-                       if (is_self)
-                               drawpic(pos - tmp, sbar_field_icon1, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon1_rgb, sbar_field_icon1_alpha * sbar_scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
-                       else
-                               drawpic(pos - tmp, sbar_field_icon1, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon1_rgb, sbar_field_icon1_alpha * sbar_scoreboard_alpha_name, DRAWFLAG_NORMAL);
-               if(sbar_field_icon2 != "")
-                       if (is_self)
-                               drawpic(pos - tmp, sbar_field_icon2, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon2_rgb, sbar_field_icon2_alpha * sbar_scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
-                       else
-                               drawpic(pos - tmp, sbar_field_icon2, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon2_rgb, sbar_field_icon2_alpha * sbar_scoreboard_alpha_name, DRAWFLAG_NORMAL);
-       }
-
-       if(sbar_field[i] == SP_SEPARATOR)
-       {
-               pos_x = xmax;
-               for(i = sbar_num_fields-1; i > 0; --i)
-               {
-                       field = sbar_field[i];
-                       if(field == SP_SEPARATOR)
-                               break;
-
-                       if(is_spec && field != SP_NAME && field != SP_PING) {
-                               pos_x -= sbar_size[i] + sbar_fontsize_x;
-                               continue;
-                       }
-
-                       str = Sbar_GetField(pl, field);
-                       str = Sbar_FixScoreboardColumnWidth(i, str);
-
-                       if(field == SP_NAME) {
-                               tmp_x = sbar_fixscoreboardcolumnwidth_len; // left or right aligned? let's put it right...
-                               if(is_self)
-                                       drawcolorcodedstring(pos - tmp, str, sbar_fontsize, sbar_scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
-                               else
-                                       drawcolorcodedstring(pos - tmp, str, sbar_fontsize, sbar_scoreboard_alpha_name, DRAWFLAG_NORMAL);
-                       } else {
-                               tmp_x = sbar_fixscoreboardcolumnwidth_len;
-                               if(is_self)
-                                       drawstring(pos - tmp, str, sbar_fontsize, sbar_field_rgb, sbar_scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
-                               else
-                                       drawstring(pos - tmp, str, sbar_fontsize, sbar_field_rgb, sbar_scoreboard_alpha_name, DRAWFLAG_NORMAL);
-                       }
-
-                       tmp_x = sbar_size[i];
-                       if(sbar_field_icon0 != "")
-                               if (is_self)
-                                       drawpic(pos - tmp, sbar_field_icon0, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon1_rgb, sbar_field_icon0_alpha * sbar_scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
-                               else
-                                       drawpic(pos - tmp, sbar_field_icon0, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon1_rgb, sbar_field_icon0_alpha * sbar_scoreboard_alpha_name, DRAWFLAG_NORMAL);
-                       if(sbar_field_icon1 != "")
-                               if (is_self)
-                                       drawpic(pos - tmp, sbar_field_icon1, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon1_rgb, sbar_field_icon1_alpha * sbar_scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
-                               else
-                                       drawpic(pos - tmp, sbar_field_icon1, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon1_rgb, sbar_field_icon1_alpha * sbar_scoreboard_alpha_name, DRAWFLAG_NORMAL);
-                       if(sbar_field_icon2 != "")
-                               if (is_self)
-                                       drawpic(pos - tmp, sbar_field_icon2, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon2_rgb, sbar_field_icon2_alpha * sbar_scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
-                               else
-                                       drawpic(pos - tmp, sbar_field_icon2, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon2_rgb, sbar_field_icon2_alpha * sbar_scoreboard_alpha_name, DRAWFLAG_NORMAL);
-                       pos_x -= sbar_size[i] + sbar_fontsize_x;
-               }
-       }
-}
-
-/*
- * Sbar_Scoreboard_MakeTable
- *
- * Makes a table for a team (for all playing players in DM) and fills it
- */
-
-vector Sbar_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_size)
-{
-       float body_table_height, i;
-       vector tmp, column_dim;
-       entity pl;
-
-       body_table_height = 1.25 * sbar_fontsize_y * max(1, tm.team_size); // no player? show 1 empty line
-
-       pos -= '1 1 0';
-
-       tmp_x = sbwidth + 2;
-       tmp_y = 1.25 * sbar_fontsize_y;
-
-       // rounded header
-       drawpic(pos, "gfx/hud/sb_scoreboard_tableheader", tmp, (rgb * sbar_color_bg_team) + '0.5 0.5 0.5', sbar_scoreboard_alpha_bg, DRAWFLAG_NORMAL);
-
-       // table border
-       tmp_y += sbar_border_thickness;
-       tmp_y += body_table_height;
-       drawborderlines(sbar_border_thickness, pos, tmp, '0 0 0', sbar_scoreboard_alpha_bg, DRAWFLAG_NORMAL); // more transparency for the scoreboard
-
-       // separator header/table
-       pos_y += 1.25 * sbar_fontsize_y;
-       tmp_y = sbar_border_thickness;
-       drawfill(pos, tmp, '0 0 0', sbar_scoreboard_alpha_bg, DRAWFLAG_NORMAL);
-
-       pos_y += sbar_border_thickness;
-
-       // table background
-       tmp_y = body_table_height;
-       drawpic_tiled(pos, "gfx/hud/sb_scoreboard_bg", bg_size, tmp, rgb * sbar_color_bg_team, sbar_scoreboard_alpha_bg, DRAWFLAG_NORMAL);
-
-       // anyway, apply some color
-       //drawfill(pos, tmp + '2 0 0', rgb, 0.1, DRAWFLAG_NORMAL);
-
-       // go back to the top to make alternated columns highlighting and to print the strings
-       pos_y -= 1.25 * sbar_fontsize_y;
-       pos_y -= sbar_border_thickness;
-
-       pos += '1 1 0';
-
-       if (sbar_scoreboard_highlight)
-       {
-               column_dim_y = 1.25 * sbar_fontsize_y; // header
-               column_dim_y += sbar_border_thickness;
-               column_dim_y += body_table_height;
-       }
-
-       // print the strings of the columns headers and draw the columns
-       for(i = 0; i < sbar_num_fields; ++i)
-       {
-               if(sbar_field[i] == SP_SEPARATOR)
-                       break;
-               column_dim_x = sbar_size[i] + sbar_fontsize_x;
-               if (sbar_scoreboard_highlight)
-               {
-                       if (mod(i,2))
-                               drawfill(pos - '0 1 0' - sbar_fontsize_x / 2 * '1 0 0', column_dim, '0 0 0', sbar_scoreboard_alpha_bg * 0.2, DRAWFLAG_NORMAL);
-               }
-               drawstring(pos, sbar_title[i], sbar_fontsize, rgb * 1.5, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-               pos_x += column_dim_x;
-       }
-       if(sbar_field[i] == SP_SEPARATOR)
-       {
-               pos_x = xmax;
-               tmp_y = 0;
-               for(i = sbar_num_fields-1; i > 0; --i)
-               {
-                       if(sbar_field[i] == SP_SEPARATOR)
-                               break;
-
-                       pos_x -= sbar_size[i];
-
-                       if (sbar_scoreboard_highlight)
-                       {
-                               if (!mod(i,2))
-                               {
-                                       if (i == sbar_num_fields-1)
-                                               column_dim_x = sbar_size[i] + sbar_fontsize_x / 2 + 1;
-                                       else
-                                               column_dim_x = sbar_size[i] + sbar_fontsize_x;
-                                       drawfill(pos - '0 1 0' - sbar_fontsize_x / 2 * '1 0 0', column_dim, '0 0 0', sbar_scoreboard_alpha_bg * 0.2, DRAWFLAG_NORMAL);
-                               }
-                       }
-
-                       tmp_x = stringwidth(sbar_title[i], FALSE, sbar_fontsize);
-                       tmp_x = sbar_size[i] - tmp_x;
-                       drawstring(pos + tmp, sbar_title[i], sbar_fontsize, rgb * 1.5, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-                       pos_x -= sbar_fontsize_x;
-               }
-       }
-       
-       pos_x = xmin;
-       pos_y += 1.25 * sbar_fontsize_y; // skip the header
-       pos_y += sbar_border_thickness;
-
-       // fill the table and draw the rows
-       i = 0;
-       if (teamplay)
-               for(pl = players.sort_next; pl; pl = pl.sort_next)
-               {
-                       if(pl.team != tm.team)
-                               continue;
-                       Sbar_PrintScoreboardItem(pos, pl, (pl.sv_entnum == player_localentnum - 1), i);
-                       pos_y += 1.25 * sbar_fontsize_y;
-                       ++i;
-               }
-       else
-               for(pl = players.sort_next; pl; pl = pl.sort_next)
-               {
-                       if(pl.team == COLOR_SPECTATOR)
-                               continue;
-                       Sbar_PrintScoreboardItem(pos, pl, (pl.sv_entnum == player_localentnum - 1), i);
-                       pos_y += 1.25 * sbar_fontsize_y;
-                       ++i;
-               }
-       
-       if (i == 0)
-               pos_y += 1.25 * sbar_fontsize_y; // move to the end of the table
-       pos_y += 1.25 * sbar_fontsize_y; // move empty row (out of the table)
-
-       return pos;
-}
-
-float Sbar_WouldDrawScoreboard() {
-       if (sb_showscores)
-               return 1;
-       else if (intermission == 1)
-               return 1;
-       else if (intermission == 2)
-               return 1;
-       else if (getstati(STAT_HEALTH) <= 0 && cvar("cl_deathscoreboard"))
-               return 1;
-       else if(sb_showscores_force)
-               return 1;
-       return 0;
-}
-
-float g_minstagib;
-float average_accuracy;
-vector Sbar_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size)
-{
-       float i;
-       float weapon_hit, weapon_damage, weapon_stats;
-       float fontsize = 40 * 1/3;
-       float xsave;
-       float weapon_cnt;
-       float rows;
-       if(cvar("sbar_accuracy_doublerows"))
-               rows = 2;
-       else
-               rows = 1;
-       float height = 40;
-
-       if(warmup_stage)
-       {
-               return pos;
-       }
-
-       xsave = pos_x;
-       drawstring(pos, strcat("Accuracy stats (average ", ftos(average_accuracy), "%)"), sbar_fontsize, '1 1 1', sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-       pos_y += 18;
-       vector tmp;
-       tmp_x = sbwidth;
-       tmp_y = height * rows;
-
-       drawpic_tiled(pos, "gfx/hud/sb_scoreboard_bg", bg_size, tmp, rgb * sbar_color_bg_team, sbar_scoreboard_alpha_bg, DRAWFLAG_NORMAL);
-       drawborderlines(sbar_accuracy_border_thickness, pos, tmp, '0 0 0', sbar_scoreboard_alpha_bg * 0.75, DRAWFLAG_NORMAL);
-
-       // column highlighting
-       for(i = 0; i < weapon_cnt/rows; ++i)
-       {
-               if(!mod(i, 2))
-                       drawfill(pos + '1 0 0' * (sbwidth/weapon_cnt) * rows * i, '0 1 0' * height * rows + '1 0 0' * (sbwidth/weapon_cnt) * rows, '0 0 0', sbar_scoreboard_alpha_bg * 0.2, DRAWFLAG_NORMAL);
-       }
-
-       // row highlighting
-       for(i = 0; i < rows; ++i)
-       {
-               drawfill(pos + '0 1 0' * height * (2/3) + '0 1 0' * height * i, '1 0 0' * sbwidth + '0 1 0' * fontsize, '1 1 1', sbar_scoreboard_highlight_alpha, DRAWFLAG_NORMAL);     
-       }
-
-       if(getstati(STAT_SWITCHWEAPON) == WEP_MINSTANEX)
-               g_minstagib = 1; // TODO: real detection for minstagib?
-
-       // skip useless weapons
-       weapon_cnt = 0;
-       for(i = WEP_FIRST; i <= WEP_LAST; ++i)
-       {
-               self = get_weaponinfo(i);
-               if not(self.weapons)
-                       continue;
-               if ((i == WEP_NEX && g_minstagib) || i == WEP_PORTO || (i == WEP_MINSTANEX && !g_minstagib) || i == WEP_TUBA || i == WEP_FIREBALL) // skip port-o-launch, nex || minstanex, tuba and fireball
-                       continue;
-               ++weapon_cnt;
-       }
-
-       drawfont = sbar_bigfont;
-       average_accuracy = 0;
-       float weapons_with_stats;
-       weapons_with_stats = 0;
-       if(rows == 2)
-               pos_x += sbwidth/weapon_cnt / 2;
-
-       for(i = WEP_FIRST; i <= WEP_LAST; ++i)
-       {
-               self = get_weaponinfo(i);
-               if not(self.weapons)
-                       continue;
-               if ((i == WEP_NEX && g_minstagib) || i == WEP_PORTO || (i == WEP_MINSTANEX && !g_minstagib) || i == WEP_TUBA || i == WEP_FIREBALL) // skip port-o-launch, nex || minstanex, tuba and fireball
-                       continue;
-               weapon_hit = weapon_hits[i-WEP_FIRST];
-               weapon_damage = weapon_fired[i-WEP_FIRST];
-               if(weapon_damage)
-                       weapon_stats = bound(0, floor(100 * weapon_hit / weapon_damage), 100);
-               float weapon_alpha;
-
-               if(weapon_damage)
-                       weapon_alpha = sbar_scoreboard_alpha_fg;
-               else
-                       weapon_alpha = 0.2 * sbar_scoreboard_alpha_fg;
-
-               // weapon icon
-               drawpic(pos, strcat("gfx/hud/inv_weapon", self.netname), '1 0 0' * sbwidth * (1/weapon_cnt) + '0 1 0' * height * (2/3), '1 1 1', weapon_alpha, DRAWFLAG_NORMAL);
-               // the accuracy
-               if(weapon_damage) {
-                       weapons_with_stats += 1;
-                       average_accuracy += weapon_stats; // store sum of all accuracies in average_accuracy
-
-                       string s;
-                       s = strcat(ftos(weapon_stats),"%");
-
-                       float padding;
-                       padding = ((sbwidth/weapon_cnt) - stringwidth(s, FALSE, '1 0 0' * fontsize)) / 2; // center the accuracy value
-
-                       rgb = Sbar_AccuracyColor(weapon_stats);
-                       drawstring(pos + '1 0 0' * padding + '0 1 0' * height * (2/3), s, '1 1 0' * fontsize, rgb, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-               }
-               pos_x += sbwidth/weapon_cnt * rows;
-               if(rows == 2 && i == 6) {
-                       pos_x -= sbwidth;
-                       pos_y += height;
-               }
-       }
-       drawfont = sbar_font;
-
-       if(weapons_with_stats)
-               average_accuracy = floor(average_accuracy / weapons_with_stats);
-
-       pos_x = xsave;
-       pos_y += height;
-       return pos;
-}
-
-string race_PlaceName(float pos) {
-       if(pos == 1)
-               return "1st";
-       else if(pos == 2)
-               return "2nd";
-       else if(pos == 3)
-               return "3rd";
-       else
-               return strcat(ftos(pos), "th");
-}
-
-vector Sbar_DrawScoreboardRankings(vector pos, entity pl,  vector rgb, vector bg_size)
-{
-       float i;
-       RANKINGS_RECEIVED_CNT = 0;
-               for (i=RANKINGS_CNT-1; i>=0; --i)
-                       if (grecordtime[i])
-                               RANKINGS_RECEIVED_CNT = RANKINGS_RECEIVED_CNT + 1;
-
-       if (RANKINGS_RECEIVED_CNT == 0)
-               return pos;
-
-       float is_spec;
-       is_spec = (GetPlayerColor(pl.sv_entnum) == COLOR_SPECTATOR);
-       vector hl_rgb;
-               hl_rgb_x = cvar("sbar_color_bg_r") + 0.5;
-               hl_rgb_y = cvar("sbar_color_bg_g") + 0.5;
-               hl_rgb_z = cvar("sbar_color_bg_b") + 0.5;
-
-       pos_y += sbar_fontsize_y;
-       drawstring(pos, strcat("Rankings"), sbar_fontsize, '1 1 1', sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-       pos_y += sbar_fontsize_y;
-       vector tmp;
-       tmp_x = sbwidth;
-       tmp_y = sbar_fontsize_y * RANKINGS_RECEIVED_CNT;
-
-       drawpic_tiled(pos, "gfx/hud/sb_scoreboard_bg", bg_size, tmp, rgb * sbar_color_bg_team, sbar_scoreboard_alpha_bg, DRAWFLAG_NORMAL);
-       drawborderlines(sbar_border_thickness, pos, tmp, '0 0 0', sbar_scoreboard_alpha_bg * 0.75, DRAWFLAG_NORMAL);
-
-       // row highlighting
-       for(i = 0; i<RANKINGS_RECEIVED_CNT; ++i)
-       {
-               string n, p;
-               float t;
-               t = grecordtime[i];
-               if (t == 0)
-                       continue;
-               n = grecordholder[i];
-               p = race_PlaceName(i+1);
-               if(grecordholder[i] == GetPlayerName(player_localentnum - 1))
-                       drawfill(pos, '1 0 0' * sbwidth + '0 1 0' * sbar_fontsize_y, hl_rgb, sbar_scoreboard_highlight_alpha_self, DRAWFLAG_NORMAL);    
-               else if(!mod(i, 2) && sbar_scoreboard_highlight)
-                       drawfill(pos, '1 0 0' * sbwidth + '0 1 0' * sbar_fontsize_y, hl_rgb, sbar_scoreboard_highlight_alpha, DRAWFLAG_NORMAL); 
-               drawstring(pos, p, sbar_fontsize, '1 1 1', sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-               drawstring(pos + '3 0 0' * sbar_fontsize_x, TIME_ENCODED_TOSTRING(t), sbar_fontsize, '1 1 1', sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-               drawcolorcodedstring(pos + '8 0 0' * sbar_fontsize_x, n, sbar_fontsize, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-               pos += '0 1 0' * sbar_fontsize_y;
-       }
-
-       return pos;
-}
-
-float scoreboard_bottom;
-float sbar_scoreboard_fade_alpha;
-float sbar_woulddrawscoreboard_prev;
-float sbar_woulddrawscoreboard_change; // "time" at which Sbar_WouldDrawScoreboard() changed
-void Sbar_DrawScoreboard()
-{
-       float sbar_woulddrawscoreboard; 
-       sbar_woulddrawscoreboard = Sbar_WouldDrawScoreboard();
-       if(sbar_woulddrawscoreboard != sbar_woulddrawscoreboard_prev) {
-               sbar_woulddrawscoreboard_change = time;
-               sbar_woulddrawscoreboard_prev = sbar_woulddrawscoreboard;
-       }
-
-       float scoreboard_fadeinspeed = cvar_or("sbar_scoreboard_fadeinspeed", 10);
-       float scoreboard_fadeoutspeed = cvar_or("sbar_scoreboard_fadeoutspeed", 5);
-       if(sbar_woulddrawscoreboard) {
-               if (scoreboard_fadeinspeed)
-                       sbar_scoreboard_fade_alpha = bound (0, (time - sbar_woulddrawscoreboard_change) * scoreboard_fadeinspeed, 1);
-               else
-                       sbar_scoreboard_fade_alpha = 1;
-       }
-       else
-               if (scoreboard_fadeoutspeed)
-                       sbar_scoreboard_fade_alpha = bound (0, (1/scoreboard_fadeoutspeed - (time - sbar_woulddrawscoreboard_change)) * scoreboard_fadeoutspeed, 1);
-               else
-                       sbar_scoreboard_fade_alpha = 0;
-
-       if not(sbar_scoreboard_fade_alpha)
-               return;
-               
-       sbar_scoreboard_alpha_bg = cvar("sbar_scoreboard_alpha_bg") * sbar_scoreboard_fade_alpha;
-       sbar_scoreboard_alpha_fg = cvar_or("sbar_scoreboard_alpha_fg", 1.0) * sbar_scoreboard_fade_alpha;
-       sbar_scoreboard_highlight = cvar("sbar_scoreboard_highlight");
-       sbar_scoreboard_highlight_alpha = cvar_or("sbar_scoreboard_highlight_alpha", 0.10) * sbar_scoreboard_alpha_fg;
-       sbar_scoreboard_highlight_alpha_self = cvar_or("sbar_scoreboard_highlight_alpha_self", 0.25) * sbar_scoreboard_alpha_fg;
-       sbar_scoreboard_alpha_name = cvar_or("sbar_scoreboard_alpha_name", 0.9) * sbar_scoreboard_alpha_fg;
-       sbar_scoreboard_alpha_name_self = cvar_or("sbar_scoreboard_alpha_name_self", 1) * sbar_scoreboard_alpha_fg;
-       
-       vector rgb, pos, tmp;
-       entity pl, tm;
-
-       sbwidth = Sbar_GetWidth(6.5 * sbar_fontsize_y);
-
-       xmin = 0.5 * (vid_conwidth - sbwidth);
-       ymin = SCOREBOARD_OFFSET;
-
-       xmax = vid_conwidth - xmin;
-       ymax = vid_conheight - 0.2*vid_conheight;
-
-       // Initializes position
-       pos_x = xmin;
-       pos_y = ymin;
-       pos_z = 0;
-
-       // Heading
-       drawfont = sbar_bigfont;
-       drawstringcenter('0 1 0' * ymin, "Scoreboard", '24 24 0', '1 1 1', sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-
-       pos_y += 24 + 4;
-       pos_y += sbar_fontsize_y;
-
-       drawfont = sbar_font;
-
-       // Draw the scoreboard
-       vector bg_size;
-       bg_size = drawgetimagesize("gfx/hud/sb_scoreboard_bg");
-
-       if(teamplay)
-       {
-               for(tm = teams.sort_next; tm; tm = tm.sort_next)
-               {
-                       if(tm.team == COLOR_SPECTATOR)
-                               continue;
-
-                       rgb = GetTeamRGB(tm.team);
-                       Sbar_DrawXNum(pos - '9.5 0 0' * sbar_fontsize_y + '0 1 0' * sbar_fontsize_y, tm.(teamscores[ts_primary]), 6, 0, sbar_fontsize_y * 1.5, rgb, 0, 1, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-                               
-                       if(ts_primary != ts_secondary)
-                               Sbar_DrawXNum(pos - '7.5 0 0' * sbar_fontsize_y + '0 2.5 0' * sbar_fontsize_y, tm.(teamscores[ts_secondary]), 6, 0, sbar_fontsize_y * 1, rgb, 0, 1, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-
-                       pos = Sbar_Scoreboard_MakeTable(pos, tm, rgb, bg_size);
-               }
-       }
-       else
-       {
-               rgb_x = cvar("sbar_color_bg_r");
-               rgb_y = cvar("sbar_color_bg_g");
-               rgb_z = cvar("sbar_color_bg_b");
-
-               for(tm = teams.sort_next; tm; tm = tm.sort_next)
-               {
-                       if(tm.team == COLOR_SPECTATOR)
-                               continue;
-
-                       pos = Sbar_Scoreboard_MakeTable(pos, tm, rgb, bg_size);
-               }
-       }
-
-       if(gametype == GAME_CTS || gametype == GAME_RACE) {
-               if(race_speedaward) {
-                       drawcolorcodedstring(pos, strcat("Speed award: ", ftos(race_speedaward), " (", race_speedaward_holder, ")"), sbar_fontsize, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-                       pos_y += 1.25 * sbar_fontsize_y;
-               }
-               if(race_speedaward_alltimebest) {
-                       drawcolorcodedstring(pos, strcat("All-time fastest: ", ftos(race_speedaward_alltimebest), " (", race_speedaward_alltimebest_holder, ")"), sbar_fontsize, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-                       pos_y += 1.25 * sbar_fontsize_y;
-               }
-               pos = Sbar_DrawScoreboardRankings(pos, pl, rgb, bg_size);
-       }
-       else if(cvar("sbar_accuracy") && spectatee_status != -1) {
-               if(teamplay)
-                       pos = Sbar_DrawScoreboardAccuracyStats(pos, GetTeamRGB(myteam), bg_size);
-               else
-                       pos = Sbar_DrawScoreboardAccuracyStats(pos, rgb, bg_size);
-       }
-
-       tmp = pos + '0 1.5 0' * sbar_fontsize_y;
-       pos_y += 3 * sbar_fontsize_y;
-
-       // List spectators
-       float specs;
-       specs = 0;
-       for(pl = players.sort_next; pl; pl = pl.sort_next)
-       {
-               if(pl.team != COLOR_SPECTATOR)
-                       continue;
-               Sbar_PrintScoreboardItem(pos, pl, (pl.sv_entnum == player_localentnum - 1), specs);
-               pos_y += 1.25 * sbar_fontsize_y;
-               ++specs;
-       }
-
-       if(specs)
-               drawstring(tmp, "Spectators", sbar_fontsize, '1 1 1', sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-
-       // Print info string
-       string str;
-       float tl, fl, ll;
-       str = strcat("playing on ^2", shortmapname, "^7");
-       tl = getstatf(STAT_TIMELIMIT);
-       fl = getstatf(STAT_FRAGLIMIT);
-       ll = getstatf(STAT_LEADLIMIT);
-       if(gametype == GAME_LMS)
-       {
-               if(tl > 0)
-                       str = strcat(str, " for up to ^1", ftos(tl), " minutes^7");
-       }
-       else
-       {
-               if(tl > 0)
-                       str = strcat(str, " for ^1", ftos(tl), " minutes^7");
-               if(fl > 0)
-               {
-                       if(tl > 0)
-                               str = strcat(str, " or");
-                       if(teamplay)
-                       {
-                               str = strcat(str, " until ^3", ScoreString(teamscores_flags[ts_primary], fl));
-                               if(teamscores_label[ts_primary] == "score")
-                                       str = strcat(str, " points^7");
-                               else if(teamscores_label[ts_primary] == "fastest")
-                                       str = strcat(str, " is beaten^7");
-                               else
-                                       str = strcat(str, " ", teamscores_label[ts_primary]);
-                       }
-                       else
-                       {
-                               str = strcat(str, " until ^3", ScoreString(scores_flags[ps_primary], fl));
-                               if(scores_label[ps_primary] == "score")
-                                       str = strcat(str, " points^7");
-                               else if(scores_label[ps_primary] == "fastest")
-                                       str = strcat(str, " is beaten^7");
-                               else
-                                       str = strcat(str, " ", scores_label[ps_primary]);
-                       }
-               }
-               if(ll > 0)
-               {
-                       if(tl > 0 || fl > 0)
-                               str = strcat(str, " or");
-                       if(teamplay)
-                       {
-                               str = strcat(str, " until a lead of ^3", ScoreString(teamscores_flags[ts_primary], ll));
-                               if(teamscores_label[ts_primary] == "score")
-                                       str = strcat(str, " points^7");
-                               else if(teamscores_label[ts_primary] == "fastest")
-                                       str = strcat(str, " is beaten^7");
-                               else
-                                       str = strcat(str, " ", teamscores_label[ts_primary]);
-                       }
-                       else
-                       {
-                               str = strcat(str, " until a lead of ^3", ScoreString(scores_flags[ps_primary], ll));
-                               if(scores_label[ps_primary] == "score")
-                                       str = strcat(str, " points^7");
-                               else if(scores_label[ps_primary] == "fastest")
-                                       str = strcat(str, " is beaten^7");
-                               else
-                                       str = strcat(str, " ", scores_label[ps_primary]);
-                       }
-               }
-       }
-
-
-       pos_y += 1.2 * sbar_fontsize_y;
-       drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - stringwidth(str, TRUE, sbar_fontsize)), str, sbar_fontsize, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-
-       scoreboard_bottom = pos_y + 2 * sbar_fontsize_y;
-}
-
-string MakeRaceString(float cp, float mytime, float histime, float lapdelta, string hisname)
-{
-       string col;
-       string timestr;
-       string cpname;
-       string lapstr;
-       lapstr = "";
-
-       if(histime == 0) // goal hit
-       {
-               if(mytime > 0)
-               {
-                       timestr = strcat("+", ftos_decimals(+mytime, TIME_DECIMALS));
-                       col = "^1";
-               }
-               else if(mytime == 0)
-               {
-                       timestr = "+0.0";
-                       col = "^3";
-               }
-               else
-               {
-                       timestr = strcat("-", ftos_decimals(-mytime, TIME_DECIMALS));
-                       col = "^2";
-               }
-
-               if(lapdelta > 0)
-               {
-                       lapstr = strcat(" (-", ftos(lapdelta), "L)");
-                       col = "^2";
-               }
-               else if(lapdelta < 0)
-               {
-                       lapstr = strcat(" (+", ftos(-lapdelta), "L)");
-                       col = "^1";
-               }
-       }
-       else if(histime > 0) // anticipation
-       {
-               if(mytime >= histime)
-                       timestr = strcat("+", ftos_decimals(mytime - histime, TIME_DECIMALS));
-               else
-                       timestr = TIME_ENCODED_TOSTRING(TIME_ENCODE(histime));
-               col = "^3";
-       }
-       else
-               col = "^7";
-
-       if(cp == 254)
-               cpname = "Start line";
-       else if(cp == 255)
-               cpname = "Finish line";
-       else if(cp)
-               cpname = strcat("Intermediate ", ftos(cp));
-       else
-               cpname = "Finish line";
-
-       if(histime < 0)
-               return strcat(col, cpname);
-       else if(hisname == "")
-               return strcat(col, cpname, " (", timestr, ")");
-       else
-               return strcat(col, cpname, " (", timestr, " ", strcat(hisname, col, lapstr), ")");
-}
-
-float race_CheckName(string net_name) { // Does the name already exist in rankings? In that case, where? (otherwise 0)
-       float i;
-       for (i=RANKINGS_CNT-1;i>=0;--i)
-               if(grecordholder[i] == net_name)
-                       return i+1;
-       return 0;
-}
-
-float race_status_time;
-float race_status_prev;
-string race_status_name_prev;
-void Sbar_DrawRaceStatus(vector pos)
-{
-       if (race_status != race_status_prev || race_status_name != race_status_name_prev) {
-               race_status_time = time + 5;
-               race_status_prev = race_status;
-               if (race_status_name_prev)
-                       strunzone(race_status_name_prev);
-               race_status_name_prev = strzone(race_status_name);
-       }
-
-       float a;
-       a = bound(0, race_status_time - time, 1);
-
-       string s;
-       s = textShortenToWidth(race_status_name, 120, '10 10 0', stringwidth_colors);
-
-       float rank;
-       if(race_status > 0)
-               rank = race_CheckName(race_status_name);
-       string rankname;
-       rankname = race_PlaceName(rank);
-
-       if(race_status == 0)
-               drawpic(pos, "gfx/hud/race/newfail", '80 80 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-       else if(race_status == 1) {
-               drawpic(pos, "gfx/hud/race/newtime", '80 80 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);   
-               drawcolorcodedstring(pos + '40 80 0' - '1 0 0' * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-               drawstring(pos + '40 20 0' - '1 0 0' * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-       } else if(race_status == 2) {
-               if(race_status_name == GetPlayerName(player_localentnum -1) || !race_myrank || race_myrank < rank)
-                       drawpic(pos, "gfx/hud/race/newrankgreen", '80 80 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-               else
-                       drawpic(pos, "gfx/hud/race/newrankyellow", '80 80 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-               drawcolorcodedstring(pos + '40 80 0' - '1 0 0' * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-               drawstring(pos + '40 20 0' - '1 0 0' * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-       } else if(race_status == 3) {
-               drawpic(pos, "gfx/hud/race/newrecordserver", '80 80 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-               drawcolorcodedstring(pos + '40 80 0' - '1 0 0' * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-               drawstring(pos + '40 20 0' - '1 0 0' * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-       }
-
-       if (race_status_time - time <= 0) {
-               race_status_prev = -1;
-               race_status = -1;
-               if(race_status_name)
-                       strunzone(race_status_name);
-               race_status_name = string_null;
-               if(race_status_name_prev)
-                       strunzone(race_status_name_prev);
-               race_status_name_prev = string_null;
-       }
-}
-
-void Sbar_Score()
-{
-       float score, distribution, leader;
-       vector score_pos, secondary_score_pos, distribution_color;
-       entity tm, pl, me;
-       me = (spectatee_status > 0) ? playerslots[spectatee_status - 1] : playerslots[player_localentnum - 1];
-
-       vector bottomright;
-       bottomright_x = vid_conwidth;
-       bottomright_y = vid_conheight;
-       bottomright_z = 0;
-
-       score_pos = bottomright - '245 42 0'; // for same alignment as before: 294
-       secondary_score_pos = score_pos + '149 -6 0';
-
-       if((scores_flags[ps_primary] & SFL_TIME) && !teamplay) { // race/cts record display on HUD
-               pl = players.sort_next;
-               if(pl == me)
-                       pl = pl.sort_next;
-               if(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)
-                       if(pl.scores[ps_primary] == 0)
-                               pl = world;
-
-               score = me.(scores[ps_primary]);
-
-               float racemin, racesec, racemsec;
-               float distsec, distmsec, minusplus;
-               
-               racemin = floor(score/(60 * TIME_FACTOR));
-               racesec = floor((score - racemin*(60 * TIME_FACTOR))/TIME_FACTOR);
-               racemsec = score - racemin*60*TIME_FACTOR - racesec*TIME_FACTOR;
-
-               if (pl && ((!(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)) || score)) {
-                       // distribution display
-                       distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]);
-
-                       if (distribution < TIME_FACTOR && distribution > -TIME_FACTOR)
-                               distmsec = fabs(distribution);
-                       else {
-                               distsec = floor(fabs(distribution)/TIME_FACTOR);
-                               distmsec = fabs(distribution) - distsec*TIME_FACTOR;
-                               if (distribution < 0)
-                                       distsec = -distsec;
-                       }
-
-                       if (distribution <= 0) {
-                               distribution_color = '0 1 0';
-                               minusplus = 1; // minusplus 1: always prefix with minus sign
-                       }
-                       else {
-                               distribution_color = '1 0 0';
-                               minusplus = 2; // minusplus 1: always prefix with plus sign
-                       }
-                       Sbar_DrawXNum(bottomright - '0 48 0' - '16 0 0' * TIME_DECIMALS, distmsec, -TIME_DECIMALS, 0, 16, distribution_color, 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-                       Sbar_DrawXNum(bottomright - '68 48 0' - '16 0 0' * TIME_DECIMALS, distsec, 4, minusplus, 16, distribution_color, 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-                       drawpic(bottomright - '10 48 0' - '16 0 0' * TIME_DECIMALS, "gfx/hud/num_dot", '16 16 0', distribution_color, sbar_alpha_fg, DRAWFLAG_ADDITIVE);
-               }
-               // race record display
-               if (distribution <= 0 || distribution == score) // draw the highlight background behind the timer if we have the lead
-                       drawpic(bottomright - '0 32 0' - '32 0 0' * (4 + TIME_DECIMALS), "gfx/hud/sb_highlight_4", '0 28 0' + '32 0 0' * (4 + TIME_DECIMALS), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-               Sbar_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0', racemsec, -TIME_DECIMALS, 0, 30, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-               Sbar_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0'  - '66 0 0', racesec, -2, 0, 30, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-               drawpic(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '18 0 0', "gfx/hud/num_dot", '30 30 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE);
-
-               Sbar_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '132 0 0', racemin, -2, 0, 30, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-               drawpic(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '84 0 0', "gfx/hud/num_colon", '30 30 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE);
-
-       } else if (!teamplay) { // non-teamgames, except race/cts
-               // me vector := [team/connected frags id]
-               pl = players.sort_next;
-               if(pl == me)
-                       pl = pl.sort_next;
-
-               if(pl)
-                       distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]);
-               else
-                       distribution = 0;
-
-               score = me.(scores[ps_primary]);
-               
-               if(distribution >= 5) {
-                       distribution_color = '0 1 0';
-                       leader = 1;
-               } else if(distribution >= 0) {
-                       distribution_color = '1 1 1';
-                       leader = 1;
-               } else if(distribution >= -5)
-                       distribution_color = '1 1 0';
-               else
-                       distribution_color = '1 0 0';
-               
-               Sbar_DrawXNum(secondary_score_pos, distribution, 6, 3, 16, distribution_color, 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-               Sbar_DrawXNum(score_pos, score, 6, 0, 34, distribution_color, leader, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-       } else { // teamgames
-               float max_fragcount;
-               max_fragcount = -999;
-
-               for(tm = teams.sort_next; tm; tm = tm.sort_next) {
-                       if(tm.team == COLOR_SPECTATOR || !tm.team_size) // no players? don't display
-                               continue;
-                       score = tm.(teamscores[ts_primary]);
-                       leader = 0;
-
-                       if (score > max_fragcount)
-                               max_fragcount = score;
-       
-                       if(tm.team == myteam) {
-                               if (max_fragcount == score)
-                                       leader = 1;
-                               Sbar_DrawXNum(score_pos, score, 4, 0, 34, GetTeamRGB(tm.team) * 0.8, leader, 1, sbar_alpha_fg, DRAWFLAG_NORMAL);
-                       } else {
-                               if (max_fragcount == score)
-                                       leader = 1;
-                               Sbar_DrawXNum(secondary_score_pos, score, 6, 0, 16, GetTeamRGB(tm.team) * 0.8, leader, 1, sbar_alpha_fg, DRAWFLAG_NORMAL);
-                               secondary_score_pos = secondary_score_pos + '0 16 0';
-                       }
-               }
-       }
-
-       if(gametype == GAME_RACE || gametype == GAME_CTS)
-       {
-               drawfont = sbar_bigfont;
-               float a, t;
-               vector m;
-               string s, forcetime;
-
-               m = '0.5 0 0' * vid_conwidth + '0 1 0' * cvar_or("cl_racetimer_position", 0.25) * vid_conheight;
-
-               if(race_checkpointtime)
-               {
-                       a = bound(0, 2 - (time - race_checkpointtime), 1);
-                       s = "";
-                       forcetime = "";
-                       if(a > 0) // just hit a checkpoint?
-                       {
-                               if(race_checkpoint != 254)
-                               {
-                                       if(race_time && race_previousbesttime)
-                                               s = MakeRaceString(race_checkpoint, TIME_DECODE(race_time) - TIME_DECODE(race_previousbesttime), 0, 0, race_previousbestname);
-                                       else
-                                               s = MakeRaceString(race_checkpoint, 0, -1, 0, race_previousbestname);
-                                       if(race_time)
-                                               forcetime = TIME_ENCODED_TOSTRING(race_time);
-                               }
-                       }
-                       else
-                       {
-                               if(race_laptime && race_nextbesttime && race_nextcheckpoint != 254)
-                               {
-                                       a = bound(0, 2 - ((race_laptime + TIME_DECODE(race_nextbesttime)) - (time + TIME_DECODE(race_penaltyaccumulator))), 1);
-                                       if(a > 0) // next one?
-                                       {
-                                               s = MakeRaceString(race_nextcheckpoint, (time + TIME_DECODE(race_penaltyaccumulator)) - race_laptime, TIME_DECODE(race_nextbesttime), 0, race_nextbestname);
-                                       }
-                               }
-                       }
-
-                       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', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(m - '0 16 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-                       }
-
-                       if(race_penaltytime)
-                       {
-                               a = bound(0, 2 - (time - race_penaltyeventtime), 1);
-                               if(a > 0)
-                               {
-                                       s = strcat("^1PENALTY: ", ftos_decimals(race_penaltytime * 0.1, 1), " (", race_penaltyreason, ")");
-                                       dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
-                                       //drawcolorcodedstring(m - '0 32 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-                                       drawcolorcodedstring(m - '0 32 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', sbar_alpha_fg * 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', sbar_alpha_fg, 0, a);
-                               drawstring_expanding(m - '1 0 0' * stringwidth(forcetime, FALSE, '16 0 0'), forcetime, '32 32 0', '1 1 1', sbar_alpha_fg, 0, a);
-                       }
-                       else
-                               a = 1;
-
-                       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', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-                               drawstring(m - '0.5 0 0' * stringwidth(s, FALSE, '32 32 0'), s, '32 32 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-                       }
-               }
-               else
-               {
-                       if(race_mycheckpointtime)
-                       {
-                               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', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(m - '0 16 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', sbar_alpha_fg * 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', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(m - '0 0 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-                       }
-
-                       if(race_penaltytime && !race_penaltyaccumulator)
-                       {
-                               t = race_penaltytime * 0.1 + race_penaltyeventtime;
-                               a = bound(0, (1 + t - time), 1);
-                               if(a > 0)
-                               {
-                                       if(time < t)
-                                               s = strcat("^1PENALTY: ", ftos_decimals(t - time, 1), " (", race_penaltyreason, ")");
-                                       else
-                                               s = strcat("^2PENALTY: 0.0 (", race_penaltyreason, ")");
-                                       dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
-                                       //drawcolorcodedstring(m - '0 32 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-                                       drawcolorcodedstring(m - '0 32 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-                               }
-                       }
-               }
-
-               drawfont = sbar_font;
-       }
-}
-
-void Sbar_Timer()
-{
-       float timelimit, elapsedTime, minutes, seconds, timeleft, minutesLeft, secondsLeft;
-       vector bgpos, timer_color;
-       bgpos = '0 0 0';
-       
-       vector topright;
-       topright = '0 0 0';
-       topright_x = vid_conwidth;
-       
-       float scale;
-       scale = cvar_or("sbar_timer_scale", 1);
-       timelimit = getstatf(STAT_TIMELIMIT);
-
-       Sbar_DrawRaceStatus((topright_x - 100) * '1 0 0' + '0 30 0' * scale);
-       
-       timeleft = max(0, timelimit * 60 + getstatf(STAT_GAMESTARTTIME) - time);
-       timeleft = ceil(timeleft);
-       minutesLeft = floor(timeleft / 60);
-       secondsLeft = timeleft - minutesLeft*60;
-
-       if(minutesLeft >= 5 || warmup_stage || timelimit == 0) //don't use red or yellow in warmup or when there is no timelimit
-               timer_color = '1 1 1'; //white
-       else if(minutesLeft >= 1)
-               timer_color = '1 1 0'; //yellow
-       else
-               timer_color = '1 0 0'; //red
-
-       if (cvar("sbar_increment_maptime") || timelimit == 0 || warmup_stage) {
-               if (time < getstatf(STAT_GAMESTARTTIME)) {
-                       //while restart is still active, show 00:00
-                       minutes = seconds = 0;
-               } else {
-                       elapsedTime = floor(time - getstatf(STAT_GAMESTARTTIME)); //127
-                       minutes = floor(elapsedTime / 60);
-                       seconds = elapsedTime - minutes*60;
-               }
-               if (minutes < 10)
-                       bgpos_x = topright_x - (54 + 17 + 12) * scale;
-               else if (minutes < 100) // nudge the timer background left if more digits are drawn
-                       bgpos_x = topright_x - (72 + 17 + 12) * scale;
-               else
-                       bgpos_x = topright_x - (90 + 17 + 12) * scale;
-               bgpos_y = 0;
-               bgpos_z = 0;
-       } else {
-               minutes = minutesLeft;
-               seconds = secondsLeft;
-               if (minutes == 0)
-                       bgpos_x = topright_x - (36 + 7 + 12) * scale;
-               else if (minutes < 10) // nudge the timer background left if more digits are drawn
-                       bgpos_x = topright_x - (54 + 17 + 12) * scale;
-               else if (minutes < 100)
-                       bgpos_x = topright_x - (72 + 17 + 12) * scale;
-               else
-                       bgpos_x = topright_x - (90 + 17 + 12) * scale;
-               bgpos_y = 0;
-               bgpos_z = 0;
-       }
-
-       if (cvar("viewsize") <= 100) { // draw timer background when viewsize <= 100
-               if (teamplay)
-                       drawpic(bgpos, "gfx/hud/sb_timerbg", '120 30 0' * scale, GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // timer bg color = myteam color
-               else {
-                       color_x = cvar("sbar_color_bg_r");
-                       color_y = cvar("sbar_color_bg_g");
-                       color_z = cvar("sbar_color_bg_b");
-
-                       drawpic(bgpos, "gfx/hud/sb_timerbg", '120 30 0' * scale, color, sbar_alpha_bg, DRAWFLAG_NORMAL);
-               }
-       }
-
-       if(minutesLeft >= 1 || cvar("sbar_increment_maptime") || timelimit == 0 || warmup_stage) {
-               Sbar_DrawXNum(topright - ('103 0 0' - '0 2 0') * scale, minutes, 3, 0, 18 * scale, timer_color, 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-               drawpic(topright - ('53 0 0' - '0 1 0') * scale, "gfx/hud/num_colon", '18 18 0' * scale, timer_color, sbar_alpha_fg, DRAWFLAG_NORMAL);
-       }
-       Sbar_DrawXNum(topright - ('36 0 0' + '3 0 0' - '0 2 0') * scale, seconds, -2, 0, 18 * scale, timer_color, 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-}
-
-void CSQC_Strength_Timer() {
-       vector pos;
-       vector bottom;
-
-       bottom_x = vid_conwidth/2;
-       bottom_y = vid_conheight;
-       bottom_z = 0;
-
-       float stat_items, dt;
-       stat_items = getstati(STAT_ITEMS);
-       /*
-       if not(stat_items & IT_STRENGTH)
-               if not(stat_items & IT_INVINCIBLE)
-                       return;
-       */
-
-       if (getstati(STAT_HEALTH) <= 0)
-               return;
-
-       vector picsize;
-       float strength_time, invincibility_time, countdown_fontsize;
-
-       picsize = '22 22 0';
-       countdown_fontsize = 18;
-
-       if (vid_conwidth >= 800)
-               pos = bottom + '192 -46 0';
-       else
-               pos = bottom + '192 -94 0';
-
-       //strength
-       strength_time = getstatf(STAT_STRENGTH_FINISHED);
-       invincibility_time = getstatf(STAT_INVINCIBLE_FINISHED);
-
-       if (strength_time) {
-               dt = strength_time - time;
-               if(dt > 0)
-               {
-                       if(dt < 5)
-                       {
-                               drawpic_expanding_two(pos, "gfx/hud/sb_str", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,
-                                       bound(0, (ceil(dt) - dt) / 0.5, 1));
-                       }
-                       else
-                       {
-                               drawpic(pos, "gfx/hud/sb_str", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE);
-                       }
-                       Sbar_DrawXNum(pos - '40 -2 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-               }
-               else if(dt > -1)
-               {
-                       drawpic_expanding(pos, "gfx/hud/sb_str", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,
-                               bound(0, -dt / 0.5, 1));
-               }
-       }
-
-       //invincibility
-       if (invincibility_time) {
-               dt = invincibility_time - time;
-               if(dt > 0)
-               {
-                       if(dt < 5)
-                       {
-                               drawpic_expanding_two(pos - '0 -22 0', "gfx/hud/sb_invinc", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,
-                                       bound(0, (ceil(dt) - dt) / 0.5, 1));
-                       }
-                       else
-                       {
-                               drawpic(pos - '0 -22 0', "gfx/hud/sb_invinc", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE);
-                       }
-                       Sbar_DrawXNum(pos - '40 -24 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-               }
-               else if(dt > -1)
-               {
-                       drawpic_expanding(pos - '0 -22 0', "gfx/hud/sb_invinc", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,
-                               bound(0, -dt / 0.5, 1));
-               }
-       }
-}
-
-#define CENTERPRINT_MAX_LINES 30
-string centerprint_messages[CENTERPRINT_MAX_LINES];
-float centerprint_width[CENTERPRINT_MAX_LINES];
-vector centerprint_start;
-float centerprint_expire;
-float centerprint_num;
-float centerprint_offset_hint;
-vector centerprint_fontsize;
-
-void centerprint(string strMessage)
-{
-       float i, j, n, hcount;
-       string s;
-
-       centerprint_fontsize = Sbar_GetFontsize("scr_centersize");
-
-       centerprint_expire = min(centerprint_expire, time); // if any of the returns happens, this message will fade out
-
-       if(cvar("scr_centertime") <= 0)
-               return;
-
-       if(strMessage == "")
-               return;
-
-       // strip trailing newlines
-       j = strlen(strMessage) - 1;
-       while(substring(strMessage, j, 1) == "\n" && j >= 0)
-               j = j - 1;
-       strMessage = substring(strMessage, 0, j + 1);
-
-       if(strMessage == "")
-               return;
-
-       // strip leading newlines and remember them, they are a hint that the message should be lower on the screen
-       j = 0;
-       while(substring(strMessage, j, 1) == "\n" && j < strlen(strMessage))
-               j = j + 1;
-       strMessage = substring(strMessage, j, strlen(strMessage) - j);
-       centerprint_offset_hint = j;
-
-       if(strMessage == "")
-               return;
-
-       // if we get here, we have a message. Initialize its height.
-       centerprint_num = 0;
-
-       n = tokenizebyseparator(strMessage, "\n");
-       i = hcount = 0;
-       for(j = 0; j < n; ++j)
-       {
-               getWrappedLine_remaining = argv(j);
-               while(getWrappedLine_remaining)
-               {
-                       s = getWrappedLine(vid_conwidth * 0.75, centerprint_fontsize, stringwidth_colors);
-                       if(centerprint_messages[i])
-                               strunzone(centerprint_messages[i]);
-                       centerprint_messages[i] = strzone(s);
-                       centerprint_width[i] = stringwidth(s, TRUE, centerprint_fontsize);
-                       ++i;
-
-                       // half height for empty lines looks better
-                       if(s == "")
-                               hcount += 0.5;
-                       else
-                               hcount += 1;
-
-                       if(i >= CENTERPRINT_MAX_LINES)
-                               break;
-               }
-       }
-
-       float h, havail;
-       h = centerprint_fontsize_y*hcount;
-
-       havail = vid_conheight;
-       if(cvar("con_chatpos") < 0)
-               havail -= (-cvar("con_chatpos") + cvar("con_chat")) * cvar("con_chatsize"); // avoid overlapping chat
-       if(havail > vid_conheight - 70)
-               havail = vid_conheight - 70; // avoid overlapping HUD
-
-       centerprint_start_x = 0;
-
-#if 0
-       float forbiddenmin, forbiddenmax, allowedmin, allowedmax, preferred;
-
-       // here, the centerprint would cover the crosshair. REALLY BAD.
-       forbiddenmin = vid_conheight * 0.5 - h - 16;
-       forbiddenmax = vid_conheight * 0.5 + 16;
-
-       allowedmin = scoreboard_bottom;
-       allowedmax = havail - h;
-       preferred = (havail - h)/2;
-
-
-       // possible orderings (total: 4! / 4 = 6)
-       //  allowedmin allowedmax forbiddenmin forbiddenmax
-       //  forbiddenmin forbiddenmax allowedmin allowedmax
-       if(allowedmax < forbiddenmin || allowedmin > forbiddenmax)
-       {
-               // forbidden doesn't matter in this case
-               centerprint_start_y = bound(allowedmin, preferred, allowedmax);
-       }
-       //  allowedmin forbiddenmin allowedmax forbiddenmax
-       else if(allowedmin < forbiddenmin && allowedmax < forbiddenmax)
-       {
-               centerprint_start_y = bound(allowedmin, preferred, forbiddenmin);
-       }
-       //  allowedmin forbiddenmin forbiddenmax allowedmax
-       else if(allowedmin < forbiddenmin)
-       {
-               // make sure the forbidden zone is not covered
-               if(preferred > (forbiddenmin + forbiddenmax) * 0.5)
-                       centerprint_start_y = bound(allowedmin, preferred, forbiddenmin);
-               else
-                       centerprint_start_y = bound(forbiddenmax, preferred, allowedmin);
-       }
-       //  forbiddenmin allowedmin allowedmax forbiddenmax
-       else if(allowedmax < forbiddenmax)
-       {
-               // it's better to leave the allowed zone (overlap with scoreboard) than
-               // to cover the forbidden zone (crosshair)
-               if(preferred > (forbiddenmin + forbiddenmax) * 0.5)
-                       centerprint_start_y = forbiddenmax;
-               else
-                       centerprint_start_y = forbiddenmin;
-       }
-       //  forbiddenmin allowedmin forbiddenmax allowedmax
-       else
-       {
-               centerprint_start_y = bound(forbiddenmax, preferred, allowedmax);
-       }
-#else
-       centerprint_start_y =
-               min(
-                       max(
-                               max(scoreboard_bottom, vid_conheight * 0.5 + 16),
-                               (havail - h)/2
-                       ),
-                       havail - h
-               );
-#endif
-
-       centerprint_num = i;
-       centerprint_expire = time + cvar("scr_centertime");
-}
-
-void Sbar_DrawCenterPrint (void)
-{
-       float i;
-       vector pos;
-       string ts;
-       float a;
-
-       //if(time > centerprint_expire)
-       //      return;
-
-       //a = bound(0, 1 - 2 * (time - centerprint_expire), 1);
-       a = bound(0, 1 - 4 * (time - centerprint_expire), 1);
-       //sz = 1.2 / (a + 0.2);
-
-       if(a <= 0)
-               return;
-
-       pos = centerprint_start;
-       for (i=0; i<centerprint_num; i = i + 1)
-       {
-               pos_x = (vid_conwidth - centerprint_width[i]) * 0.5;
-               ts = centerprint_messages[i];
-               if (ts != "")
-               {
-                       dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
-                       drawcolorcodedstring(pos, ts, centerprint_fontsize, a, DRAWFLAG_NORMAL);
-                       //  - '0 0.5 0' * (sz - 1) * centerprint_fontsize_x - '0.5 0 0' * (sz - 1) * centerprint_width[i] * centerprint_fontsize_y, centerprint_fontsize * sz
-                       pos_y = pos_y + centerprint_fontsize_y;
-               }
-               else
-                       // half height for empty lines looks better
-                       pos_y = pos_y + centerprint_fontsize_y * 0.5;
-       }
-}
-
-vector Sbar_DrawNoteLine(vector offset, string s)
-{
-       dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
-       drawcolorcodedstring(
-               offset - '1 0 0' * stringwidth(s, TRUE, sbar_fontsize),
-               s,
-               sbar_fontsize,
-               sbar_alpha_fg,
-               0
-       );
-       return offset + sbar_fontsize_y * '0 1 0';
-}
-
-void Sbar_DrawPressedKeys(void)
-{
-       vector pos, bgsize;
-       float pressedkeys;
-
-       pos = stov(cvar_string("cl_showpressedkeys_position"));
-
-       bgsize = '126 75 0';
-
-       pos = '1 0 0' * (vid_conwidth - bgsize_x) * pos_x
-           + '0 1 0' * (vid_conheight - bgsize_y) * pos_y;
-       pos -= '-15 -6 0'; // adjust to the origin of these numbers
-
-       pressedkeys = getstatf(STAT_PRESSED_KEYS);
-       drawpic(pos + '-15   -6   0', "gfx/hud/keys/key_bg.tga",           bgsize, '1 1 1', 0.1 * sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + ' 83.5  9   0', ((pressedkeys & KEY_CROUCH) ? "gfx/hud/keys/key_crouch_inv.tga" : "gfx/hud/keys/key_crouch.tga"), ' 24 24 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + ' 32   -1.5 0', ((pressedkeys & KEY_FORWARD) ? "gfx/hud/keys/key_forward_inv.tga" : "gfx/hud/keys/key_forward.tga"),  ' 32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + '-11.5  9   0', ((pressedkeys & KEY_JUMP) ? "gfx/hud/keys/key_jump_inv.tga" : "gfx/hud/keys/key_jump.tga"),     ' 24 24 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + ' -1   32   0', ((pressedkeys & KEY_LEFT) ? "gfx/hud/keys/key_left_inv.tga" : "gfx/hud/keys/key_left.tga"),     ' 32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + ' 32   32   0', ((pressedkeys & KEY_BACKWARD) ? "gfx/hud/keys/key_backward_inv.tga" : "gfx/hud/keys/key_backward.tga"), ' 32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + ' 65   32   0', ((pressedkeys & KEY_RIGHT) ? "gfx/hud/keys/key_right_inv.tga" : "gfx/hud/keys/key_right.tga"),    ' 32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-}
-
-void Sbar_ShowSpeed(void)
-{
-       vector numsize;
-       float pos, conversion_factor;
-       string speed, zspeed, unit;
-
-       switch(cvar("cl_showspeed_unit"))
-       {
-               default:
-               case 0:
-                       unit = "";
-                       conversion_factor = 1.0;
-                       break;
-               case 1:
-                       unit = " qu/s";
-                       conversion_factor = 1.0;
-                       break;
-               case 2:
-                       unit = " m/s";
-                       conversion_factor = 0.0254;
-                       break;
-               case 3:
-                       unit = " km/h";
-                       conversion_factor = 0.0254 * 3.6;
-                       break;
-               case 4:
-                       unit = " mph";
-                       conversion_factor = 0.0254 * 3.6 * 0.6213711922;
-                       break;
-               case 5:
-                       unit = " knots";
-                       conversion_factor = 0.0254 * 1.943844492; // 1 m/s = 1.943844492 knots, because 1 knot = 1.852 km/h
-                       break;
-       }
-
-       speed = strcat(ftos(floor( vlen(pmove_vel - pmove_vel_z * '0 0 1') * conversion_factor + 0.5 )), unit);
-
-       numsize_x = numsize_y = cvar("cl_showspeed_size");
-       pos = (vid_conheight - numsize_y) * cvar("cl_showspeed_position");
-       
-       drawfont = sbar_bigfont;
-       drawstringcenter('1 0 0' + pos * '0 1 0', speed, numsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-       if (cvar("cl_showspeed_z") == 1) {
-               zspeed = strcat(ftos(fabs(floor( pmove_vel_z * conversion_factor + 0.5 ))), unit);
-               drawstringcenter('1 0 0' + pos * '0 1 0' + numsize_y * '0 1 0', zspeed, numsize * 0.5, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       }
-
-       drawfont = sbar_font;
-}
-
-vector acc_prevspeed;
-float acc_prevtime;
-float acc_avg;
-
-void Sbar_ShowAcceleration(void)
-{
-       float acceleration, sz, scale, alpha, f;
-       vector pos, top, rgb;
-       top_x = vid_conwidth/2;
-       top_y = 0;
-
-       f = time - acc_prevtime;
-       if(cvar("cl_showacceleration_z"))
-               acceleration = (vlen(pmove_vel) - vlen(acc_prevspeed)) * (1 / f);
-       else
-               acceleration = (vlen(pmove_vel - '0 0 1' * pmove_vel_z) - vlen(acc_prevspeed - '0 0 1' * acc_prevspeed_z)) * (1 / f);
-       acc_prevspeed = pmove_vel;
-       acc_prevtime = time;
-
-       f = bound(0, f * 10, 1);
-       acc_avg = acc_avg * (1 - f) + acceleration * f;
-       acceleration = acc_avg / getstatf(STAT_MOVEVARS_MAXSPEED);
-
-       pos = top - sz/2 * '0 1 0' + (cvar("cl_showacceleration_position") * vid_conheight) * '0 1 0';
-
-       sz = cvar("cl_showacceleration_size");
-       scale = cvar("cl_showacceleration_scale");
-       alpha = cvar("cl_showacceleration_alpha");
-       if (cvar("cl_showacceleration_color_custom"))
-               rgb = stov(cvar_string("cl_showacceleration_color"));
-       else {
-               rgb = '1 1 1';
-               if (acceleration < 0) {
-                       rgb = '1 .5 .5' - '0 .5 .5' * bound(0, -acceleration * 0.2, 1);
-               } else if (acceleration > 0) {
-                       rgb = '.5 1 .5' - '.5 0 .5' * bound(0, +acceleration * 0.2, 1);
-               }
-       }
-               
-       if (acceleration > 0)
-               drawpic(pos, "gfx/hud/accelerometer_gradient", acceleration * scale * '40 0 0' + sz * '0 1 0', rgb, alpha * sbar_alpha_fg, DRAWFLAG_NORMAL);
-       else if (acceleration < 0)
-               drawpic(pos + acceleration * scale * '40 0 0', "gfx/hud/accelerometer_gradient", -acceleration * scale * '40 0 0' + sz * '0 1 0', rgb, alpha * sbar_alpha_fg, DRAWFLAG_NORMAL);
-}
-
-void Sbar_DrawAccuracyStats_Description_Hitscan(vector position)
-{
-       drawstring(position + '0 3 0' * sbar_fontsize_y, "Shots fired:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawstring(position + '0 5 0' * sbar_fontsize_y, "Shots hit:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawstring(position + '0 7 0' * sbar_fontsize_y, "Accuracy:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawstring(position + '0 9 0' * sbar_fontsize_y, "Shots missed:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-}
-
-void Sbar_DrawAccuracyStats_Description_Splash(vector position)
-{
-       drawstring(position + '0 3 0' * sbar_fontsize_y, "Maximum damage:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawstring(position + '0 5 0' * sbar_fontsize_y, "Actual damage:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawstring(position + '0 7 0' * sbar_fontsize_y, "Accuracy:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawstring(position + '0 9 0' * sbar_fontsize_y, "Damage wasted:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-}
-
-void Sbar_DrawAccuracyStats()
-{
-       float i, count_hitscan, count_splash, row_hitscan, row_splash;  // count is the number of 'colums'
-       float weapon_hit, weapon_damage, weapon_stats;
-       float left_border;  // position where the weapons start, the description is in the border
-       vector fill_colour, fill_size;
-       vector pos;
-       vector border_colour;
-
-       float col_margin = 20;  // pixels between the columns
-       float row_margin = 20;  // pixels between the rows
-
-       fill_size_x = 5 * sbar_fontsize_x;  // width of the background
-       fill_size_y = 10 * sbar_fontsize_y;  // height of the background
-
-       drawfont = sbar_bigfont;
-       pos_x = 0;
-       pos_y = SCOREBOARD_OFFSET;
-       pos_z = 0;
-       drawstringcenter(pos, "Weapon Accuracy", 2 * sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-       left_border = col_margin + 11 * sbar_fontsize_x;
-
-       drawfont = sbar_font;
-
-       if(warmup_stage)
-       {
-               pos_y += 40;
-               if(mod(time, 1) >= 0.4)
-                       drawstringcenter(pos, "Stats are not tracked during warmup stage", sbar_fontsize, '1 1 0', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-               return;
-       }
-
-       if(gametype == GAME_RACE || gametype == GAME_CTS)
-       {
-               pos_y += 40;
-               if(mod(time, 1) >= 0.4)
-                       drawstringcenter(pos, "Stats are not tracked in Race/CTS", sbar_fontsize, '1 1 0', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-               return;
-       }
-
-       float top_border_hitscan = SCOREBOARD_OFFSET + 55;  // position where the hitscan row starts: pixels down the screen
-       Sbar_DrawAccuracyStats_Description_Hitscan('1 0 0' * col_margin + '0 1 0' * top_border_hitscan);
-
-       float top_border_splash = SCOREBOARD_OFFSET + 175;  // position where the splash row starts: pixels down the screen
-       Sbar_DrawAccuracyStats_Description_Splash('1 0 0' * col_margin + '0 1 0' * top_border_splash);
-
-       for(i = WEP_FIRST; i <= WEP_LAST; ++i)
-       {
-               self = get_weaponinfo(i);
-               if not(self.weapons)
-                       continue;
-               weapon_hit = weapon_hits[i-WEP_FIRST];
-               weapon_damage = weapon_fired[i-WEP_FIRST];
-               border_colour = (i == activeweapon) ? '1 1 1' : '0 0 0';  // white or black border
-
-               if (weapon_damage) {
-                       if (self.spawnflags & WEP_TYPE_SPLASH) {
-                               weapon_stats = bound(0, floor(100 * weapon_hit / weapon_damage), 100);
-
-                               fill_colour_x = 1 - 0.015 * weapon_stats;
-                               fill_colour_y = 1 - 0.015 * (100 - weapon_stats);
-
-                               // how the background colour is calculated
-                               // %    red             green   red_2                   green_2
-                               // 0    1               0               1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 10   0.85    0               1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 20   0.70    0               1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 30   0.55    0               1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 40   0.40    0.10    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 50   0.25    0.25    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 60   0.10    0.40    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 70   0               0.55    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 80   0               0.70    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 90   0               0.85    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 100  0               1               1 - % * 0.015   1 - (100 - %) * 0.015
-
-                               if ((left_border + count_splash * (fill_size_x + col_margin) + fill_size_x) >= vid_conwidth)
-                               {
-                                       count_splash = 0;
-                                       ++row_splash;
-                                       Sbar_DrawAccuracyStats_Description_Splash('1 0 0' * col_margin + '0 1 0' * (top_border_splash + row_splash * (fill_size_y + row_margin)));
-                               }
-
-                               pos_x = left_border + count_splash * (fill_size_x + col_margin);
-                               pos_y = top_border_splash + row_splash * (fill_size_y + row_margin);
-
-                               // background
-                               drawpic(pos, "gfx/hud/sb_accuracy", fill_size , fill_colour, sbar_alpha_bg, DRAWFLAG_NORMAL);
-                               drawborderlines(sbar_border_thickness, pos, fill_size, border_colour, sbar_alpha_bg, DRAWFLAG_NORMAL);
-
-                               // the weapon
-                               drawpic(pos, strcat("gfx/hud/inv_weapon", self.netname), '1 0.5 0' * fill_size_x , '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-                               // the amount of shots fired or max damage
-                               drawstringright(pos + '4.5 0 0' * sbar_fontsize_x + '0 3 0' * sbar_fontsize_y, ftos(weapon_damage), sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-                               // the amount of hits or actual damage
-                               drawstringright(pos + '4.5 0 0' * sbar_fontsize_x + '0 5 0' * sbar_fontsize_y, ftos(weapon_hit), sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-                               // the accuracy
-                               drawstringright(pos + '4.5 0 0' * sbar_fontsize_x + '0 7 0' * sbar_fontsize_y, strcat(ftos(weapon_stats),"%"), sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-                               // the amount of shots missed or damage wasted
-                               drawstringright(pos + '4.5 0 0' * sbar_fontsize_x + '0 9 0' * sbar_fontsize_y, ftos(max(0, weapon_damage - weapon_hit)), sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-                               ++count_splash;
-                       } else if (self.spawnflags & WEP_TYPE_HITSCAN) {
-                               weapon_stats = bound(0, floor(100 * weapon_hit / weapon_damage), 100);
-
-                               fill_colour_x = 1 - 0.015 * weapon_stats;
-                               fill_colour_y = 1 - 0.015 * (100 - weapon_stats);
-
-                               // how the background colour is calculated
-                               // %    red             green   red_2                   green_2
-                               // 0    1               0               1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 10   0.850   0               1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 20   0.70    0               1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 30   0.55    0               1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 40   0.40    0.10    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 50   0.25    0.25    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 60   0.10    0.40    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 70   0               0.55    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 80   0               0.70    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 90   0               0.85    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 100  0               1               1 - % * 0.015   1 - (100 - %) * 0.015
-
-                               if ((left_border + count_hitscan * (fill_size_x + col_margin) + fill_size_x + cvar("stats_right_margin")) >= vid_conwidth)
-                               {
-                                       count_hitscan = 0;
-                                       ++row_hitscan;
-                                       Sbar_DrawAccuracyStats_Description_Hitscan('1 0 0' * col_margin + '0 1 0' * (top_border_hitscan + row_hitscan * (fill_size_y + row_margin)));
-                               }
-
-                               pos_x = left_border + count_hitscan * (fill_size_x + col_margin);
-                               pos_y = top_border_hitscan + row_hitscan * (fill_size_y + row_margin);
-
-                               // background
-                               drawpic(pos, "gfx/hud/sb_accuracy", fill_size , fill_colour, sbar_alpha_bg, DRAWFLAG_NORMAL);
-                               drawborderlines(sbar_border_thickness, pos, fill_size, border_colour, sbar_alpha_bg, DRAWFLAG_NORMAL);
-
-                               // the weapon
-                               drawpic(pos, strcat("gfx/hud/inv_weapon", self.netname), '1 0.5 0' * fill_size_x , '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-                               // the amount of shots fired or max damage
-                               drawstringright(pos + '4.5 0 0' * sbar_fontsize_x + '0 3 0' * sbar_fontsize_y, ftos(weapon_damage), sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-                               // the amount of hits or actual damage
-                               drawstringright(pos + '4.5 0 0' * sbar_fontsize_x + '0 5 0' * sbar_fontsize_y, ftos(weapon_hit), sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-                               // the accuracy
-                               drawstringright(pos + '4.5 0 0' * sbar_fontsize_x + '0 7 0' * sbar_fontsize_y, strcat(ftos(weapon_stats),"%"), sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-                               // the amount of shots missed or damage wasted
-                               drawstringright(pos + '4.5 0 0' * sbar_fontsize_x + '0 9 0' * sbar_fontsize_y, ftos(max(0, weapon_damage - weapon_hit)), sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-                               ++count_hitscan;
-                       }
-               }
-       }
-}
-
-void drawstringright(vector position, string text, vector scale, vector rgb, float alpha, float flag)
-{
-       position_x -= 2 / 3 * strlen(text) * scale_x;
-       drawstring(position, text, scale, rgb, alpha, flag);
-}
-
-void drawstringcenter(vector position, string text, vector scale, vector rgb, float alpha, float flag)
-{
-       position_x = 0.5 * (vid_conwidth - 0.6025 * strlen(text) * scale_x);
-       drawstring(position, text, scale, rgb, alpha, flag);
-}
-
-float GetAmmoStat(float i)
-{
-       switch(i)
-       {
-               case 0: return STAT_SHELLS;
-               case 1: return STAT_NAILS;
-               case 2: return STAT_ROCKETS;
-               case 3: return STAT_CELLS;
-               case 4: return STAT_FUEL;
-               default: return -1;
-       }
-}
-
-float GetAmmoItemCode(float i)
-{
-       switch(i)
-       {
-               case 0: return IT_SHELLS;
-               case 1: return IT_NAILS;
-               case 2: return IT_ROCKETS;
-               case 3: return IT_CELLS;
-               case 4: return IT_FUEL;
-               default: return -1;
-       }
-}
-
-string GetAmmoPicture(float i)
-{
-       switch(i)
-       {
-               case 0: return "gfx/hud/sb_shells";
-               case 1: return "gfx/hud/sb_bullets";
-               case 2: return "gfx/hud/sb_rocket";
-               case 3: return "gfx/hud/sb_cells";
-               case 4: return "gfx/hud/sb_fuel";
-               default: return "";
-       }
-}
-
-void Sbar_Reset (void)
-{
-       // reset gametype specific icons
-       if(gametype == GAME_KEYHUNT)
-               CSQC_kh_hudreset();
-       else if(gametype == GAME_CTF)
-               CSQC_ctf_hudreset();
-}
-
-float vote_yescount;
-float vote_nocount;
-float vote_needed;
-float vote_highlighted; // currently selected vote
-
-float vote_active; // is there an active vote?
-float vote_prev; // previous state of vote_active to check for a change
-float vote_alpha;
-float vote_change; // "time" when vote_active changed
-
-void Sbar_Draw (void)
-{
-       // vectors for top right, bottom right, bottom and bottom left corners
-       vector topright;
-       vector bottom;
-       vector bottomright;
-       vector bottomleft;
-
-       topright_x = vid_conwidth;
-       topright_y = 0;
-       topright_z = 0;
-
-       bottom_x = vid_conwidth/2;
-       bottom_y = vid_conheight;
-       bottom_z = 0;
-
-       bottomright_x = vid_conwidth;
-       bottomright_y = vid_conheight;
-       bottomright_z = 0;
-
-       bottomleft_x = 0;
-       bottomleft_y = vid_conheight;
-       bottomleft_z = 0;
-
-       sbar_alpha_bg = cvar("sbar_alpha_bg") * (1 - cvar("_menu_alpha"));
-       sbar_border_thickness = bound(0, cvar("sbar_border_thickness"), 5);
-       sbar_accuracy_border_thickness = bound(0, cvar_or("sbar_accuracy_border_thickness", 1), 5);
-       sbar_color_bg_team = cvar("sbar_color_bg_team");
-
-       float i;
-       float weapon_stats;
-       float x, fade;
-       float stat_items, stat_weapons;
-
-       weapon_stats = getstati(STAT_DAMAGE_HITS);
-       weapon_number = weapon_stats & 63;
-       weapon_hits[weapon_number-WEP_FIRST] = floor(weapon_stats / 64);
-
-       weapon_stats = getstati(STAT_DAMAGE_FIRED);
-       weapon_number = weapon_stats & 63;
-       weapon_fired[weapon_number-WEP_FIRST] = floor(weapon_stats / 64);
-
-       vector o; o = '1 0 0' * vid_conwidth;
-       o_y = 28; // move spectator text slightly down to prevent overlapping the timer
-
-       string s;
-       vector pos;
-       pos = '0 0 0';
-
-       sbar_fontsize = Sbar_GetFontsize("sbar_fontsize");
-       sbar_fontsize_spec = Sbar_GetFontsize("sbar_fontsize_spec");
-       if(sbar_fontsize != sbar_oldfontsize)
-       {
-               Cmd_Sbar_SetFields(0);
-               sbar_oldfontsize = sbar_fontsize;
-       }
-
-       if(spectatee_status && !intermission)
-       {
-               drawfont = sbar_bigfont;
-               if(spectatee_status == -1)
-                       s = "^1Observing";
-               else
-                       s = GetPlayerName(spectatee_status - 1);
-               // spectated player name between HUD and chat area, aligned to the left
-               pos_x = bottomleft_x;
-               pos_y = bottom_y - 50 - sbar_fontsize_spec_y;
-               s = textShortenToWidth(s, vid_conwidth/2.5, sbar_fontsize_spec, stringwidth_colors);
-               drawcolorcodedstring(pos, s, sbar_fontsize_spec, sbar_alpha_fg, DRAWFLAG_NORMAL);
-               drawfont = sbar_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");
-               o = Sbar_DrawNoteLine(o, s);
-
-               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");
-               o = Sbar_DrawNoteLine(o, s);
-
-               s = strcat("^1Press ^3", getcommandkey("server info", "+show_info"), "^1 for gamemode info");
-               o = Sbar_DrawNoteLine(o, s);
-
-               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");
-               o = Sbar_DrawNoteLine(o, s);
-
-               //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");
-                       o = Sbar_DrawNoteLine(o, s);
-               }
-       }
-       if(warmup_stage && !intermission)
-       {
-               s = "^2Currently in ^1warmup^2 stage!";
-               o = Sbar_DrawNoteLine(o, s);
-       }
-
-       // move more important stuff more to the middle so its more visible
-       o_y = vid_conheight * 0.66;
-
-       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...");
-               }
-               o = Sbar_DrawNoteLine(o, s);
-       }
-       else if(warmup_stage && !intermission && !spectatee_status)
-       {
-               s = strcat("^2Press ^3", getcommandkey("ready", "ready"), "^2 to end warmup");
-               o = Sbar_DrawNoteLine(o, s);
-       }
-
-       if(teamplay && !intermission && !spectatee_status && gametype != GAME_CA && teamnagger)
-       {
-               entity tm;
-               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");
-
-                               o = Sbar_DrawNoteLine(o, s);
-                       }
-               }
-       }
-
-       if(vote_active != vote_prev) {
-               vote_change = time;
-               vote_prev = bound(0, vote_active, 1);
-       }
-
-       if(vote_active)
-               vote_alpha = bound(0, (time - vote_change) * 2, 1);
-       else
-               vote_alpha = bound(0, 1 - (time - vote_change) * 2, 1);
-
-       if(vote_alpha) {
-               float a;
-               a = vote_alpha * bound(cvar_or("sbar_vote_alreadyvoted_alpha", 0.75), 1 - vote_highlighted, 1);
-
-               if (teamplay)
-                       color =  GetTeamRGB(myteam) * sbar_color_bg_team;
-               else {
-                       color_x = cvar("sbar_color_bg_r");
-                       color_y = cvar("sbar_color_bg_g");
-                       color_z = cvar("sbar_color_bg_b");
-               }
-
-               vector voteorigin = bottomright - '290 135 0';
-               vector votesize = '280 70 0';
-               drawpic(voteorigin, "gfx/hud/voteprogress_back", votesize, color, a * sbar_alpha_bg, DRAWFLAG_NORMAL);
-
-               s = "A vote has been called for: ";
-               drawstring(voteorigin + '0.5 0 0' * votesize_x + '0 0.1 0' * votesize_y - '1 0 0' * stringwidth(s, FALSE, '6 0 0'), s, '12 12 0', '1 1 1', a * sbar_alpha_fg, DRAWFLAG_NORMAL);
-               s = textShortenToWidth(vote_called_vote, votesize_x * 0.96, '10 0 0', stringwidth_colors);
-               drawcolorcodedstring(voteorigin + '0.52 0 0' * votesize_x + '0 0.3 0' * votesize_y - '1 0 0' * stringwidth(s, FALSE, '5 0 0'), s, '10 10 0', a * sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-               // print the yes/no counts
-               s = strcat("Yes: ", ftos(vote_yescount));
-               drawstring(voteorigin + '0 0.6 0' * votesize_y + '0.02 0 0' * votesize_x, s, '12 12 0', '0 1 0', a * sbar_alpha_fg, DRAWFLAG_NORMAL);
-               s = strcat("No: ", ftos(vote_nocount));
-               drawstring(voteorigin + '0 0.6 0' * votesize_y + '0.98 0 0' * votesize_x - '1 0 0' * stringwidth(s, FALSE, '12 0 0'), s, '12 12 0', '1 0 0', a * sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-               // draw the progress bars
-               drawsetcliparea(voteorigin_x, voteorigin_y, votesize_x * 0.5 * (vote_yescount/vote_needed), votesize_y);
-               drawpic(voteorigin, "gfx/hud/voteprogress_prog", votesize, '0 1 0', a * sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-               drawsetcliparea(voteorigin_x + votesize_x - votesize_x * 0.5 * (vote_nocount/vote_needed), voteorigin_y, votesize_x * 0.5, votesize_y);
-               drawpic(voteorigin, "gfx/hud/voteprogress_prog", votesize, '1 0 0', a * sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-               // draw the highlights
-               if(vote_highlighted == 1) {
-                       drawsetcliparea(voteorigin_x, voteorigin_y, votesize_x * 0.5, votesize_y);
-                       drawpic(voteorigin, "gfx/hud/voteprogress_voted", votesize, '0 1 0', a * sbar_alpha_fg, DRAWFLAG_NORMAL);
-               }
-               else if(vote_highlighted == 2) {
-                       drawsetcliparea(voteorigin_x + 0.5 * votesize_x, voteorigin_y, votesize_x * 0.5, votesize_y);
-                       drawpic(voteorigin, "gfx/hud/voteprogress_voted", votesize, '1 0 0', a * sbar_alpha_fg, DRAWFLAG_NORMAL);
-               }
-
-               drawresetcliparea();
-       }
-       else if(!vote_active) {
-               vote_highlighted = 0;
-       }
-
-       Sbar_UpdatePlayerTeams();
-       if (intermission == 2) // map voting screen
-       {
-               if(sb_showaccuracy && spectatee_status != -1) {
-                       Sbar_DrawAccuracyStats();
-                       Sbar_Score();
-                       Sbar_Timer();
-               }
-               else if(sb_showscores) {
-                       Sbar_DrawScoreboard();
-                        Sbar_Score();
-                        Sbar_Timer();
-                }
-               else
-                       Sbar_FinaleOverlay();
-
-               Sbar_Reset();
-       }
-       else if (sb_showscores_force || getstati(STAT_HEALTH) <= 0 || intermission == 1)
-       {
-               if(sb_showaccuracy && spectatee_status != -1)
-                       Sbar_DrawAccuracyStats();
-               else
-                       Sbar_DrawScoreboard();
-               Sbar_Score();
-               Sbar_Timer();
-
-               Sbar_Reset();
-       }
-       else
-       {
-               if(sb_showaccuracy && spectatee_status != -1)
-                       Sbar_DrawAccuracyStats();
-               else
-                       Sbar_DrawScoreboard();
-               float armor, health;
-               armor = getstati(STAT_ARMOR);
-               health = getstati(STAT_HEALTH);
-
-               stat_items = getstati(STAT_ITEMS);
-               stat_weapons = getstati(STAT_WEAPONS);
-
-               fade = 3.2 - 2 * (time - weapontime);
-               fade = bound(0.7, fade, 1);
-
-               vector bg_size; // hud background size
-               bg_size = '1600 58 0';
-
-               if (cvar("viewsize") <= 100 && vid_conwidth <= 1600) {
-                       if (teamplay)
-                               drawpic(bottom - '800 58 0', "gfx/hud/sbar", bg_size, GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // hud color = myteam color
-                       else {
-                               // allow for custom HUD colors in non-teamgames
-                               color_x = cvar("sbar_color_bg_r");
-                               color_y = cvar("sbar_color_bg_g");
-                               color_z = cvar("sbar_color_bg_b");
-
-                               drawpic(bottom - '800 58 0', "gfx/hud/sbar", bg_size, color, sbar_alpha_bg, DRAWFLAG_NORMAL);
-                       }
-               }
-
-               if(sbar_hudselector == 2) // combined health and armor display
-               {
-                       vector v;
-                       v = healtharmor_maxdamage(health, armor, armorblockpercent);
-
-                       vector num_pos;
-                       num_pos = bottom - '96 28 0';
-
-                       x = floor(v_x + 1);
-
-                       if(v_z) // fully armored
-                       {
-                               // here, armorideal > armor
-                               drawpic(num_pos + '78 -4.5 0', "gfx/hud/sb_health", '32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-                               drawpic(num_pos + '108 -4.5 0', "gfx/hud/sb_armor", '20 20 0', '1 1 1', sbar_alpha_fg * armor / v_y, DRAWFLAG_NORMAL);
-                       }
-                       else
-                       {
-                               drawpic(num_pos + '108 -4.5 0', "gfx/hud/sb_health", '20 20 0', '1 1 1', sbar_alpha_fg * v_y / armor, DRAWFLAG_NORMAL);
-                               drawpic(num_pos + '78 -4.5 0', "gfx/hud/sb_armor", '32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-                       }
-                       Sbar_DrawXNum_Colored(num_pos, x, 24, sbar_alpha_fg); // draw the combined health and armor
-               }
-
-               else
-               {
-                       vector health_pos, armor_pos;
-
-                       if (sbar_hudselector == 0) { // old style layout with armor left of health
-                               armor_pos = bottom - '96 28 0';
-                               health_pos = bottom - '-14 28 0';
-                       }
-                       else {
-                               health_pos = bottom - '96 28 0';                                
-                               armor_pos = bottom - '-14 28 0';
-                       }
-
-                       // armor
-                       x = armor;
-                       if (x > 0)
-                       {
-                               if (x > 45) {
-                                       drawpic(armor_pos + '78 -4.5 0', "gfx/hud/sb_armor", '32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-                                       Sbar_DrawXNum_Colored(armor_pos, x, 24, sbar_alpha_fg);
-                               }
-                               else {
-                                       drawpic(armor_pos + '78 -4.5 0', "gfx/hud/sb_armor", '32 32 0', '1 1 1', (x+10)/55 * sbar_alpha_fg, DRAWFLAG_NORMAL);
-                                       Sbar_DrawXNum_Colored(armor_pos, x, 24, sbar_alpha_fg);
-                               }
-                       }
-
-                       // health
-                       x = health;
-                       drawpic(health_pos + '78 -4.5 0', "gfx/hud/sb_health", '32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-                       Sbar_DrawXNum_Colored(health_pos, x, 24, sbar_alpha_fg);
-               }
-
-               // ammo
-
-               for (i = 0; i < 4; ++i) {
-                       a = getstati(GetAmmoStat(i)); // how much ammo do we have of type i?
-
-                       if(sbar_currentammo || vid_conwidth < 800) { // force showing current ammo only with conwidths < 800
-                               if (stat_items & GetAmmoItemCode(i)) {
-                                       if (vid_conwidth >= 800) {
-                                               pos_x = 230;
-                                               pos_y = 40;
-                                       } else {
-                                               pos_x = 206;
-                                               pos_y = 33;
-                                       }
-
-                                       pos = bottom - pos;
-                                       if(vid_conwidth >= 800)
-                                               drawpic(pos + '0 1.5 0', "gfx/hud/sb_ammobg", '107 29 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-                                       drawpic(pos + '76 3 0', GetAmmoPicture(i), '24 24 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-                                       if(a < 10)
-                                               Sbar_DrawXNum(pos + '5 5 0', a, 3, 0, 24, '0.7 0 0', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-                                       else
-                                               Sbar_DrawXNum(pos + '5 5 0', a, 3, 0, 24, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-                               }
-                       } else {
-                               if (a > 0) {
-                                       switch (i) {
-                                               case 0: pos_x = 286; pos_y = 48; break; // shells
-                                               case 1: pos_x = 286; pos_y = 26; break; // bullets
-                                               case 2: pos_x = 200; pos_y = 48; break; // rockets
-                                               case 3: pos_x = 200; pos_y = 26; break; // cells
-                                       }
-
-                                       pos = bottom - pos;
-                                       if (stat_items & GetAmmoItemCode(i))
-                                               drawpic(pos + '0 1.5 0', "gfx/hud/sb_ammobg", '80 22 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-                                       drawpic(pos + '56 3 0', GetAmmoPicture(i), '18 18 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-                                       if (a < 10) {
-                                               if(stat_items & GetAmmoItemCode(i))
-                                                       Sbar_DrawXNum(pos + '6 4.5 0', a, 3, 0, 16, '0.7 0 0', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-                                               else
-                                                       Sbar_DrawXNum(pos + '6 4.5 0', a, 3, 0, 16, '0.7 0 0', 0, 0, sbar_alpha_fg * 0.7, DRAWFLAG_NORMAL);
-                                       } else {
-                                               if(stat_items & GetAmmoItemCode(i))
-                                                       Sbar_DrawXNum(pos + '6 4.5 0', a, 3, 0, 16, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-                                               else
-                                                       Sbar_DrawXNum(pos + '6 4.5 0', a, 3, 0, 16, '0.7 0.7 0.7', 0, 0, sbar_alpha_fg * 0.7, DRAWFLAG_NORMAL);
-                                       }
-                               }
-                       }
-               }
-
-               // fuel ammo
-               a = getstati(GetAmmoStat(4)); // how much fuel do we have?
-
-               if (a > 0) { // if we have fuel, draw the amount
-                       float invincibility_time, dt;
-                       invincibility_time = getstatf(STAT_INVINCIBLE_FINISHED);
-                       dt = invincibility_time - time;
-                       if (vid_conwidth >= 800) {
-                               if (dt > 0) { // if the invincibility timer is active, draw fuel ammo elsewhere
-                                       pos_x = bottom_x + 140;
-                                       pos_y = bottom_y - 72;
-                               }
-                               else { // if the invincibility timer is inactive, draw the fuel ammo there (it's rare to have invincibility + fuel anyway)
-                                       pos_x = bottom_x + 140;
-                                       pos_y = bottom_y - 20;
-                               }
-                       }
-                       else { // draw fuel on top of ammo if vid_conwidth < 800
-                               pos_x = bottom_x - 200;
-                               pos_y = bottom_y - 45;
-                       }
-                       drawpic(pos - '0 2 0' + '52 0 0', GetAmmoPicture(4), '20 20 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-                       if (a > 10)
-                               Sbar_DrawXNum(pos, a, 3, 0, 16, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-                       else
-                               Sbar_DrawXNum(pos, a, 3, 0, 16, '0.7 0 0', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-               }
-
-               // draw scores and timer
-               Sbar_Score();
-               Sbar_Timer();
-
-               // draw strength/invincibility icon and timer
-               CSQC_Strength_Timer();
-
-               // weapon icons
-                if(cvar_or("sbar_showweaponicons", 1)) {
-                               Sbar_DrawWeapon_Clear();
-                       for(i = WEP_FIRST; i <= WEP_LAST; ++i)
-                       {
-                               self = get_weaponinfo(i);
-                               if(self.weapons)
-                               if(self.impulse >= 0)
-                                       if(stat_weapons & self.weapons)
-                                       Sbar_DrawWeapon(self, fade, (i == activeweapon));
-                       }
-               }
-
-               // draw gametype specific icons
-               if(gametype == GAME_KEYHUNT)
-                       CSQC_kh_hud();
-               else if(gametype == GAME_CTF)
-                       CSQC_ctf_hud();
-               else if(gametype == GAME_NEXBALL)
-                       CSQC_nb_hud();
-               else if(gametype == GAME_CTS || gametype == GAME_RACE)
-                       CSQC_race_hud();
-       }
-       return;
-}
-
-// CTF HUD
-float redflag_prevframe, blueflag_prevframe; // status during previous frame
-float redflag_prevstatus, blueflag_prevstatus; // last remembered status
-float redflag_statuschange_time, blueflag_statuschange_time; // time when the status changed
-
-void CSQC_ctf_hudreset(void)
-{
-       redflag_prevstatus = blueflag_prevstatus = redflag_prevframe = blueflag_prevframe = redflag_statuschange_time = blueflag_statuschange_time = 0;
-}
-
-void CSQC_ctf_hud(void)
-{
-       vector bottomleft, redflag_pos, blueflag_pos, sz;
-       float f; // every function should have that
-       bottomleft_x = 0;
-       bottomleft_y = vid_conheight;
-       bottomleft_z = 0;
-
-       float redflag, blueflag; // current status
-       float redflag_statuschange_elapsedtime, blueflag_statuschange_elapsedtime; // time since the status changed
-       float stat_items;
-
-       stat_items = getstati(STAT_ITEMS);
-       redflag = (stat_items/IT_RED_FLAG_TAKEN) & 3;
-       blueflag = (stat_items/IT_BLUE_FLAG_TAKEN) & 3;
-
-       // when status CHANGES, set old status into prevstatus and current status into status
-       if (redflag != redflag_prevframe)
-       {
-               redflag_statuschange_time = time;
-               redflag_prevstatus = redflag_prevframe;
-               redflag_prevframe = redflag;
-       }
-
-       if (blueflag != blueflag_prevframe)
-       {
-               blueflag_statuschange_time = time;
-               blueflag_prevstatus = blueflag_prevframe;
-               blueflag_prevframe = blueflag;
-       }
-       
-       redflag_statuschange_elapsedtime = time - redflag_statuschange_time;
-       blueflag_statuschange_elapsedtime = time - blueflag_statuschange_time;
-
-       float BLINK_FACTOR = 0.15;
-       float BLINK_BASE = 0.85;
-       // note:
-       //   RMS = sqrt(BLINK_BASE^2 + 0.5 * BLINK_FACTOR^2)
-       // thus
-       //   BLINK_BASE = sqrt(RMS^2 - 0.5 * BLINK_FACTOR^2)
-       // ensure RMS == 1
-       float BLINK_FREQ = 5; // circle frequency, = 2*pi*frequency in hertz
-
-       string red_icon, red_icon_prevstatus;
-       float red_alpha, red_alpha_prevstatus;
-       red_alpha = red_alpha_prevstatus = 1;
-       switch(redflag) {
-               case 1: red_icon = "gfx/hud/sb_flag_red_taken"; break;
-               case 2: red_icon = "gfx/hud/sb_flag_red_lost"; break;
-               case 3: red_icon = "gfx/hud/sb_flag_red_carrying"; red_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;
-               default:
-                       if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM2))
-                               red_icon = "gfx/hud/sb_flag_red_shielded";
-                       else
-                               red_icon = string_null;
-                       break;
-       }
-       switch(redflag_prevstatus) {
-               case 1: red_icon_prevstatus = "gfx/hud/sb_flag_red_taken"; break;
-               case 2: red_icon_prevstatus = "gfx/hud/sb_flag_red_lost"; break;
-               case 3: red_icon_prevstatus = "gfx/hud/sb_flag_red_carrying"; red_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;
-               default:
-                       if(redflag == 3)
-                               red_icon_prevstatus = "gfx/hud/sb_flag_red_carrying"; // make it more visible
-                       else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM2))
-                               red_icon_prevstatus = "gfx/hud/sb_flag_red_shielded";
-                       else
-                               red_icon_prevstatus = string_null;
-                       break;
-       }
-
-       string blue_icon, blue_icon_prevstatus;
-       float blue_alpha, blue_alpha_prevstatus;
-       blue_alpha = blue_alpha_prevstatus = 1;
-       switch(blueflag) {
-               case 1: blue_icon = "gfx/hud/sb_flag_blue_taken"; break;
-               case 2: blue_icon = "gfx/hud/sb_flag_blue_lost"; break;
-               case 3: blue_icon = "gfx/hud/sb_flag_blue_carrying"; blue_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;
-               default:
-                       if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1))
-                               blue_icon = "gfx/hud/sb_flag_blue_shielded";
-                       else
-                               blue_icon = string_null;
-                       break;
-       }
-       switch(blueflag_prevstatus) {
-               case 1: blue_icon_prevstatus = "gfx/hud/sb_flag_blue_taken"; break;
-               case 2: blue_icon_prevstatus = "gfx/hud/sb_flag_blue_lost"; break;
-               case 3: blue_icon_prevstatus = "gfx/hud/sb_flag_blue_carrying"; blue_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;
-               default:
-                       if(blueflag == 3)
-                               blue_icon_prevstatus = "gfx/hud/sb_flag_blue_carrying"; // make it more visible
-                       else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1))
-                               blue_icon_prevstatus = "gfx/hud/sb_flag_blue_shielded";
-                       else
-                               blue_icon_prevstatus = string_null;
-                       break;
-       }
-
-       if (myteam == COLOR_TEAM1) { // always draw own flag on left
-               redflag_pos = bottomleft - '-4 50 0';
-               blueflag_pos = bottomleft - '-62 50 0';
-       } else {
-               blueflag_pos = bottomleft - '-4 50 0';
-               redflag_pos = bottomleft - '-62 50 0';
-       }
-       
-       sz = '52 52 0';
-       
-       f = bound(0, redflag_statuschange_elapsedtime*2, 1);
-       if(red_icon_prevstatus && f < 1)
-               drawpic_expanding(redflag_pos, red_icon_prevstatus, sz, '1 1 1', sbar_alpha_fg * red_alpha_prevstatus, DRAWFLAG_NORMAL, f);
-       if(red_icon)
-               drawpic(redflag_pos, red_icon, sz, '1 1 1', sbar_alpha_fg * red_alpha * f, DRAWFLAG_NORMAL);
-
-       f = bound(0, blueflag_statuschange_elapsedtime*2, 1);
-       if(blue_icon_prevstatus && f < 1)
-               drawpic_expanding(blueflag_pos, blue_icon_prevstatus, sz, '1 1 1', sbar_alpha_fg * blue_alpha_prevstatus, DRAWFLAG_NORMAL, f);
-       if(blue_icon)
-               drawpic(blueflag_pos, blue_icon, sz, '1 1 1', sbar_alpha_fg * blue_alpha * f, DRAWFLAG_NORMAL);
-}
-
-// Keyhunt HUD
-float kh_runheretime;
-
-void CSQC_kh_hudreset(void)
-{
-       kh_runheretime = 0;
-}
-
-void CSQC_kh_hud(void)
-{
-       float kh_keys;
-       float keyteam;
-       float a, aa;
-       vector p, pa, kh_size, kh_asize;
-
-       vector bottomleft;
-       bottomleft_x = 0;
-       bottomleft_y = vid_conheight;
-       bottomleft_z = 0;
-
-       p_x = 6;
-       p_y = vid_conheight - 34 - 3;
-       p_z = 0;
-
-       kh_keys = getstati(STAT_KH_KEYS);
-
-       kh_size = '19 34 0';
-       kh_asize = '19 10 0';
-       pa = p + '0 -10 0';
-
-       float i, key;
-
-       float keycount;
-       keycount = 0;
-       for(i = 0; i < 4; ++i)
-       {
-               key = floor(kh_keys / pow(32, i)) & 31;
-               keyteam = key - 1;
-               if(keyteam == 30 && keycount <= 4)
-                       keycount += 4;
-               if(keyteam == myteam || keyteam == -1 || keyteam == 30)
-                       keycount += 1;
-       }
-       // this yields 8 exactly if "RUN HERE" shows
-
-       if(keycount == 8)
-       {
-               if(!kh_runheretime)
-                       kh_runheretime = time;
-               pa_y -= fabs(sin((time - kh_runheretime) * 3.5)) * 6; // make the arrows jump in case of RUN HERE
-       }
-       else
-               kh_runheretime = 0;
-
-       for(i = 0; i < 4; ++i)
-       {
-               key = floor(kh_keys / pow(32, i)) & 31;
-               keyteam = key - 1;
-               switch(keyteam)
-               {
-                       case 30: // my key
-                               keyteam = myteam;
-                               a = 1;
-                               aa = 1;
-                               break;
-                       case -1: // no key
-                               a = 0;
-                               aa = 0;
-                               break;
-                       default: // owned or dropped
-                               a = 0.2;
-                               aa = 0.5;
-                               break;
-               }
-               a = a * sbar_alpha_fg;
-               aa = aa * sbar_alpha_fg;
-               if(a > 0)
-               {
-                       switch(keyteam)
-                       {
-                               case COLOR_TEAM1:
-                                       drawpic (pa, "gfx/hud/sb_kh_redarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                               case COLOR_TEAM2:
-                                       drawpic (pa, "gfx/hud/sb_kh_bluearrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                               case COLOR_TEAM3:
-                                       drawpic (pa, "gfx/hud/sb_kh_yellowarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                               case COLOR_TEAM4:
-                                       drawpic (pa, "gfx/hud/sb_kh_pinkarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                               default:
-                                       break;
-                       }
-                       switch(i) // YAY! switch(i) inside a for loop for i. DailyWTF, here we come!
-                       {
-                               case 0:
-                                       drawpic (p, "gfx/hud/sb_kh_red", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                               case 1:
-                                       drawpic (p, "gfx/hud/sb_kh_blue", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                               case 2:
-                                       drawpic (p, "gfx/hud/sb_kh_yellow", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                               case 3:
-                                       drawpic (p, "gfx/hud/sb_kh_pink", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                       }
-               }
-               p_x += 24;
-               pa_x += 24;
-       }
-}
-
-//Nexball HUD
-#define NBPB_SIZE '96 38 0'
-#define NBPB_BT 2                   //thickness
-#define NBPB_BRGB '1 1 1'
-#define NBPB_BALPH 1                //alpha
-#define NBPB_BFLAG DRAWFLAG_NORMAL
-#define NBPB_IALPH 0.4
-#define NBPB_IFLAG DRAWFLAG_NORMAL
-#define NBPB_IRGB '0.7 0.1 0'
-
-void CSQC_nb_hud(void)
-{
-       float stat_items, nb_pb_starttime, dt, p;
-       vector pos;
-
-       stat_items = getstati(STAT_ITEMS);
-       nb_pb_starttime = getstatf(STAT_NB_METERSTART);
-
-       pos_x = 4;
-       pos_y = vid_conheight - 42;
-       pos_z = 0;
-
-       //Manage the progress bar if any
-       if (nb_pb_starttime > 0)
-       {
-               vector s;
-               dt = mod(time - nb_pb_starttime, nb_pb_period);
-               // one period of positive triangle
-               p = 2 * dt / nb_pb_period;
-               if (p > 1)
-                       p = 2 - p;
-
-               s = NBPB_SIZE;
-               //Draw the filling
-               drawfill(pos, p * s_x * '1 0 0' + s_y * '0 1 0', NBPB_IRGB, NBPB_IALPH, NBPB_IFLAG);
-
-               //Draw the box
-               s = NBPB_SIZE;
-               drawline(NBPB_BT, pos    , pos + '1 0 0' * s_x, NBPB_BRGB, NBPB_BALPH, NBPB_BFLAG);
-               drawline(NBPB_BT, pos    , pos + '0 1 0' * s_y, NBPB_BRGB, NBPB_BALPH, NBPB_BFLAG);
-               drawline(NBPB_BT, pos + s, pos + '1 0 0' * s_x, NBPB_BRGB, NBPB_BALPH, NBPB_BFLAG);
-               drawline(NBPB_BT, pos + s, pos + '0 1 0' * s_y, NBPB_BRGB, NBPB_BALPH, NBPB_BFLAG);
-       }
-
-       pos_x += 12; //horizontal margin to the picture
-       pos_y += 2; //vertical margin to the picture
-
-       if (stat_items & IT_KEY1)
-               drawpic(pos, "gfx/hud/sb_nexball_carrying", '80 34 0', '1 1 1', 1, DRAWFLAG_NORMAL);
-}
-
-float crecordtime_prev; // last remembered crecordtime
-float crecordtime_change_time; // time when crecordtime last changed
-float srecordtime_prev; // last remembered srecordtime
-float srecordtime_change_time; // time when srecordtime last changed
-void CSQC_race_hud(void) 
-{
-       entity me;
-       me = playerslots[player_localentnum - 1];
-       float t, score;
-       float f; // yet another function has this
-       score = me.(scores[ps_primary]);
-
-       if not((scores_flags[ps_primary] & SFL_TIME) && !teamplay) // race/cts record display on HUD
-               return; // no records in the actual race
-
-       drawfont = sbar_bigfont;
-       vector pos;
-       pos_x = 2;
-       pos_y = vid_conheight - 48;
-
-       // clientside personal record
-       string rr;
-       if(gametype == GAME_CTS)
-               rr = CTS_RECORD;
-       else
-               rr = RACE_RECORD;
-       t = stof(db_get(ClientProgsDB, strcat(shortmapname, rr, "time")));
-
-       if(score && (score < t || !t)) {
-               db_put(ClientProgsDB, strcat(shortmapname, rr, "time"), ftos(score));
-               if(cvar("cl_autodemo_delete_keeprecords"))
-               {
-                       f = cvar("cl_autodemo_delete");
-                       f &~= 1;
-                       cvar_set("cl_autodemo_delete", ftos(f)); // don't delete demo with new record!
-               }
-       }
-
-       if(t != crecordtime_prev) {
-               crecordtime_prev = t;
-               crecordtime_change_time = time;
-       }
-       f = time - crecordtime_change_time;
-
-       if (f > 1) {
-               drawstring(pos, "Personal best ", '10 10 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-               drawstring(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       } else {
-               drawstring(pos, "Personal best ", '10 10 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-               drawstring(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-               drawstring_expanding(pos, "Personal best ", '10 10 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL, f);
-               drawstring_expanding(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL, f);
-       }
-
-       // server record
-       pos_y += 26;
-       t = race_server_record;
-       if(t != srecordtime_prev) {
-               srecordtime_prev = t;
-               srecordtime_change_time = time;
-       }
-       f = time - srecordtime_change_time;
-
-       if (f > 1) {
-               drawstring(pos, "Server best ", '10 10 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-               drawstring(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       } else {
-               drawstring(pos, "Server best ", '10 10 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-               drawstring(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-               drawstring_expanding(pos, "Server best ", '10 10 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL, f);
-               drawstring_expanding(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL, f);
-       }
-       drawfont = sbar_font;
-}
diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
new file mode 100644 (file)
index 0000000..36168ea
--- /dev/null
@@ -0,0 +1,1429 @@
+float scoreboard_alpha_bg;
+float scoreboard_alpha_fg;
+float scoreboard_highlight;
+float scoreboard_highlight_alpha;
+float scoreboard_highlight_alpha_self;
+float scoreboard_alpha_name;
+float scoreboard_alpha_name_self;
+
+void drawstringright(vector, string, vector, vector, float, float);
+void drawstringcenter(vector, string, vector, vector, float, float);
+
+float SCOREBOARD_OFFSET = 50;
+
+void MapVote_Draw();
+void HUD_FinaleOverlay()
+{
+       /*vector pos;
+       pos_x = (vid_conwidth - 1)/2;
+       pos_y = 16;
+       pos_z = 0;*/
+
+       //drawpic(pos, "gfx/finale", '0 0 0', '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+
+       //drawstring(pos, "END", hud_fontsize, '1 1 1', 1, DRAWFLAG_NORMAL);
+       MapVote_Draw();
+}
+
+void Cmd_HUD_SetFields(float argc);
+void HUD_InitScores()
+{
+       float i, f;
+
+       ps_primary = ps_secondary = ts_primary = ts_secondary = -1;
+       for(i = 0; i < MAX_SCORE; ++i)
+       {
+               f = (scores_flags[i] & SFL_SORT_PRIO_MASK);
+               if(f == SFL_SORT_PRIO_PRIMARY)
+                       ps_primary = i;
+               if(f == SFL_SORT_PRIO_SECONDARY)
+                       ps_secondary = i;
+       }
+       if(ps_secondary == -1)
+               ps_secondary = ps_primary;
+
+       for(i = 0; i < MAX_TEAMSCORE; ++i)
+       {
+               f = (teamscores_flags[i] & SFL_SORT_PRIO_MASK);
+               if(f == SFL_SORT_PRIO_PRIMARY)
+                       ts_primary = i;
+               if(f == SFL_SORT_PRIO_SECONDARY)
+                       ts_secondary = i;
+       }
+       if(ts_secondary == -1)
+               ts_secondary = ts_primary;
+
+       Cmd_HUD_SetFields(0);
+}
+
+void HUD_UpdatePlayerPos(entity pl);
+float SetTeam(entity pl, float Team);
+//float lastpnum;
+void HUD_UpdatePlayerTeams()
+{
+       float Team;
+       entity pl, tmp;
+       float num;
+
+       num = 0;
+       for(pl = players.sort_next; pl; pl = pl.sort_next)
+       {
+               num += 1;
+               Team = GetPlayerColor(pl.sv_entnum);
+               if(SetTeam(pl, Team))
+               {
+                       tmp = pl.sort_prev;
+                       HUD_UpdatePlayerPos(pl);
+                       if(tmp)
+                               pl = tmp;
+                       else
+                               pl = players.sort_next;
+               }
+       }
+       /*
+       if(num != lastpnum)
+               print(strcat("PNUM: ", ftos(num), "\n"));
+       lastpnum = num;
+       */
+}
+
+float HUD_ComparePlayerScores(entity left, entity right)
+{
+       float vl, vr;
+       vl = GetPlayerColor(left.sv_entnum);
+       vr = GetPlayerColor(right.sv_entnum);
+
+       if(!left.gotscores)
+               vl = COLOR_SPECTATOR;
+       if(!right.gotscores)
+               vr = COLOR_SPECTATOR;
+
+       if(vl > vr)
+               return true;
+       if(vl < vr)
+               return false;
+
+       if(vl == COLOR_SPECTATOR)
+       {
+               // FIRST the one with scores (spectators), THEN the ones without (downloaders)
+               // no other sorting
+               if(!left.gotscores && right.gotscores)
+                       return true;
+               return false;
+       }
+
+       vl = left.scores[ps_primary];
+       vr = right.scores[ps_primary];
+       if(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)
+       {
+               if(vl == 0 && vr != 0)
+                       return 1;
+               if(vl != 0 && vr == 0)
+                       return 0;
+       }
+       if(vl > vr)
+               return IS_INCREASING(scores_flags[ps_primary]);
+       if(vl < vr)
+               return IS_DECREASING(scores_flags[ps_primary]);
+
+       vl = left.scores[ps_secondary];
+       vr = right.scores[ps_secondary];
+       if(scores_flags[ps_secondary] & SFL_ZERO_IS_WORST)
+       {
+               if(vl == 0 && vr != 0)
+                       return 1;
+               if(vl != 0 && vr == 0)
+                       return 0;
+       }
+       if(vl > vr)
+               return IS_INCREASING(scores_flags[ps_secondary]);
+       if(vl < vr)
+               return IS_DECREASING(scores_flags[ps_secondary]);
+
+       return false;
+}
+
+void HUD_UpdatePlayerPos(entity player)
+{
+       for(other = player.sort_next; other && HUD_ComparePlayerScores(player, other); other = player.sort_next)
+       {
+               SORT_SWAP(player, other);
+       }
+       for(other = player.sort_prev; other != players && HUD_ComparePlayerScores(other, player); other = player.sort_prev)
+       {
+               SORT_SWAP(other, player);
+       }
+}
+
+float HUD_CompareTeamScores(entity left, entity right)
+{
+       float vl, vr;
+
+       if(left.team == COLOR_SPECTATOR)
+               return 1;
+       if(right.team == COLOR_SPECTATOR)
+               return 0;
+
+       vl = left.teamscores[ts_primary];
+       vr = right.teamscores[ts_primary];
+       if(vl > vr)
+               return IS_INCREASING(teamscores_flags[ts_primary]);
+       if(vl < vr)
+               return IS_DECREASING(teamscores_flags[ts_primary]);
+
+       vl = left.teamscores[ts_secondary];
+       vr = right.teamscores[ts_secondary];
+       if(vl > vr)
+               return IS_INCREASING(teamscores_flags[ts_secondary]);
+       if(vl < vr)
+               return IS_DECREASING(teamscores_flags[ts_secondary]);
+
+       return false;
+}
+
+void HUD_UpdateTeamPos(entity Team)
+{
+       for(other = Team.sort_next; other && HUD_CompareTeamScores(Team, other); other = Team.sort_next)
+       {
+               SORT_SWAP(Team, other);
+       }
+       for(other = Team.sort_prev; other != teams && HUD_CompareTeamScores(other, Team); other = Team.sort_prev)
+       {
+               SORT_SWAP(other, Team);
+       }
+}
+
+void Cmd_HUD_Help(float argc)
+{
+       print("You can modify the scoreboard using the ^2scoreboard_columns_set command.\n");
+       print("^3|---------------------------------------------------------------|\n");
+       print("Usage:\n");
+       print("^2scoreboard_columns_set default\n");
+       print("^2scoreboard_columns_set ^7filed1 field2 ...\n");
+       print("The following field names are recognized (case insensitive):\n");
+       print("You can use a ^3|^7 to start the right-aligned fields.\n\n");
+
+       print("^3name^7 or ^3nick^7         Name of a player\n");
+       print("^3ping^7                     Ping time\n");
+       print("^3pl^7                       Packet loss\n");
+       print("^3kills^7                    Number of kills\n");
+       print("^3deaths^7                   Number of deaths\n");
+       print("^3suicides^7                 Number of suicides\n");
+       print("^3frags^7                    kills - suicides\n");
+       print("^3kd^7                       The kill-death ratio\n");
+       print("^3caps^7                     How often a flag (CTF) or a key (KeyHunt) was captured\n");
+       print("^3pickups^7                  How often a flag (CTF) or a key (KeyHunt) was picked up\n");
+       print("^3fckills^7                  Number of flag carrier kills\n");
+       print("^3returns^7                  Number of flag returns\n");
+       print("^3drops^7                    Number of flag drops\n");
+       print("^3lives^7                    Number of lives (LMS)\n");
+       print("^3rank^7                     Player rank\n");
+       print("^3pushes^7                   Number of players pushed into void\n");
+       print("^3destroyed^7                Number of keys destroyed by pushing them into void\n");
+       print("^3kckills^7                  Number of keys carrier kills\n");
+       print("^3losses^7                   Number of times a key was lost\n");
+       print("^3laps^7                     Number of laps finished (race/cts)\n");
+       print("^3time^7                     Total time raced (race/cts)\n");
+       print("^3fastest^7                  Time of fastest lap (race/cts)\n");
+       print("^3ticks^7                    Number of ticks (DOM)\n");
+       print("^3takes^7                    Number of domination points taken (DOM)\n");
+       print("^3score^7                    Total score\n\n");
+
+       print("Before a field you can put a + or - sign, then a comma separated list\n");
+       print("of game types, then a slash, to make the field show up only in these\n");
+       print("or in all but these game types. You can also specify 'all' as a\n");
+       print("field to show all fields available for the current game mode.\n\n");
+
+       print("The special game type names 'teams' and 'noteams' can be used to\n");
+       print("include/exclude ALL teams/noteams game modes.\n\n");
+
+       print("Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4\n");
+       print("will display name, ping and pl aligned to the left, and the fields\n");
+       print("right of the vertical bar aligned to the right.\n");
+       print("'field3' will only be shown in CTF, and 'field4' will be shown in all\n");
+       print("other gamemodes except DM.\n");
+}
+
+string HUD_DefaultColumnLayout()
+{
+       return strcat( // fteqcc sucks
+               "ping pl name | ",
+               "-teams,race,lms/kills -teams,lms/deaths -teams,lms,race/suicides -race,dm,tdm/frags ", // tdm already has this in "score"
+               "+ctf/caps +ctf/pickups +ctf/fckills +ctf/returns ",
+               "+lms/lives +lms/rank ",
+               "+kh/caps +kh/pushes +kh/destroyed ",
+               "?+race/laps ?+race/time ?+race/fastest ",
+               "+as/objectives +nexball/faults +nexball/goals ",
+               "-lms,race,nexball/score");
+}
+
+void Cmd_HUD_SetFields(float argc)
+{
+       float i, j, slash;
+       string str, pattern;
+       float have_name, have_primary, have_secondary, have_separator;
+       float missing;
+
+       // TODO: re enable with gametype dependant cvars?
+       if(argc < 2) // no arguments provided
+               argc = tokenizebyseparator(strcat("x ", cvar_string("scoreboard_columns")), " ");
+
+       if(argc < 2)
+               argc = tokenizebyseparator(strcat("x ", HUD_DefaultColumnLayout()), " ");
+
+       if(argc == 2)
+       {
+               if(argv(1) == "default")
+                       argc = tokenizebyseparator(strcat("x ", HUD_DefaultColumnLayout()), " ");
+               else if(argv(1) == "all")
+               {
+                       string s;
+                       s = "ping pl color name |";
+                       for(i = 0; i < MAX_SCORE; ++i)
+                       {
+                               if(i != ps_primary)
+                               if(i != ps_secondary)
+                               if(scores_label[i] != "")
+                                       s = strcat(s, " ", scores_label[i]);
+                       }
+                       if(ps_secondary != ps_primary)
+                               s = strcat(s, " ", scores_label[ps_secondary]);
+                       s = strcat(s, " ", scores_label[ps_primary]);
+                       argc = tokenizebyseparator(strcat("x ", s), " ");
+               }
+       }
+
+
+       hud_num_fields = 0;
+
+       drawfont = hud_font;
+
+       for(i = 0; i < argc - 1; ++i)
+       {
+               float nocomplain;
+               str = argv(i+1);
+
+               nocomplain = FALSE;
+               if(substring(str, 0, 1) == "?")
+               {
+                       nocomplain = TRUE;
+                       str = substring(str, 1, strlen(str) - 1);
+               }
+
+               slash = strstrofs(str, "/", 0);
+               if(slash >= 0)
+               {
+                       pattern = substring(str, 0, slash);
+                       str = substring(str, slash + 1, strlen(str) - (slash + 1));
+
+                       if not(isGametypeInFilter(gametype, teamplay, pattern))
+                               continue;
+               }
+
+               strunzone(hud_title[hud_num_fields]);
+               hud_title[hud_num_fields] = strzone(str);
+               hud_size[hud_num_fields] = stringwidth(str, FALSE, hud_fontsize);
+               str = strtolower(str);
+
+               if(str == "ping") {
+                       hud_field[hud_num_fields] = SP_PING;
+               } else if(str == "pl") {
+                       hud_field[hud_num_fields] = SP_PL;
+               } else if(str == "kd" || str == "kdr" || str == "kdratio" || str == "k/d") {
+                       hud_field[hud_num_fields] = SP_KDRATIO;
+               } else if(str == "name" || str == "nick") {
+                       hud_field[hud_num_fields] = SP_NAME;
+                       have_name = 1;
+               } else if(str == "|") {
+                       hud_field[hud_num_fields] = SP_SEPARATOR;
+                       have_separator = 1;
+               } else {
+                       for(j = 0; j < MAX_SCORE; ++j)
+                               if(str == strtolower(scores_label[j]))
+                                       goto found; // sorry, but otherwise fteqcc -O3 miscompiles this and warns about "unreachable code"
+:notfound
+                       if(str == "frags")
+                       {
+                               j = SP_FRAGS;
+                       }
+                       else
+                       {
+                               if not(nocomplain)
+                                       print(strcat("^1Error:^7 Unknown score field: '", str, "'\n"));
+                               continue;
+                       }
+:found
+                       hud_field[hud_num_fields] = j;
+                       if(j == ps_primary)
+                               have_primary = 1;
+                       if(j == ps_secondary)
+                               have_secondary = 1;
+               }
+               ++hud_num_fields;
+               if(hud_num_fields >= MAX_HUD_FIELDS)
+                       break;
+       }
+
+       if(scores_flags[ps_primary] & SFL_ALLOW_HIDE)
+               have_primary = 1;
+       if(scores_flags[ps_secondary] & SFL_ALLOW_HIDE)
+               have_secondary = 1;
+       if(ps_primary == ps_secondary)
+               have_secondary = 1;
+       missing = (!have_primary) + (!have_secondary) + (!have_separator) + (!have_name);
+
+       if(hud_num_fields+missing < MAX_HUD_FIELDS)
+       {
+               if(!have_name)
+               {
+                       strunzone(hud_title[hud_num_fields]);
+                       for(i = hud_num_fields; i > 0; --i)
+                       {
+                               hud_title[i] = hud_title[i-1];
+                               hud_size[i] = hud_size[i-1];
+                               hud_field[i] = hud_field[i-1];
+                       }
+                       hud_title[0] = strzone("name");
+                       hud_field[0] = SP_NAME;
+                       ++hud_num_fields;
+                       print("fixed missing field 'name'\n");
+
+                       if(!have_separator)
+                       {
+                               strunzone(hud_title[hud_num_fields]);
+                               for(i = hud_num_fields; i > 1; --i)
+                               {
+                                       hud_title[i] = hud_title[i-1];
+                                       hud_size[i] = hud_size[i-1];
+                                       hud_field[i] = hud_field[i-1];
+                               }
+                               hud_title[1] = strzone("|");
+                               hud_field[1] = SP_SEPARATOR;
+                               hud_size[1] = stringwidth("|", FALSE, hud_fontsize);
+                               ++hud_num_fields;
+                               print("fixed missing field '|'\n");
+                       }
+               }
+               else if(!have_separator)
+               {
+                       strunzone(hud_title[hud_num_fields]);
+                       hud_title[hud_num_fields] = strzone("|");
+                       hud_size[hud_num_fields] = stringwidth("|", FALSE, hud_fontsize);
+                       hud_field[hud_num_fields] = SP_SEPARATOR;
+                       ++hud_num_fields;
+                       print("fixed missing field '|'\n");
+               }
+               if(!have_secondary)
+               {
+                       strunzone(hud_title[hud_num_fields]);
+                       hud_title[hud_num_fields] = strzone(scores_label[ps_secondary]);
+                       hud_size[hud_num_fields] = stringwidth(hud_title[hud_num_fields], FALSE, hud_fontsize);
+                       hud_field[hud_num_fields] = ps_secondary;
+                       ++hud_num_fields;
+                       print("fixed missing field '", scores_label[ps_secondary], "'\n");
+               }
+               if(!have_primary)
+               {
+                       strunzone(hud_title[hud_num_fields]);
+                       hud_title[hud_num_fields] = strzone(scores_label[ps_primary]);
+                       hud_size[hud_num_fields] = stringwidth(hud_title[hud_num_fields], FALSE, hud_fontsize);
+                       hud_field[hud_num_fields] = ps_primary;
+                       ++hud_num_fields;
+                       print("fixed missing field '", scores_label[ps_primary], "'\n");
+               }
+       }
+
+       hud_field[hud_num_fields] = SP_END;
+}
+
+// MOVEUP::
+vector hud_field_rgb;
+string hud_field_icon0;
+string hud_field_icon1;
+string hud_field_icon2;
+vector hud_field_icon0_rgb;
+vector hud_field_icon1_rgb;
+vector hud_field_icon2_rgb;
+float hud_field_icon0_alpha;
+float hud_field_icon1_alpha;
+float hud_field_icon2_alpha;
+string HUD_GetField(entity pl, float field)
+{
+       float tmp, num, denom, f;
+       string str;
+       hud_field_rgb = '1 1 1';
+       hud_field_icon0 = "";
+       hud_field_icon1 = "";
+       hud_field_icon2 = "";
+       hud_field_icon0_rgb = '1 1 1';
+       hud_field_icon1_rgb = '1 1 1';
+       hud_field_icon2_rgb = '1 1 1';
+       hud_field_icon0_alpha = 1;
+       hud_field_icon1_alpha = 1;
+       hud_field_icon2_alpha = 1;
+       switch(field)
+       {
+               case SP_PING:
+                       if not(pl.gotscores)
+                               return "\x8D\x8D\x8D"; // >>> sign
+                       //str = getplayerkey(pl.sv_entnum, "ping");
+                       f = pl.ping;
+                       if(f == 0)
+                               return "N/A";
+                       tmp = max(0, min(220, f-80)) / 220;
+                       hud_field_rgb = '1 1 1' - '0 1 1'*tmp;
+                       return ftos(f);
+
+               case SP_PL:
+                       if not(pl.gotscores)
+                               return "N/A";
+                       f = pl.ping_packetloss;
+                       tmp = pl.ping_movementloss;
+                       if(f == 0 && tmp == 0)
+                               return "";
+                       str = ftos(ceil(f * 100));
+                       if(tmp != 0)
+                               str = strcat(str, "~", ftos(ceil(tmp * 100)));
+                       tmp = bound(0, f / 0.2 + tmp / 0.04, 1); // 20% is REALLY BAD pl
+                       hud_field_rgb = '1 0.5 0.5' - '0 0.5 0.5'*tmp;
+                       return str;
+
+               case SP_NAME:
+                       if(ready_waiting && pl.ready)
+                       {
+                               hud_field_icon0 = "gfx/scoreboard/player_ready";
+                       }
+                       else if(!teamplay)
+                       {
+                               f = stof(getplayerkey(pl.sv_entnum, "colors"));
+                               {
+                                       hud_field_icon0 = "gfx/scoreboard/playercolor_base";
+                                       hud_field_icon1 = "gfx/scoreboard/playercolor_shirt";
+                                       hud_field_icon1_rgb = colormapPaletteColor(floor(f / 16), 0);
+                                       hud_field_icon2 = "gfx/scoreboard/playercolor_pants";
+                                       hud_field_icon2_rgb = colormapPaletteColor(mod(f, 16), 1);
+                               }
+                       }
+                       return GetPlayerName(pl.sv_entnum);
+
+               case SP_FRAGS:
+                       f = pl.(scores[SP_KILLS]);
+                       f -= pl.(scores[SP_SUICIDES]);
+                       return ftos(f);
+
+               case SP_KDRATIO:
+                       num = pl.(scores[SP_KILLS]);
+                       denom = pl.(scores[SP_DEATHS]);
+
+                       if(denom == 0) {
+                               hud_field_rgb = '0 1 0';
+                               str = ftos(num);
+                       } else if(num <= 0) {
+                               hud_field_rgb = '1 0 0';
+                               str = ftos(num/denom);
+                       } else
+                               str = ftos(num/denom);
+
+                       tmp = strstrofs(str, ".", 0);
+                       if(tmp > 0)
+                               str = substring(str, 0, tmp+2);
+                       return str;
+
+               default:
+                       tmp = pl.(scores[field]);
+                       f = scores_flags[field];
+                       if(field == ps_primary)
+                               hud_field_rgb = '1 1 0';
+                       else if(field == ps_secondary)
+                               hud_field_rgb = '0 1 1';
+                       else
+                               hud_field_rgb = '1 1 1';
+                       return ScoreString(f, tmp);
+       }
+       //return "error";
+}
+
+float xmin, xmax, ymin, ymax, sbwidth;
+float hud_fixscoreboardcolumnwidth_len;
+float hud_fixscoreboardcolumnwidth_iconlen;
+float hud_fixscoreboardcolumnwidth_marginlen;
+
+string HUD_FixScoreboardColumnWidth(float i, string str)
+{
+       float field, f;
+       vector sz;
+       field = hud_field[i];
+
+       hud_fixscoreboardcolumnwidth_iconlen = 0;
+
+       if(hud_field_icon0 != "")
+       {
+               sz = drawgetimagesize(hud_field_icon0);
+               f = sz_x / sz_y;
+               if(hud_fixscoreboardcolumnwidth_iconlen < f)
+                       hud_fixscoreboardcolumnwidth_iconlen = f;
+       }
+
+       if(hud_field_icon1 != "")
+       {
+               sz = drawgetimagesize(hud_field_icon1);
+               f = sz_x / sz_y;
+               if(hud_fixscoreboardcolumnwidth_iconlen < f)
+                       hud_fixscoreboardcolumnwidth_iconlen = f;
+       }
+
+       if(hud_field_icon2 != "")
+       {
+               sz = drawgetimagesize(hud_field_icon2);
+               f = sz_x / sz_y;
+               if(hud_fixscoreboardcolumnwidth_iconlen < f)
+                       hud_fixscoreboardcolumnwidth_iconlen = f;
+       }
+
+       hud_fixscoreboardcolumnwidth_iconlen *= hud_fontsize_y / hud_fontsize_x; // fix icon aspect
+
+       if(hud_fixscoreboardcolumnwidth_iconlen != 0)
+               hud_fixscoreboardcolumnwidth_marginlen = stringwidth(" ", FALSE, hud_fontsize);
+       else
+               hud_fixscoreboardcolumnwidth_marginlen = 0;
+
+       if(field == SP_NAME) // name gets all remaining space
+       {
+               float namesize, j;
+               namesize = sbwidth;// / hud_fontsize_x;
+               for(j = 0; j < hud_num_fields; ++j)
+                       if(j != i)
+                               if (hud_field[i] != SP_SEPARATOR)
+                                       namesize -= hud_size[j] + 1;
+               namesize += 1;
+               hud_size[i] = namesize;
+
+               if (hud_fixscoreboardcolumnwidth_iconlen != 0)
+                       namesize -= hud_fixscoreboardcolumnwidth_marginlen + hud_fixscoreboardcolumnwidth_iconlen;
+               str = textShortenToWidth(str, namesize, hud_fontsize, stringwidth_colors);
+               hud_fixscoreboardcolumnwidth_len = stringwidth(str, TRUE, hud_fontsize);
+       }
+       else
+               hud_fixscoreboardcolumnwidth_len = stringwidth(str, FALSE, hud_fontsize);
+
+       f = hud_fixscoreboardcolumnwidth_len + hud_fixscoreboardcolumnwidth_marginlen + hud_fixscoreboardcolumnwidth_iconlen;
+       if(hud_size[i] < f)
+               hud_size[i] = f;
+
+       return str;
+}
+
+void HUD_PrintScoreboardItem(vector pos, entity pl, float is_self, float pl_number)
+{
+       vector tmp, rgb;
+       rgb = GetTeamRGB(pl.team);
+       string str;
+       float i, field;
+       float is_spec;
+       is_spec = (GetPlayerColor(pl.sv_entnum) == COLOR_SPECTATOR);
+
+       if((rgb == '1 1 1') && (!is_spec)) {
+               rgb_x = cvar("scoreboard_color_bg_r") + 0.5;
+               rgb_y = cvar("scoreboard_color_bg_g") + 0.5;
+               rgb_z = cvar("scoreboard_color_bg_b") + 0.5; }
+
+       // Layout:
+       tmp_x = sbwidth;
+       tmp_y = hud_fontsize_y * 1.25;
+       tmp_z = 0;
+
+       // alternated rows highlighting
+       if(is_self)
+               drawfill(pos - '1 1 0', tmp + '2 0 0', rgb, scoreboard_highlight_alpha_self, DRAWFLAG_NORMAL);
+       else if((scoreboard_highlight) && (!mod(pl_number,2)))
+               drawfill(pos - '1 1 0', tmp + '2 0 0', rgb, scoreboard_highlight_alpha, DRAWFLAG_NORMAL);
+
+       tmp_y = 0;
+
+       for(i = 0; i < hud_num_fields; ++i)
+       {
+               field = hud_field[i];
+               if(field == SP_SEPARATOR)
+                       break;
+
+               if(is_spec && field != SP_NAME && field != SP_PING) {
+                       pos_x += hud_size[i] + hud_fontsize_x;
+                       continue;
+               }
+               str = HUD_GetField(pl, field);
+               str = HUD_FixScoreboardColumnWidth(i, str);
+
+               pos_x += hud_size[i] + hud_fontsize_x;
+
+               if(field == SP_NAME) {
+                       tmp_x = hud_size[i] - hud_fontsize_x*hud_fixscoreboardcolumnwidth_iconlen - hud_fixscoreboardcolumnwidth_marginlen + hud_fontsize_x;
+                       if (is_self)
+                               drawcolorcodedstring(pos - tmp, str, hud_fontsize, scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
+                       else
+                               drawcolorcodedstring(pos - tmp, str, hud_fontsize, scoreboard_alpha_name, DRAWFLAG_NORMAL);
+               } else {
+                       tmp_x = hud_fixscoreboardcolumnwidth_len + hud_fontsize_x;
+                       if (is_self)
+                               drawstring(pos - tmp, str, hud_fontsize, hud_field_rgb, scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
+                       else
+                               drawstring(pos - tmp, str, hud_fontsize, hud_field_rgb, scoreboard_alpha_name, DRAWFLAG_NORMAL);
+               }
+
+               tmp_x = hud_size[i] + hud_fontsize_x;
+               if(hud_field_icon0 != "")
+                       if (is_self)
+                               drawpic(pos - tmp, hud_field_icon0, '0 1 0' * hud_fontsize_y + '1 0 0' * hud_fontsize_x * hud_fixscoreboardcolumnwidth_iconlen, hud_field_icon1_rgb, hud_field_icon0_alpha * scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
+                       else
+                               drawpic(pos - tmp, hud_field_icon0, '0 1 0' * hud_fontsize_y + '1 0 0' * hud_fontsize_x * hud_fixscoreboardcolumnwidth_iconlen, hud_field_icon1_rgb, hud_field_icon0_alpha * scoreboard_alpha_name, DRAWFLAG_NORMAL);
+               if(hud_field_icon1 != "")
+                       if (is_self)
+                               drawpic(pos - tmp, hud_field_icon1, '0 1 0' * hud_fontsize_y + '1 0 0' * hud_fontsize_x * hud_fixscoreboardcolumnwidth_iconlen, hud_field_icon1_rgb, hud_field_icon1_alpha * scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
+                       else
+                               drawpic(pos - tmp, hud_field_icon1, '0 1 0' * hud_fontsize_y + '1 0 0' * hud_fontsize_x * hud_fixscoreboardcolumnwidth_iconlen, hud_field_icon1_rgb, hud_field_icon1_alpha * scoreboard_alpha_name, DRAWFLAG_NORMAL);
+               if(hud_field_icon2 != "")
+                       if (is_self)
+                               drawpic(pos - tmp, hud_field_icon2, '0 1 0' * hud_fontsize_y + '1 0 0' * hud_fontsize_x * hud_fixscoreboardcolumnwidth_iconlen, hud_field_icon2_rgb, hud_field_icon2_alpha * scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
+                       else
+                               drawpic(pos - tmp, hud_field_icon2, '0 1 0' * hud_fontsize_y + '1 0 0' * hud_fontsize_x * hud_fixscoreboardcolumnwidth_iconlen, hud_field_icon2_rgb, hud_field_icon2_alpha * scoreboard_alpha_name, DRAWFLAG_NORMAL);
+       }
+
+       if(hud_field[i] == SP_SEPARATOR)
+       {
+               pos_x = xmax;
+               for(i = hud_num_fields-1; i > 0; --i)
+               {
+                       field = hud_field[i];
+                       if(field == SP_SEPARATOR)
+                               break;
+
+                       if(is_spec && field != SP_NAME && field != SP_PING) {
+                               pos_x -= hud_size[i] + hud_fontsize_x;
+                               continue;
+                       }
+
+                       str = HUD_GetField(pl, field);
+                       str = HUD_FixScoreboardColumnWidth(i, str);
+
+                       if(field == SP_NAME) {
+                               tmp_x = hud_fixscoreboardcolumnwidth_len; // left or right aligned? let's put it right...
+                               if(is_self)
+                                       drawcolorcodedstring(pos - tmp, str, hud_fontsize, scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
+                               else
+                                       drawcolorcodedstring(pos - tmp, str, hud_fontsize, scoreboard_alpha_name, DRAWFLAG_NORMAL);
+                       } else {
+                               tmp_x = hud_fixscoreboardcolumnwidth_len;
+                               if(is_self)
+                                       drawstring(pos - tmp, str, hud_fontsize, hud_field_rgb, scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
+                               else
+                                       drawstring(pos - tmp, str, hud_fontsize, hud_field_rgb, scoreboard_alpha_name, DRAWFLAG_NORMAL);
+                       }
+
+                       tmp_x = hud_size[i];
+                       if(hud_field_icon0 != "")
+                               if (is_self)
+                                       drawpic(pos - tmp, hud_field_icon0, '0 1 0' * hud_fontsize_y + '1 0 0' * hud_fontsize_x * hud_fixscoreboardcolumnwidth_iconlen, hud_field_icon1_rgb, hud_field_icon0_alpha * scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
+                               else
+                                       drawpic(pos - tmp, hud_field_icon0, '0 1 0' * hud_fontsize_y + '1 0 0' * hud_fontsize_x * hud_fixscoreboardcolumnwidth_iconlen, hud_field_icon1_rgb, hud_field_icon0_alpha * scoreboard_alpha_name, DRAWFLAG_NORMAL);
+                       if(hud_field_icon1 != "")
+                               if (is_self)
+                                       drawpic(pos - tmp, hud_field_icon1, '0 1 0' * hud_fontsize_y + '1 0 0' * hud_fontsize_x * hud_fixscoreboardcolumnwidth_iconlen, hud_field_icon1_rgb, hud_field_icon1_alpha * scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
+                               else
+                                       drawpic(pos - tmp, hud_field_icon1, '0 1 0' * hud_fontsize_y + '1 0 0' * hud_fontsize_x * hud_fixscoreboardcolumnwidth_iconlen, hud_field_icon1_rgb, hud_field_icon1_alpha * scoreboard_alpha_name, DRAWFLAG_NORMAL);
+                       if(hud_field_icon2 != "")
+                               if (is_self)
+                                       drawpic(pos - tmp, hud_field_icon2, '0 1 0' * hud_fontsize_y + '1 0 0' * hud_fontsize_x * hud_fixscoreboardcolumnwidth_iconlen, hud_field_icon2_rgb, hud_field_icon2_alpha * scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
+                               else
+                                       drawpic(pos - tmp, hud_field_icon2, '0 1 0' * hud_fontsize_y + '1 0 0' * hud_fontsize_x * hud_fixscoreboardcolumnwidth_iconlen, hud_field_icon2_rgb, hud_field_icon2_alpha * scoreboard_alpha_name, DRAWFLAG_NORMAL);
+                       pos_x -= hud_size[i] + hud_fontsize_x;
+               }
+       }
+}
+
+/*
+ * HUD_Scoreboard_MakeTable
+ *
+ * Makes a table for a team (for all playing players in DM) and fills it
+ */
+
+vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_size)
+{
+       float body_table_height, i;
+       vector tmp, column_dim;
+       entity pl;
+
+       body_table_height = 1.25 * hud_fontsize_y * max(1, tm.team_size); // no player? show 1 empty line
+
+       pos -= '1 1 0';
+
+       tmp_x = sbwidth + 2;
+       tmp_y = 1.25 * hud_fontsize_y;
+
+       // rounded header
+       drawpic(pos, "gfx/scoreboard/scoreboard_tableheader", tmp, (rgb * hud_color_bg_team) + '0.5 0.5 0.5', scoreboard_alpha_bg, DRAWFLAG_NORMAL);
+
+       // table border
+       tmp_y += hud_border_thickness;
+       tmp_y += body_table_height;
+       drawborderlines(hud_border_thickness, pos, tmp, '0 0 0', scoreboard_alpha_bg, DRAWFLAG_NORMAL); // more transparency for the scoreboard
+
+       // separator header/table
+       pos_y += 1.25 * hud_fontsize_y;
+       tmp_y = hud_border_thickness;
+       drawfill(pos, tmp, '0 0 0', scoreboard_alpha_bg, DRAWFLAG_NORMAL);
+
+       pos_y += hud_border_thickness;
+
+       // table background
+       tmp_y = body_table_height;
+       drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * hud_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL);
+
+       // anyway, apply some color
+       //drawfill(pos, tmp + '2 0 0', rgb, 0.1, DRAWFLAG_NORMAL);
+
+       // go back to the top to make alternated columns highlighting and to print the strings
+       pos_y -= 1.25 * hud_fontsize_y;
+       pos_y -= hud_border_thickness;
+
+       pos += '1 1 0';
+
+       if (scoreboard_highlight)
+       {
+               column_dim_y = 1.25 * hud_fontsize_y; // header
+               column_dim_y += hud_border_thickness;
+               column_dim_y += body_table_height;
+       }
+
+       // print the strings of the columns headers and draw the columns
+       for(i = 0; i < hud_num_fields; ++i)
+       {
+               if(hud_field[i] == SP_SEPARATOR)
+                       break;
+               column_dim_x = hud_size[i] + hud_fontsize_x;
+               if (scoreboard_highlight)
+               {
+                       if (mod(i,2))
+                               drawfill(pos - '0 1 0' - hud_fontsize_x / 2 * '1 0 0', column_dim, '0 0 0', scoreboard_alpha_bg * 0.2, DRAWFLAG_NORMAL);
+               }
+               drawstring(pos, hud_title[i], hud_fontsize, rgb * 1.5, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+               pos_x += column_dim_x;
+       }
+       if(hud_field[i] == SP_SEPARATOR)
+       {
+               pos_x = xmax;
+               tmp_y = 0;
+               for(i = hud_num_fields-1; i > 0; --i)
+               {
+                       if(hud_field[i] == SP_SEPARATOR)
+                               break;
+
+                       pos_x -= hud_size[i];
+
+                       if (scoreboard_highlight)
+                       {
+                               if (!mod(i,2))
+                               {
+                                       if (i == hud_num_fields-1)
+                                               column_dim_x = hud_size[i] + hud_fontsize_x / 2 + 1;
+                                       else
+                                               column_dim_x = hud_size[i] + hud_fontsize_x;
+                                       drawfill(pos - '0 1 0' - hud_fontsize_x / 2 * '1 0 0', column_dim, '0 0 0', scoreboard_alpha_bg * 0.2, DRAWFLAG_NORMAL);
+                               }
+                       }
+
+                       tmp_x = stringwidth(hud_title[i], FALSE, hud_fontsize);
+                       tmp_x = (hud_size[i] - tmp_x) * hud_fontsize_x;
+                       drawstring(pos + tmp, hud_title[i], hud_fontsize, rgb * 1.5, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+                       pos_x -= hud_fontsize_x;
+               }
+       }
+
+       pos_x = xmin;
+       pos_y += 1.25 * hud_fontsize_y; // skip the header
+       pos_y += hud_border_thickness;
+
+       // fill the table and draw the rows
+       i = 0;
+       if (teamplay)
+               for(pl = players.sort_next; pl; pl = pl.sort_next)
+               {
+                       if(pl.team != tm.team)
+                               continue;
+                       HUD_PrintScoreboardItem(pos, pl, (pl.sv_entnum == player_localentnum - 1), i);
+                       pos_y += 1.25 * hud_fontsize_y;
+                       ++i;
+               }
+       else
+               for(pl = players.sort_next; pl; pl = pl.sort_next)
+               {
+                       if(pl.team == COLOR_SPECTATOR)
+                               continue;
+                       HUD_PrintScoreboardItem(pos, pl, (pl.sv_entnum == player_localentnum - 1), i);
+                       pos_y += 1.25 * hud_fontsize_y;
+                       ++i;
+               }
+
+       if (i == 0)
+               pos_y += 1.25 * hud_fontsize_y; // move to the end of the table
+       pos_y += 1.25 * hud_fontsize_y; // move empty row (out of the table)
+
+       return pos;
+}
+
+float HUD_WouldDrawScoreboard() {
+       if (scoreboard_showscores)
+               return 1;
+       else if (intermission == 1)
+               return 1;
+       else if (intermission == 2)
+               return 1;
+       else if (getstati(STAT_HEALTH) <= 0 && cvar("cl_deathscoreboard"))
+               return 1;
+       else if(scoreboard_showscores_force)
+               return 1;
+       return 0;
+}
+
+float g_minstagib;
+float average_accuracy;
+vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size)
+{
+       float i;
+       float weapon_hit, weapon_damage, weapon_stats;
+       float fontsize = 40 * 1/3;
+       float weapon_cnt = 12;
+       float rows;
+       if(cvar("scoreboard_accuracy_doublerows"))
+               rows = 2;
+       else
+               rows = 1;
+       float height = 40;
+
+       if(warmup_stage)
+       {
+               return pos;
+       }
+
+       drawstring(pos, strcat("Accuracy stats (average ", ftos(average_accuracy), "%)"), hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+       pos_y += 18;
+       vector tmp;
+       tmp_x = sbwidth;
+       tmp_y = height * rows;
+
+       drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * hud_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL);
+       drawborderlines(hud_accuracy_border_thickness, pos, tmp, '0 0 0', scoreboard_alpha_bg * 0.75, DRAWFLAG_NORMAL);
+
+       // column highlighting
+       for(i = 0; i < weapon_cnt/rows; ++i)
+       {
+               if(!mod(i, 2))
+                       drawfill(pos + '1 0 0' * (sbwidth/weapon_cnt) * rows * i, '0 1 0' * height * rows + '1 0 0' * (sbwidth/weapon_cnt) * rows, '0 0 0', scoreboard_alpha_bg * 0.2, DRAWFLAG_NORMAL);
+       }
+
+       // row highlighting
+       for(i = 0; i < rows; ++i)
+       {
+               drawfill(pos + '0 1 0' * height * (2/3) + '0 1 0' * height * i, '1 0 0' * sbwidth + '0 1 0' * fontsize, '1 1 1', scoreboard_highlight_alpha, DRAWFLAG_NORMAL);
+       }
+
+       drawfont = hud_bigfont;
+       average_accuracy = 0;
+       float weapons_with_stats;
+       weapons_with_stats = 0;
+       if(rows == 2)
+               pos_x += sbwidth/weapon_cnt / 2;
+
+       if(getstati(STAT_SWITCHWEAPON) == WEP_MINSTANEX)
+               g_minstagib = 1; // TODO: real detection for minstagib?
+
+       for(i = WEP_FIRST; i <= WEP_LAST; ++i)
+       {
+               self = get_weaponinfo(i);
+               if not(self.weapons)
+                       continue;
+               if ((i == WEP_NEX && g_minstagib) || i == WEP_PORTO || (i == WEP_MINSTANEX && !g_minstagib) || i == WEP_TUBA || i == WEP_FIREBALL) // skip port-o-launch, nex || minstanex, tuba and fireball
+                       continue;
+               weapon_hit = weapon_hits[i-WEP_FIRST];
+               weapon_damage = weapon_fired[i-WEP_FIRST];
+               if(weapon_damage)
+                       weapon_stats = bound(0, floor(100 * weapon_hit / weapon_damage), 100);
+               float weapon_alpha;
+
+               if(weapon_damage)
+                       weapon_alpha = scoreboard_alpha_fg;
+               else
+                       weapon_alpha = 0.2 * scoreboard_alpha_fg;
+
+               // weapon icon
+               drawpic(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/weapon", self.netname), '1 0 0' * sbwidth * (1/weapon_cnt) + '0 1 0' * height * (2/3), '1 1 1', weapon_alpha, DRAWFLAG_NORMAL);
+               // the accuracy
+               if(weapon_damage) {
+                       weapons_with_stats += 1;
+                       average_accuracy += weapon_stats; // store sum of all accuracies in average_accuracy
+
+                       string s;
+                       s = strcat(ftos(weapon_stats),"%");
+
+                       float padding;
+                       padding = ((sbwidth/weapon_cnt) - stringwidth(s, FALSE, '1 0 0' * fontsize)) / 2; // center the accuracy value
+
+                       rgb = HUD_AccuracyColor(weapon_stats);
+                       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;
+               if(rows == 2 && i == 6) {
+                       pos_x -= sbwidth;
+                       pos_y += height;
+               }
+       }
+       drawfont = hud_font;
+
+       if(weapons_with_stats)
+               average_accuracy = floor(average_accuracy / weapons_with_stats);
+
+       if(rows == 2)
+               pos_x -= sbwidth/weapon_cnt / 2;
+       pos_x -= sbwidth;
+       pos_y += height;
+       return pos;
+}
+
+vector HUD_DrawScoreboardRankings(vector pos, entity pl,  vector rgb, vector bg_size)
+{
+       float i;
+       RANKINGS_RECEIVED_CNT = 0;
+               for (i=RANKINGS_CNT-1; i>=0; --i)
+                       if (grecordtime[i])
+                               RANKINGS_RECEIVED_CNT = RANKINGS_RECEIVED_CNT + 1;
+
+       if (RANKINGS_RECEIVED_CNT == 0)
+               return pos;
+
+       float is_spec;
+       is_spec = (GetPlayerColor(pl.sv_entnum) == COLOR_SPECTATOR);
+       vector hl_rgb;
+               hl_rgb_x = cvar("scoreboard_color_bg_r") + 0.5;
+               hl_rgb_y = cvar("scoreboard_color_bg_g") + 0.5;
+               hl_rgb_z = cvar("scoreboard_color_bg_b") + 0.5;
+
+       pos_y += hud_fontsize_y;
+       drawstring(pos, strcat("Rankings"), hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+       pos_y += hud_fontsize_y;
+       vector tmp;
+       tmp_x = sbwidth;
+       tmp_y = hud_fontsize_y * RANKINGS_RECEIVED_CNT;
+
+       drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * hud_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL);
+       drawborderlines(hud_border_thickness, pos, tmp, '0 0 0', scoreboard_alpha_bg * 0.75, DRAWFLAG_NORMAL);
+
+       // row highlighting
+       for(i = 0; i<RANKINGS_RECEIVED_CNT; ++i)
+       {
+               string n, p;
+               float t;
+               t = grecordtime[i];
+               if (t == 0)
+                       continue;
+               n = grecordholder[i];
+               p = race_PlaceName(i+1);
+               if(grecordholder[i] == GetPlayerName(player_localentnum - 1))
+                       drawfill(pos, '1 0 0' * sbwidth + '0 1 0' * hud_fontsize_y, hl_rgb, scoreboard_highlight_alpha_self, DRAWFLAG_NORMAL);
+               else if(!mod(i, 2) && scoreboard_highlight)
+                       drawfill(pos, '1 0 0' * sbwidth + '0 1 0' * hud_fontsize_y, hl_rgb, scoreboard_highlight_alpha, DRAWFLAG_NORMAL);
+               drawstring(pos, p, hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+               drawstring(pos + '3 0 0' * hud_fontsize_x, TIME_ENCODED_TOSTRING(t), hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+               drawcolorcodedstring(pos + '8 0 0' * hud_fontsize_x, n, hud_fontsize, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+               pos += '0 1 0' * hud_fontsize_y;
+       }
+
+       return pos;
+}
+
+float scoreboard_fade_alpha;
+float hud_woulddrawscoreboard_prev;
+float hud_woulddrawscoreboard_change; // "time" at which HUD_WouldDrawScoreboard() changed
+void HUD_DrawScoreboard()
+{
+       HUD_UpdatePlayerTeams();
+
+       float hud_woulddrawscoreboard;
+       hud_woulddrawscoreboard = HUD_WouldDrawScoreboard();
+       if(hud_woulddrawscoreboard != hud_woulddrawscoreboard_prev) {
+               hud_woulddrawscoreboard_change = time;
+               hud_woulddrawscoreboard_prev = hud_woulddrawscoreboard;
+       }
+
+       float scoreboard_fadeinspeed = cvar_or("scoreboard_fadeinspeed", 10);
+       float scoreboard_fadeoutspeed = cvar_or("scoreboard_fadeoutspeed", 5);
+       if(hud_woulddrawscoreboard) {
+               if (scoreboard_fadeinspeed)
+                       scoreboard_fade_alpha = bound (0, (time - hud_woulddrawscoreboard_change) * scoreboard_fadeinspeed, 1);
+               else
+                       scoreboard_fade_alpha = 1;
+       }
+       else
+               if (scoreboard_fadeoutspeed)
+                       scoreboard_fade_alpha = bound (0, (1/scoreboard_fadeoutspeed - (time - hud_woulddrawscoreboard_change)) * scoreboard_fadeoutspeed, 1);
+               else
+                       scoreboard_fade_alpha = 0;
+
+       if not(scoreboard_fade_alpha)
+               return;
+
+       scoreboard_alpha_bg = cvar("scoreboard_alpha_bg") * scoreboard_fade_alpha * (1 - cvar("_menu_alpha"));
+       scoreboard_alpha_fg = cvar_or("scoreboard_alpha_fg", 1.0) * scoreboard_fade_alpha * (1 - cvar("_menu_alpha"));
+       scoreboard_highlight = cvar("scoreboard_highlight");
+       scoreboard_highlight_alpha = cvar_or("scoreboard_highlight_alpha", 0.10) * scoreboard_alpha_fg;
+       scoreboard_highlight_alpha_self = cvar_or("scoreboard_highlight_alpha_self", 0.25) * scoreboard_alpha_fg;
+       scoreboard_alpha_name = cvar_or("scoreboard_alpha_name", 0.9) * scoreboard_alpha_fg;
+       scoreboard_alpha_name_self = cvar_or("scoreboard_alpha_name_self", 1) * scoreboard_alpha_fg;
+
+       vector rgb, pos, tmp;
+       entity pl, tm;
+
+       sbwidth = HUD_GetWidth(6.5 * hud_fontsize_y);
+
+       xmin = 0.5 * (vid_conwidth - sbwidth);
+       ymin = SCOREBOARD_OFFSET;
+
+       xmax = vid_conwidth - xmin;
+       ymax = vid_conheight - 0.2*vid_conheight;
+
+       // Initializes position
+       pos_x = xmin;
+       pos_y = ymin;
+       pos_z = 0;
+
+       // Heading
+       drawfont = hud_bigfont;
+       drawstringcenter('0 1 0' * ymin, "Scoreboard", '24 24 0', '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+
+       pos_y += 24 + 4;
+       pos_y += hud_fontsize_y;
+
+       drawfont = hud_font;
+
+       // Draw the scoreboard
+       vector bg_size;
+       bg_size = drawgetimagesize("gfx/hud/scoreboard_scoreboard_bg");
+
+       if(teamplay)
+       {
+               for(tm = teams.sort_next; tm; tm = tm.sort_next)
+               {
+                       if(tm.team == COLOR_SPECTATOR)
+                               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);
+
+                       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);
+
+                       pos = HUD_Scoreboard_MakeTable(pos, tm, rgb, bg_size);
+               }
+       }
+       else
+       {
+               rgb_x = cvar("scoreboard_color_bg_r");
+               rgb_y = cvar("scoreboard_color_bg_g");
+               rgb_z = cvar("scoreboard_color_bg_b");
+
+               for(tm = teams.sort_next; tm; tm = tm.sort_next)
+               {
+                       if(tm.team == COLOR_SPECTATOR)
+                               continue;
+
+                       pos = HUD_Scoreboard_MakeTable(pos, tm, rgb, bg_size);
+               }
+       }
+
+       if(gametype == GAME_CTS || gametype == GAME_RACE) {
+               if(race_speedaward) {
+                       drawcolorcodedstring(pos, strcat("Speed award: ", ftos(race_speedaward), " (", race_speedaward_holder, ")"), hud_fontsize, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+                       pos_y += 1.25 * hud_fontsize_y;
+               }
+               if(race_speedaward_alltimebest) {
+                       drawcolorcodedstring(pos, strcat("All-time fastest: ", ftos(race_speedaward_alltimebest), " (", race_speedaward_alltimebest_holder, ")"), hud_fontsize, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+                       pos_y += 1.25 * hud_fontsize_y;
+               }
+               pos = HUD_DrawScoreboardRankings(pos, pl, rgb, bg_size);
+       }
+       else if(cvar("scoreboard_accuracy") && spectatee_status != -1) {
+               if(teamplay)
+                       pos = HUD_DrawScoreboardAccuracyStats(pos, GetTeamRGB(myteam), bg_size);
+               else
+                       pos = HUD_DrawScoreboardAccuracyStats(pos, rgb, bg_size);
+       }
+
+       tmp = pos + '0 1.5 0' * hud_fontsize_y;
+       pos_y += 3 * hud_fontsize_y;
+
+       // List spectators
+       float specs;
+       specs = 0;
+       for(pl = players.sort_next; pl; pl = pl.sort_next)
+       {
+               if(pl.team != COLOR_SPECTATOR)
+                       continue;
+               HUD_PrintScoreboardItem(pos, pl, (pl.sv_entnum == player_localentnum - 1), specs);
+               pos_y += 1.25 * hud_fontsize_y;
+               ++specs;
+       }
+
+       if(specs)
+               drawstring(tmp, "Spectators", hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+
+       // Print info string
+       string str;
+       float tl, fl, ll;
+       str = strcat("playing on ^2", shortmapname, "^7");
+       tl = getstatf(STAT_TIMELIMIT);
+       fl = getstatf(STAT_FRAGLIMIT);
+       ll = getstatf(STAT_LEADLIMIT);
+       if(gametype == GAME_LMS)
+       {
+               if(tl > 0)
+                       str = strcat(str, " for up to ^1", ftos(tl), " minutes^7");
+       }
+       else
+       {
+               if(tl > 0)
+                       str = strcat(str, " for ^1", ftos(tl), " minutes^7");
+               if(fl > 0)
+               {
+                       if(tl > 0)
+                               str = strcat(str, " or");
+                       if(teamplay)
+                       {
+                               str = strcat(str, " until ^3", ScoreString(teamscores_flags[ts_primary], fl));
+                               if(teamscores_label[ts_primary] == "score")
+                                       str = strcat(str, " points^7");
+                               else if(teamscores_label[ts_primary] == "fastest")
+                                       str = strcat(str, " is beaten^7");
+                               else
+                                       str = strcat(str, " ", teamscores_label[ts_primary]);
+                       }
+                       else
+                       {
+                               str = strcat(str, " until ^3", ScoreString(scores_flags[ps_primary], fl));
+                               if(scores_label[ps_primary] == "score")
+                                       str = strcat(str, " points^7");
+                               else if(scores_label[ps_primary] == "fastest")
+                                       str = strcat(str, " is beaten^7");
+                               else
+                                       str = strcat(str, " ", scores_label[ps_primary]);
+                       }
+               }
+               if(ll > 0)
+               {
+                       if(tl > 0 || fl > 0)
+                               str = strcat(str, " or");
+                       if(teamplay)
+                       {
+                               str = strcat(str, " until a lead of ^3", ScoreString(teamscores_flags[ts_primary], ll));
+                               if(teamscores_label[ts_primary] == "score")
+                                       str = strcat(str, " points^7");
+                               else if(teamscores_label[ts_primary] == "fastest")
+                                       str = strcat(str, " is beaten^7");
+                               else
+                                       str = strcat(str, " ", teamscores_label[ts_primary]);
+                       }
+                       else
+                       {
+                               str = strcat(str, " until a lead of ^3", ScoreString(scores_flags[ps_primary], ll));
+                               if(scores_label[ps_primary] == "score")
+                                       str = strcat(str, " points^7");
+                               else if(scores_label[ps_primary] == "fastest")
+                                       str = strcat(str, " is beaten^7");
+                               else
+                                       str = strcat(str, " ", scores_label[ps_primary]);
+                       }
+               }
+       }
+
+
+       pos_y += 1.2 * hud_fontsize_y;
+       drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - stringwidth(str, TRUE, hud_fontsize)), str, hud_fontsize, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+
+       scoreboard_bottom = pos_y + 2 * hud_fontsize_y;
+}
+
+void HUD_DrawAccuracyStats_Description_Hitscan(vector position)
+{
+       drawstring(position + '0 3 0' * hud_fontsize_y, "Shots fired:", hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+       drawstring(position + '0 5 0' * hud_fontsize_y, "Shots hit:", hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+       drawstring(position + '0 7 0' * hud_fontsize_y, "Accuracy:", hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+       drawstring(position + '0 9 0' * hud_fontsize_y, "Shots missed:", hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+}
+
+void HUD_DrawAccuracyStats_Description_Splash(vector position)
+{
+       drawstring(position + '0 3 0' * hud_fontsize_y, "Maximum damage:", hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+       drawstring(position + '0 5 0' * hud_fontsize_y, "Actual damage:", hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+       drawstring(position + '0 7 0' * hud_fontsize_y, "Accuracy:", hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+       drawstring(position + '0 9 0' * hud_fontsize_y, "Damage wasted:", hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+}
+
+void HUD_DrawAccuracyStats()
+{
+       float i, count_hitscan, count_splash, row;  // count is the number of 'colums'
+       float weapon_hit, weapon_damage, weapon_stats;
+       float left_border;  // position where the weapons start, the description is in the border
+       vector fill_colour, fill_size;
+       vector pos;
+       vector border_colour;
+
+       float col_margin = 20;  // pixels between the columns
+       float row_margin = 20;  // pixels between the rows
+
+       fill_size_x = 5 * hud_fontsize_x;  // width of the background
+       fill_size_y = 10 * hud_fontsize_y;  // height of the background
+
+       drawfont = hud_bigfont;
+       pos_x = 0;
+       pos_y = SCOREBOARD_OFFSET;
+       pos_z = 0;
+       drawstringcenter(pos, "Weapon Accuracy", 2 * hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+
+       left_border = col_margin + 11 * hud_fontsize_x;
+
+       drawfont = hud_font;
+
+       if(warmup_stage)
+       {
+               pos_y += 40;
+               if(mod(time, 1) >= 0.4)
+                       drawstringcenter(pos, "Stats are not tracked during warmup stage", hud_fontsize, '1 1 0', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+
+               return;
+       }
+
+       if(gametype == GAME_RACE || gametype == GAME_CTS)
+       {
+               pos_y += 40;
+               if(mod(time, 1) >= 0.4)
+                       drawstringcenter(pos, "Stats are not tracked in Race/CTS", hud_fontsize, '1 1 0', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+
+               return;
+       }
+
+       float top_border_hitscan = SCOREBOARD_OFFSET + 55;  // position where the hitscan row starts: pixels down the screen
+       HUD_DrawAccuracyStats_Description_Hitscan('1 0 0' * col_margin + '0 1 0' * top_border_hitscan);
+
+       float top_border_splash = SCOREBOARD_OFFSET + 175;  // position where the splash row starts: pixels down the screen
+       HUD_DrawAccuracyStats_Description_Splash('1 0 0' * col_margin + '0 1 0' * top_border_splash);
+
+       for(i = WEP_FIRST; i <= WEP_LAST; ++i)
+       {
+               self = get_weaponinfo(i);
+               if not(self.weapons)
+                       continue;
+               weapon_hit = weapon_hits[i-WEP_FIRST];
+               weapon_damage = weapon_fired[i-WEP_FIRST];
+               border_colour = (i == activeweapon) ? '1 1 1' : '0 0 0';  // white or black border
+
+               if (weapon_damage) {
+                       if (self.spawnflags & WEP_TYPE_SPLASH) {
+                               weapon_stats = bound(0, floor(100 * weapon_hit / weapon_damage), 100);
+
+                               fill_colour_x = 1 - 0.015 * weapon_stats;
+                               fill_colour_y = 1 - 0.015 * (100 - weapon_stats);
+
+                               // how the background colour is calculated
+                               // %    red             green   red_2                   green_2
+                               // 0    1               0               1 - % * 0.015   1 - (100 - %) * 0.015
+                               // 10   0.85    0               1 - % * 0.015   1 - (100 - %) * 0.015
+                               // 20   0.70    0               1 - % * 0.015   1 - (100 - %) * 0.015
+                               // 30   0.55    0               1 - % * 0.015   1 - (100 - %) * 0.015
+                               // 40   0.40    0.10    1 - % * 0.015   1 - (100 - %) * 0.015
+                               // 50   0.25    0.25    1 - % * 0.015   1 - (100 - %) * 0.015
+                               // 60   0.10    0.40    1 - % * 0.015   1 - (100 - %) * 0.015
+                               // 70   0               0.55    1 - % * 0.015   1 - (100 - %) * 0.015
+                               // 80   0               0.70    1 - % * 0.015   1 - (100 - %) * 0.015
+                               // 90   0               0.85    1 - % * 0.015   1 - (100 - %) * 0.015
+                               // 100  0               1               1 - % * 0.015   1 - (100 - %) * 0.015
+
+                               if ((left_border + count_splash * (fill_size_x + col_margin) + fill_size_x) >= vid_conwidth)
+                               {
+                                       count_splash = 0;
+                                       ++row;
+                                       HUD_DrawAccuracyStats_Description_Splash('1 0 0' * col_margin + '0 1 0' * (top_border_splash + row * (fill_size_y + row_margin)));
+                               }
+
+                               pos_x = left_border + count_splash * (fill_size_x + col_margin);
+                               pos_y = top_border_splash + row * (fill_size_y + row_margin);
+
+                               // background
+                               drawpic(pos, "gfx/scoreboard/accuracy_bg", fill_size , fill_colour, scoreboard_alpha_bg, DRAWFLAG_NORMAL);
+                               drawborderlines(hud_border_thickness, pos, fill_size, border_colour, scoreboard_alpha_bg, DRAWFLAG_NORMAL);
+
+                               // the weapon
+                               drawpic(pos, strcat("gfx/weapons/weapon", self.netname), '1 0.5 0' * fill_size_x , '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+
+                               // the amount of shots fired or max damage
+                               drawstringright(pos + '4.5 0 0' * hud_fontsize_x + '0 3 0' * hud_fontsize_y, ftos(weapon_damage), hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+
+                               // the amount of hits or actual damage
+                               drawstringright(pos + '4.5 0 0' * hud_fontsize_x + '0 5 0' * hud_fontsize_y, ftos(weapon_hit), hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+
+                               // the accuracy
+                               drawstringright(pos + '4.5 0 0' * hud_fontsize_x + '0 7 0' * hud_fontsize_y, strcat(ftos(weapon_stats),"%"), hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+
+                               // the amount of shots missed or damage wasted
+                               drawstringright(pos + '4.5 0 0' * hud_fontsize_x + '0 9 0' * hud_fontsize_y, ftos(max(0, weapon_damage - weapon_hit)), hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+
+                               ++count_splash;
+                       } else if (self.spawnflags & WEP_TYPE_HITSCAN) {
+                               weapon_stats = bound(0, floor(100 * weapon_hit / weapon_damage), 100);
+
+                               fill_colour_x = 1 - 0.015 * weapon_stats;
+                               fill_colour_y = 1 - 0.015 * (100 - weapon_stats);
+
+                               // how the background colour is calculated
+                               // %    red             green   red_2                   green_2
+                               // 0    1               0               1 - % * 0.015   1 - (100 - %) * 0.015
+                               // 10   0.850   0               1 - % * 0.015   1 - (100 - %) * 0.015
+                               // 20   0.70    0               1 - % * 0.015   1 - (100 - %) * 0.015
+                               // 30   0.55    0               1 - % * 0.015   1 - (100 - %) * 0.015
+                               // 40   0.40    0.10    1 - % * 0.015   1 - (100 - %) * 0.015
+                               // 50   0.25    0.25    1 - % * 0.015   1 - (100 - %) * 0.015
+                               // 60   0.10    0.40    1 - % * 0.015   1 - (100 - %) * 0.015
+                               // 70   0               0.55    1 - % * 0.015   1 - (100 - %) * 0.015
+                               // 80   0               0.70    1 - % * 0.015   1 - (100 - %) * 0.015
+                               // 90   0               0.85    1 - % * 0.015   1 - (100 - %) * 0.015
+                               // 100  0               1               1 - % * 0.015   1 - (100 - %) * 0.015
+
+                               if ((left_border + count_hitscan * (fill_size_x + col_margin) + fill_size_x + cvar("stats_right_margin")) >= vid_conwidth)
+                               {
+                                       count_hitscan = 0;
+                                       ++row;
+                                       HUD_DrawAccuracyStats_Description_Hitscan('1 0 0' * col_margin + '0 1 0' * (top_border_hitscan + row * (fill_size_y + row_margin)));
+                               }
+
+                               pos_x = left_border + count_hitscan * (fill_size_x + col_margin);
+                               pos_y = top_border_hitscan + row * (fill_size_y + row_margin);
+
+                               // background
+                               drawpic(pos, "gfx/scoreboard/accuracy_bg", fill_size , fill_colour, scoreboard_alpha_bg, DRAWFLAG_NORMAL);
+                               drawborderlines(hud_border_thickness, pos, fill_size, border_colour, scoreboard_alpha_bg, DRAWFLAG_NORMAL);
+
+                               // the weapon
+                               drawpic(pos, strcat("gfx/weapons/weapon", self.netname), '1 0.5 0' * fill_size_x , '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+
+                               // the amount of shots fired or max damage
+                               drawstringright(pos + '4.5 0 0' * hud_fontsize_x + '0 3 0' * hud_fontsize_y, ftos(weapon_damage), hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+
+                               // the amount of hits or actual damage
+                               drawstringright(pos + '4.5 0 0' * hud_fontsize_x + '0 5 0' * hud_fontsize_y, ftos(weapon_hit), hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+
+                               // the accuracy
+                               drawstringright(pos + '4.5 0 0' * hud_fontsize_x + '0 7 0' * hud_fontsize_y, strcat(ftos(weapon_stats),"%"), hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+
+                               // the amount of shots missed or damage wasted
+                               drawstringright(pos + '4.5 0 0' * hud_fontsize_x + '0 9 0' * hud_fontsize_y, ftos(max(0, weapon_damage - weapon_hit)), hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+
+                               ++count_hitscan;
+                       }
+               }
+       }
+}
index 1ac07ce4c71c4380d02b7c28bbe7a3cc83254062..323db5e68cac525d343bf9a75f10871847a09b94 100644 (file)
@@ -2,10 +2,10 @@ float teamradar_angle; // player yaw angle
 vector teamradar_origin3d_in_texcoord; // player origin
 vector teamradar_origin2d; // 2D origin
 vector teamradar_size2d; // 2D size
-vector teamradar_extraclip_mins, teamradar_extraclip_maxs; // don't even ask
+vector teamradar_extraclip_mins, teamradar_extraclip_maxs; // for non-centered radar display
 float teamradar_size; // 2D scale factor
-float cl_teamradar_scale; // window size = ...qu
-float cl_teamradar_nohudhack;
+float hud_radar_scale; // window size = ...qu
+float hud_radar_nohudhack;
 float v_flipped;
 
 float vlen2d(vector v)
@@ -57,15 +57,6 @@ void draw_teamradar_background(float bg, float fg)
 {
        float fga;
        vector fgc;
-       if(bg > 0)
-       {
-               R_BeginPolygon("", 0);
-               R_PolygonVertex('1 0 0' * (teamradar_origin2d_x - teamradar_size2d_x * 0.5 + teamradar_extraclip_mins_x) + '0 1 0' * (teamradar_origin2d_y - teamradar_size2d_y * 0.5 + teamradar_extraclip_mins_y), '0 0 0', '0 0 0', bg);
-               R_PolygonVertex('1 0 0' * (teamradar_origin2d_x + teamradar_size2d_x * 0.5 + teamradar_extraclip_maxs_x) + '0 1 0' * (teamradar_origin2d_y - teamradar_size2d_y * 0.5 + teamradar_extraclip_mins_y), '0 0 0', '0 0 0', bg);
-               R_PolygonVertex('1 0 0' * (teamradar_origin2d_x + teamradar_size2d_x * 0.5 + teamradar_extraclip_maxs_x) + '0 1 0' * (teamradar_origin2d_y + teamradar_size2d_y * 0.5 + teamradar_extraclip_maxs_y), '0 0 0', '0 0 0', bg);
-               R_PolygonVertex('1 0 0' * (teamradar_origin2d_x - teamradar_size2d_x * 0.5 + teamradar_extraclip_mins_x) + '0 1 0' * (teamradar_origin2d_y + teamradar_size2d_y * 0.5 + teamradar_extraclip_maxs_y), '0 0 0', '0 0 0', bg);
-               R_EndPolygon();
-       }
 
        if(fg > 0 && minimapname != "")
        {
@@ -115,17 +106,17 @@ void(vector coord3d, vector pangles, vector rgb) draw_teamradar_player =
                rgb2 = '1 1 1';
 
        R_BeginPolygon("", 0);
-       R_PolygonVertex(coord+v_forward*3, '0 0 0', rgb2, sbar_alpha_fg);
-       R_PolygonVertex(coord+v_right*4-v_forward*2.5, '0 1 0', rgb2, sbar_alpha_fg);
-       R_PolygonVertex(coord-v_forward*2, '1 0 0', rgb2, sbar_alpha_fg);
-       R_PolygonVertex(coord-v_right*4-v_forward*2.5, '1 1 0', rgb2, sbar_alpha_fg);
+       R_PolygonVertex(coord+v_forward*3, '0 0 0', rgb2, hud_fg_alpha);
+       R_PolygonVertex(coord+v_right*4-v_forward*2.5, '0 1 0', rgb2, hud_fg_alpha);
+       R_PolygonVertex(coord-v_forward*2, '1 0 0', rgb2, hud_fg_alpha);
+       R_PolygonVertex(coord-v_right*4-v_forward*2.5, '1 1 0', rgb2, hud_fg_alpha);
        R_EndPolygon();
 
        R_BeginPolygon("", 0);
-       R_PolygonVertex(coord+v_forward*2, '0 0 0', rgb, sbar_alpha_fg);
-       R_PolygonVertex(coord+v_right*3-v_forward*2, '0 1 0', rgb, sbar_alpha_fg);
-       R_PolygonVertex(coord-v_forward, '1 0 0', rgb, sbar_alpha_fg);
-       R_PolygonVertex(coord-v_right*3-v_forward*2, '1 1 0', rgb, sbar_alpha_fg);
+       R_PolygonVertex(coord+v_forward*2, '0 0 0', rgb, hud_fg_alpha);
+       R_PolygonVertex(coord+v_right*3-v_forward*2, '0 1 0', rgb, hud_fg_alpha);
+       R_PolygonVertex(coord-v_forward, '1 0 0', rgb, hud_fg_alpha);
+       R_PolygonVertex(coord-v_right*3-v_forward*2, '1 1 0', rgb, hud_fg_alpha);
        R_EndPolygon();
 };
 
@@ -170,210 +161,43 @@ void draw_teamradar_link(vector start, vector end, float colors)
        c1 = colormapPaletteColor((colors & 0xF0) / 0x10, FALSE);
 
        R_BeginPolygon("", 0);
-       R_PolygonVertex(start - norm, '0 0 0', c0, sbar_alpha_fg);
-       R_PolygonVertex(start + norm, '0 1 0', c0, sbar_alpha_fg);
-       R_PolygonVertex(end + norm, '1 1 0', c1, sbar_alpha_fg);
-       R_PolygonVertex(end - norm, '1 0 0', c1, sbar_alpha_fg);
+       R_PolygonVertex(start - norm, '0 0 0', c0, hud_fg_alpha);
+       R_PolygonVertex(start + norm, '0 1 0', c0, hud_fg_alpha);
+       R_PolygonVertex(end + norm, '1 1 0', c1, hud_fg_alpha);
+       R_PolygonVertex(end - norm, '1 0 0', c1, hud_fg_alpha);
        R_EndPolygon();
 }
 
-float cl_teamradar_scale;
-float cl_teamradar_background_alpha;
-float cl_teamradar_foreground_alpha;
-float cl_teamradar_rotation;
-vector cl_teamradar_size;
-vector cl_teamradar_position;
-float cl_teamradar_zoommode;
+float hud_radar_scale;
+float hud_radar_background_alpha;
+float hud_radar_foreground_alpha;
+float hud_radar_rotation;
+vector hud_radar_size;
+vector hud_radar_position;
+float hud_radar_zoommode;
 
 void teamradar_loadcvars()
 {
        v_flipped = cvar("v_flipped");
-       if(ons_showmap)
-       {
-               cl_teamradar_scale = 42; // dummy, not used (see zoommode)
-               cl_teamradar_background_alpha = 1 * (1 - cvar("_menu_alpha"));
-               cl_teamradar_foreground_alpha = 1 * (1 - cvar("_menu_alpha"));
-               cl_teamradar_rotation = cvar("cl_teamradar_rotation");
-               if(!cl_teamradar_rotation)
-                       cl_teamradar_rotation = 4;
-               cl_teamradar_size = '256 256 0'; // TODO make somewhat variable?
-               cl_teamradar_position = '0.5 0.5 0';
-               cl_teamradar_zoommode = 3;
-               cl_teamradar_nohudhack = 0;
-       }
-       else
-       {
-               cl_teamradar_scale = cvar("cl_teamradar_scale");
-               cl_teamradar_background_alpha = cvar("cl_teamradar_background_alpha") * sbar_alpha_fg;
-               cl_teamradar_foreground_alpha = cvar("cl_teamradar_foreground_alpha") * sbar_alpha_fg;
-               cl_teamradar_rotation = cvar("cl_teamradar_rotation");
-               cl_teamradar_size = stov(cvar_string("cl_teamradar_size"));
-               cl_teamradar_position = stov(cvar_string("cl_teamradar_position"));
-               cl_teamradar_zoommode = cvar("cl_teamradar_zoommode");
-
-               // others default to 0
-               // match this to defaultXonotic.cfg!
-               if(!cl_teamradar_scale) cl_teamradar_scale = 4096;
-               if(!cl_teamradar_background_alpha) cl_teamradar_background_alpha = 0.4 * sbar_alpha_fg;
-               if(!cl_teamradar_foreground_alpha) cl_teamradar_foreground_alpha = 0.8 * sbar_alpha_fg;
-               if(!cl_teamradar_size_x) cl_teamradar_size_x = 128;
-               if(!cl_teamradar_size_y) cl_teamradar_size_y = cl_teamradar_size_x;
-
-               cl_teamradar_size_z = 0;
-               cl_teamradar_nohudhack = cl_teamradar_position_z;
-               cl_teamradar_position_z = 0;
-       }
+       hud_radar_scale = cvar("hud_radar_scale");
+       hud_radar_background_alpha = cvar("hud_radar_background_alpha") * hud_fg_alpha;
+       hud_radar_foreground_alpha = cvar("hud_radar_foreground_alpha") * hud_fg_alpha;
+       hud_radar_rotation = cvar("hud_radar_rotation");
+       hud_radar_zoommode = cvar("hud_radar_zoommode");
+
+       // others default to 0
+       // match this to defaultXonotic.cfg!
+       if(!hud_radar_scale) hud_radar_scale = 4096;
+       if(!hud_radar_background_alpha) hud_radar_background_alpha = 0.4 * hud_fg_alpha;
+       if(!hud_radar_foreground_alpha) hud_radar_foreground_alpha = 0.8 * hud_fg_alpha;
+       if(!hud_radar_size_x) hud_radar_size_x = 128;
+       if(!hud_radar_size_y) hud_radar_size_y = hud_radar_size_x;
+
+       hud_radar_size_z = 0;
+       hud_radar_nohudhack = hud_radar_position_z;
+       hud_radar_position_z = 0;
 }
 
-void() teamradar_view =
-{
-       local float color1, color2; // color already declared as a global in sbar.qc
-       local vector rgb;
-       local entity tm;
-       float scale2d, normalsize, bigsize;
-       float f;
-
-       if(minimapname == "" && !ons_showmap)
-               return;
-
-       teamradar_loadcvars();
-
-       switch(cl_teamradar_zoommode)
-       {
-               default:
-               case 0:
-                       f = current_zoomfraction;
-                       break;
-               case 1:
-                       f = 1 - current_zoomfraction;
-                       break;
-               case 2:
-                       f = 0;
-                       break;
-               case 3:
-                       f = 1;
-                       break;
-       }
-
-       switch(cl_teamradar_rotation)
-       {
-               case 0:
-                       teamradar_angle = view_angles_y - 90;
-                       break;
-               default:
-                       teamradar_angle = 90 * cl_teamradar_rotation;
-                       break;
-       }
-
-       scale2d = vlen_maxnorm2d(mi_picmax - mi_picmin);
-       teamradar_size2d = cl_teamradar_size;
-
-       teamradar_origin2d =
-                 '1 0 0' * (0.5 * teamradar_size2d_x + cl_teamradar_position_x * (vid_conwidth - teamradar_size2d_x))
-               + '0 1 0' * (0.5 * teamradar_size2d_y + cl_teamradar_position_y * (vid_conheight - teamradar_size2d_y));
-       
-       teamradar_extraclip_mins = teamradar_extraclip_maxs = '0 0 0';
-       if(cl_teamradar_position == '1 0 0')
-       {
-               if(cl_teamradar_nohudhack < 2)
-                       teamradar_origin2d_y += 25;
-               if(cl_teamradar_nohudhack < 1)
-                       teamradar_extraclip_mins_y -= 25;
-       }
-       else if(cl_teamradar_position == '0 1 0' || cl_teamradar_position == '1 1 0')
-       {
-               if(cl_teamradar_nohudhack < 2)
-                       teamradar_origin2d_y -= 50;
-               //if(cl_teamradar_nohudhack < 1)
-                       //teamradar_extraclip_size_y += 50; // don't, the HUD looks nice
-       }
-
-       // pixels per world qu to match the teamradar_size2d_x range in the longest dimension
-       if(cl_teamradar_rotation == 0)
-       {
-               // max-min distance must fit the radar in any rotation
-               bigsize = vlen_minnorm2d(teamradar_size2d) * scale2d / (1.05 * vlen2d(mi_max - mi_min));
-       }
-       else
-       {
-               vector c0, c1, c2, c3, span;
-               c0 = rotate(mi_min, teamradar_angle * DEG2RAD);
-               c1 = rotate(mi_max, teamradar_angle * DEG2RAD);
-               c2 = rotate('1 0 0' * mi_min_x + '0 1 0' * mi_max_y, teamradar_angle * DEG2RAD);
-               c3 = rotate('1 0 0' * mi_max_x + '0 1 0' * mi_min_y, teamradar_angle * DEG2RAD);
-               span = '0 0 0';
-               span_x = max4(c0_x, c1_x, c2_x, c3_x) - min4(c0_x, c1_x, c2_x, c3_x);
-               span_y = max4(c0_y, c1_y, c2_y, c3_y) - min4(c0_y, c1_y, c2_y, c3_y);
-
-               // max-min distance must fit the radar in x=x, y=y
-               bigsize = min(
-                       teamradar_size2d_x * scale2d / (1.05 * span_x),
-                       teamradar_size2d_y * scale2d / (1.05 * span_y)
-               );
-       }
-
-       normalsize = vlen_maxnorm2d(teamradar_size2d) * scale2d / cl_teamradar_scale;
-       if(bigsize > normalsize)
-               normalsize = bigsize;
-
-       teamradar_size =
-                 f * bigsize
-               + (1 - f) * normalsize;
-       teamradar_origin3d_in_texcoord = teamradar_3dcoord_to_texcoord(
-                 f * (mi_min + mi_max) * 0.5
-               + (1 - f) * view_origin);
-
-       color1 = GetPlayerColor(player_localentnum-1);
-       rgb = GetTeamRGB(color1);
-
-       drawsetcliparea(
-               teamradar_origin2d_x - teamradar_size2d_x * 0.5 + teamradar_extraclip_mins_x,
-               teamradar_origin2d_y - teamradar_size2d_y * 0.5 + teamradar_extraclip_mins_y,
-               teamradar_size2d_x + teamradar_extraclip_maxs_x - teamradar_extraclip_mins_x,
-               teamradar_size2d_y + teamradar_extraclip_maxs_y - teamradar_extraclip_mins_y
-       );
-
-       draw_teamradar_background(cl_teamradar_background_alpha, cl_teamradar_foreground_alpha);
-
-       if(ons_showmap)
-       {
-               drawresetcliparea();
-
-               vector frame_origin, frame_size;
-               frame_origin = frame_size = '0 0 0';
-
-               frame_origin_x = teamradar_origin2d_x - teamradar_size2d_x * 0.55859375; // matches the picture
-               frame_origin_y = teamradar_origin2d_y - teamradar_size2d_y * 0.55859375; // matches the picture
-               frame_size_x = teamradar_size2d_x * 1.1171875; // matches the picture
-               frame_size_y = teamradar_size2d_y * 1.1171875; // matches the picture
-               drawpic(frame_origin, "gfx/ons-frame.tga", frame_size, '1 1 1', sbar_alpha_fg, 0);
-               drawpic(frame_origin, "gfx/ons-frame-team.tga", frame_size, rgb, sbar_alpha_fg, 0);
-
-               drawsetcliparea(
-                       teamradar_origin2d_x - teamradar_size2d_x * 0.5,
-                       teamradar_origin2d_y - teamradar_size2d_y * 0.5,
-                       teamradar_size2d_x,
-                       teamradar_size2d_y
-               );
-       }
-
-       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, tm.alpha * sbar_alpha_fg);
-       for(tm = world; (tm = find(tm, classname, "entcs_receiver")); )
-       {
-               color2 = GetPlayerColor(tm.sv_entnum);
-               //if(color == COLOR_SPECTATOR || color == color2)
-                       draw_teamradar_player(tm.origin, tm.angles, GetTeamRGB(color2));
-       }
-       draw_teamradar_player(view_origin, view_angles, '1 1 1');
-
-       drawresetcliparea();
-};
-
-
-
 // radar links
 
 void Ent_RadarLink()
index d7de6f1a106eba40ab6c7adebf7769c7f3700f4f..2a93fe163a809143b96d4e076c54396540a884af 100644 (file)
@@ -1,5 +1,3 @@
-void teamradar_view();
-
 #define MAX_TEAMRADAR_TIMES 32
 
 // to make entities have dots on the team radar
index 6c7dc9480ae4d5b4de633c5a5555e0388c2ddff3..db0fdb83fd81a3dd46293211d9eca60df94157ad 100644 (file)
@@ -166,7 +166,7 @@ void Draw_WaypointSprite()
        dist = vlen(self.origin - view_origin);
        
        float a;
-       a = self.alpha * sbar_alpha_fg;
+       a = self.alpha * hud_fg_alpha;
 
        if(self.maxdistance > waypointsprite_normdistance)
                a *= pow(bound(0, (self.maxdistance - dist) / (self.maxdistance - waypointsprite_normdistance), 1), waypointsprite_distancealphaexponent);
index 2400826042a693e35a7aef016ca598d0ef6e4f65..3e2cf69057766cefaa0199061feb050a96dcb148 100644 (file)
@@ -57,6 +57,7 @@ const float TE_CSQC_VOTE = 108;
 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 RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder
 const float RACE_NET_CHECKPOINT_CLEAR = 1;
@@ -73,6 +74,9 @@ const float RACE_NET_SERVER_RANKINGS = 11;
 const float RACE_NET_SERVER_STATUS = 12;
 const float RANKINGS_CNT = 15;
 
+const float CSQC_KILLNOTIFY = 0;
+const float CSQC_CENTERPRINT = 1;
+
 const float ENT_CLIENT = 0;
 const float ENT_CLIENT_DEAD = 1;
 const float ENT_CLIENT_ENTCS = 2;
@@ -294,6 +298,9 @@ const float HUD_NORMAL = 0;
 const float HUD_SPIDERBOT = 10;
 const float HUD_WAKIZASHI = 11;
 const float HUD_RAPTOR    = 12;
+const vector eX = '1 0 0';
+const vector eY = '0 1 0';
+const vector eZ = '0 0 1';
 
 const float STAT_VEHICLESTAT_HEALTH  = 60;
 const float STAT_VEHICLESTAT_SHIELD  = 61;
@@ -478,6 +485,10 @@ float DEATH_WAKIGUN    = 10040;
 float DEATH_WAKIROCKET = 10041;
 float DEATH_WAKIBLOWUP = 10042;
 
+float DEATH_GENERIC = 10050;
+
+float DEATH_WEAPON = 10100;
+
 float DEATH_CUSTOM = 10300;
 
 
@@ -513,6 +524,38 @@ float WATERLEVEL_SUBMERGED = 3;
 
 float MAX_SHOT_DISTANCE = 32768;
 
+// CSQC centerprint/notify message types
+float MSG_SUICIDE = 0;
+float MSG_KILL = 1;
+float MSG_SPREE = 2;
+float MSG_KILL_ACTION = 3;
+float MSG_KILL_ACTION_SPREE = 4;
+float MSG_INFO = 5;
+
+float KILL_TEAM_RED = 10301;
+float KILL_TEAM_BLUE = 10302;
+float KILL_TEAM_SPREE = 10303;
+float KILL_FIRST_BLOOD = 10304;
+float KILL_FIRST_VICTIM = 10305;
+float KILL_TYPEFRAG = 10306;
+float KILL_TYPEFRAGGED = 10307;
+float KILL_FRAG = 10308;
+float KILL_FRAGGED = 10309;
+float KILL_SPREE = 10310;
+float KILL_END_SPREE = 10311;
+float KILL_SPREE_3 = 10312;
+float KILL_SPREE_5 = 10313;
+float KILL_SPREE_10 = 10314;
+float KILL_SPREE_15 = 10315;
+float KILL_SPREE_20 = 10316;
+float KILL_SPREE_25 = 10317;
+float KILL_SPREE_30 = 10318;
+
+float INFO_GOTFLAG = 10319;
+float INFO_PICKUPFLAG = 10320;
+float INFO_LOSTFLAG = 10321;
+float INFO_RETURNFLAG = 10322;
+
 // weapon requests
 float WR_SETUP         = 1; // (SVQC) setup weapon data
 float WR_THINK         = 2; // (SVQC) logic to run every frame
@@ -520,8 +563,27 @@ float WR_CHECKAMMO1        = 3; // (SVQC) checks ammo for weapon
 float WR_CHECKAMMO2    = 4; // (SVQC) checks ammo for weapon
 float WR_AIM           = 5; // (SVQC) runs bot aiming code for this weapon
 float WR_PRECACHE      = 6; // (CSQC and SVQC) precaches models/sounds used by this weapon
-float WR_SUICIDEMESSAGE = 7; // (SVQC) sets w_deathtypestring or leaves it alone (and may inspect w_deathtype for details)
-float WR_KILLMESSAGE    = 8; // (SVQC) sets w_deathtypestring or leaves it alone
+float WR_SUICIDEMESSAGE = 7; // (CSQC) sets w_deathtypestring or leaves it alone (and may inspect w_deathtype for details)
+float WR_KILLMESSAGE    = 8; // (CSQC) sets w_deathtypestring or leaves it alone
 float WR_RELOAD         = 9; // (SVQC) does not need to do anything
 float WR_RESETPLAYER    = 10; // (SVQC) does not need to do anything
 float WR_IMPACTEFFECT  = 11; // (CSQC) impact effect
+
+
+float HUD_PANEL_WEAPONICONS    = 0;
+float HUD_PANEL_INVENTORY      = 1;
+float HUD_PANEL_POWERUPS       = 2;
+float HUD_PANEL_HEALTHARMOR    = 3;
+float HUD_PANEL_NOTIFY         = 4;
+float HUD_PANEL_TIMER          = 5;
+float HUD_PANEL_RADAR          = 6;
+float HUD_PANEL_SCORE          = 7;
+float HUD_PANEL_RACETIMER      = 8;
+float HUD_PANEL_VOTE           = 9;
+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_MENU_ENABLE          = 0;
index e9ff4452a8f22eddc788e18c8b65a13eef0ca593..0f1237d859478a5021ad9603008a39a2fdfe176f 100644 (file)
@@ -43,29 +43,29 @@ void register_weapons_done()
        dummy_weapon_info.model2 = "";
 
        float i;
-       weaponpriority_hudselector_0 = "";
+       weaponorder_byid = "";
        for(i = 24; i >= 1; --i)
                if(weapon_info[i-1])
-                       weaponpriority_hudselector_0 = strcat(weaponpriority_hudselector_0, " ", ftos(i));
+                       weaponorder_byid = strcat(weaponorder_byid, " ", ftos(i));
 
        float imp;
-       weaponpriority_hudselector_1 = "";
+       weaponorder_byimpulse = "";
        for(i = 1; i <= 24; ++i)
        {
                wi = weapon_info[i-1];
                if(wi && wi.impulse == 0)
-                       weaponpriority_hudselector_1 = strcat(weaponpriority_hudselector_1, " ", ftos(i));
+                       weaponorder_byimpulse = strcat(weaponorder_byimpulse, " ", ftos(i));
        }
        for(imp = 9; imp > 0; --imp)
                for(i = 1; i <= 24; ++i)
                {
                        wi = weapon_info[i-1];
                        if(wi && wi.impulse == imp)
-                               weaponpriority_hudselector_1 = strcat(weaponpriority_hudselector_1, " ", ftos(i));
+                               weaponorder_byimpulse = strcat(weaponorder_byimpulse, " ", ftos(i));
                }
 
-       weaponpriority_hudselector_0 = strzone(substring(weaponpriority_hudselector_0, 1, strlen(weaponpriority_hudselector_0) - 1));
-       weaponpriority_hudselector_1 = strzone(substring(weaponpriority_hudselector_1, 1, strlen(weaponpriority_hudselector_1) - 1));
+       weaponorder_byid = strzone(substring(weaponorder_byid, 1, strlen(weaponorder_byid) - 1));
+       weaponorder_byimpulse = strzone(substring(weaponorder_byimpulse, 1, strlen(weaponorder_byimpulse) - 1));
 }
 entity get_weaponinfo(float id)
 {
index 531a3115baaa8ae9b83a4bff870f90207f3ec233..a410474eb559d98500fc3ad9e12f43743f9ecd95 100644 (file)
@@ -50,8 +50,8 @@ float IT_PICKUPMASK           = 51; // IT_FUEL_REGEN | IT_JETPACK | IT_UNLIMITED
 float  IT_UNLIMITED_AMMO       = 3; // IT_UNLIMITED_SUPERWEAPONS | IT_UNLIMITED_WEAPON_AMMO;
 
 // variables:
-string weaponpriority_hudselector_0;
-string weaponpriority_hudselector_1;
+string weaponorder_byid;
+string weaponorder_byimpulse;
 
 // functions:
 entity get_weaponinfo(float id);
index 9875529d3fe68c92084d6595e306dfe65f91ae06..08eaaeee74ab4dec57ccf070cba0d826fd900c1b 100644 (file)
@@ -1948,3 +1948,25 @@ 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 "";
+       }
+}
index 23126b6331df1557b15461dab2ab36947caeeb1c..2a57be012575715b6489ca3a1fca565859d6fafd 100644 (file)
@@ -210,3 +210,5 @@ float get_model_parameters_weight;
 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)
index d6fb114c2c4a9c113ccaaa5cd7732a093679c03c..99ccc789681552dd1f5c96cee4244921c39d88b1 100644 (file)
@@ -27,44 +27,44 @@ void setterDummy(entity, float);
 #endif
 
 #ifdef IMPLEMENTATION
-void configureAnimationAnimation(entity me, entity obj, void(entity, float) objSetter, float animStartTime, float animDuration, float animStartValue, float animEndValue)
+void Animation_configureAnimation(entity me, entity obj, void(entity, float) objSetter, float animStartTime, float animDuration, float animStartValue, float animEndValue)
 {
        me.setObjectSetter(me, obj, objSetter);
        me.setTimeStartDuration(me, animStartTime, animDuration);
        me.setValueStartEnd(me, animStartValue, animEndValue);
 }
 
-void setTimeStartEndAnimation(entity me, float s, float e)
+void Animation_setTimeStartEnd(entity me, float s, float e)
 {
        me.startTime = s;
        me.duration = e - s;
 }
 
-void setTimeStartDurationAnimation(entity me, float s, float d)
+void Animation_setTimeStartDuration(entity me, float s, float d)
 {
        me.startTime = s;
        me.duration = d;
 }
 
-void setValueStartEndAnimation(entity me, float s, float e)
+void Animation_setValueStartEnd(entity me, float s, float e)
 {
        me.startValue = s;
        me.delta = e - s;
 }
 
-void setValueStartDeltaAnimation(entity me, float s, float d)
+void Animation_setValueStartDelta(entity me, float s, float d)
 {
        me.startValue = s;
        me.delta = d;
 }
 
-void setObjectSetterAnimation(entity me, entity o, void(entity, float) s)
+void Animation_setObjectSetter(entity me, entity o, void(entity, float) s)
 {
        me.object = o;
        me.setter = s;
 }
 
-void tickAnimation(entity me, float tickTime)
+void Animation_tick(entity me, float tickTime)
 {
        if (me.isStopped(me) || me.isFinished(me) || (tickTime < me.startTime))
                return;
@@ -77,32 +77,32 @@ void tickAnimation(entity me, float tickTime)
        me.setter(me.object, me.value);
 }
 
-float calcValueAnimation(entity me, float tickTime, float animDuration, float animStartValue, float animDelta)
+float Animation_calcValue(entity me, float tickTime, float animDuration, float animStartValue, float animDelta)
 {
        return animStartValue;
 }
 
-float isStoppedAnimation(entity me)
+float Animation_isStopped(entity me)
 {
        return me.stopped;
 }
 
-void stopAnimAnimation(entity me)
+void Animation_stopAnim(entity me)
 {
        me.stopped = TRUE;
 }
 
-void resumeAnimAnimation(entity me)
+void Animation_resumeAnim(entity me)
 {
        me.stopped = FALSE;
 }
 
-float isFinishedAnimation(entity me)
+float Animation_isFinished(entity me)
 {
        return me.finished;
 }
 
-void finishAnimAnimation(entity me)
+void Animation_finishAnim(entity me)
 {
        me.value = me.delta + me.startValue;
        me.finished = TRUE;
index 41a26d5e0dace443b32be76b912810c04d4e9a38..fc345e44588a1fba5f8c77714524b310101ae28b 100644 (file)
@@ -19,7 +19,7 @@ ENDCLASS(AnimHost)
 #endif
 
 #ifdef IMPLEMENTATION
-void addAnimAnimHost(entity me, entity other)
+void AnimHost_addAnim(entity me, entity other)
 {
        if(other.parent)
                error("Can't add already added anim!");
@@ -43,7 +43,7 @@ void addAnimAnimHost(entity me, entity other)
        me.lastChild = other;
 }
 
-void removeAnimAnimHost(entity me, entity other)
+void AnimHost_removeAnim(entity me, entity other)
 {
        if(other.parent != me)
                error("Can't remove from wrong AnimHost!");
@@ -67,7 +67,7 @@ void removeAnimAnimHost(entity me, entity other)
                me.lastChild = p;
 }
 
-void removeAllAnimAnimHost(entity me)
+void AnimHost_removeAllAnim(entity me)
 {
        entity e, tmp;
        for(e = me.firstChild; e; e = e.nextSibling)
@@ -78,7 +78,7 @@ void removeAllAnimAnimHost(entity me)
        }
 }
 
-void removeObjAnimAnimHost(entity me, entity obj)
+void AnimHost_removeObjAnim(entity me, entity obj)
 {
        entity e, tmp;
        for(e = me.firstChild; e; e = e.nextSibling)
@@ -92,7 +92,7 @@ void removeObjAnimAnimHost(entity me, entity obj)
        }
 }
 
-void stopAllAnimAnimHost(entity me)
+void AnimHost_stopAllAnim(entity me)
 {
        entity e;
        for(e = me.firstChild; e; e = e.nextSibling)
@@ -101,7 +101,7 @@ void stopAllAnimAnimHost(entity me)
        }
 }
 
-void stopObjAnimAnimHost(entity me, entity obj)
+void AnimHost_stopObjAnim(entity me, entity obj)
 {
        entity e;
        for(e = me.firstChild; e; e = e.nextSibling)
@@ -113,7 +113,7 @@ void stopObjAnimAnimHost(entity me, entity obj)
        }
 }
 
-void resumeAllAnimAnimHost(entity me)
+void AnimHost_resumeAllAnim(entity me)
 {
        entity e;
        for(e = me.firstChild; e; e = e.nextSibling)
@@ -122,7 +122,7 @@ void resumeAllAnimAnimHost(entity me)
        }
 }
 
-void resumeObjAnimAnimHost(entity me, entity obj)
+void AnimHost_resumeObjAnim(entity me, entity obj)
 {
        entity e;
        for(e = me.firstChild; e; e = e.nextSibling)
@@ -134,7 +134,7 @@ void resumeObjAnimAnimHost(entity me, entity obj)
        }
 }
 
-void finishAllAnimAnimHost(entity me)
+void AnimHost_finishAllAnim(entity me)
 {
        entity e, tmp;
        for(e = me.firstChild; e; e = e.nextSibling)
@@ -146,7 +146,7 @@ void finishAllAnimAnimHost(entity me)
        }
 }
 
-void finishObjAnimAnimHost(entity me, entity obj)
+void AnimHost_finishObjAnim(entity me, entity obj)
 {
        entity e, tmp;
        for(e = me.firstChild; e; e = e.nextSibling)
@@ -161,7 +161,7 @@ void finishObjAnimAnimHost(entity me, entity obj)
        }
 }
 
-void tickAllAnimHost(entity me)
+void AnimHost_tickAll(entity me)
 {
        entity e, tmp;
        for(e = me.firstChild; e; e = e.nextSibling)
index f14a4be0a602625b3d1dae98e3579f5bc553cc1f..94ea9cf0872da839e836be94e28cda460f029bab 100644 (file)
@@ -30,12 +30,12 @@ entity makeEasing(entity obj, void(entity, float) objSetter, float(float, float,
        return me;
 }
 
-float calcValueEasing(entity me, float tickTime, float animDuration, float animStart, float animDelta)
+float Easing_calcValue(entity me, float tickTime, float animDuration, float animStart, float animDelta)
 {
        return me.math(tickTime, animDuration, animStart, animDelta);
 }
 
-void setMathEasing(entity me, float(float, float, float, float) func)
+void Easing_setMath(entity me, float(float, float, float, float) func)
 {
        me.math = func;
 }
index 95fbf63ccefe5b15d5acc6a019db25a868d2fedf..de5d54ae1002ad79486867e1a8f4d83da5a152f0 100644 (file)
@@ -6,7 +6,7 @@ CLASS(Keyframe) EXTENDS(Animation)
        ATTRIB(Keyframe, currentChild, entity, NULL)
        ATTRIB(Keyframe, firstChild, entity, NULL)
        ATTRIB(Keyframe, lastChild, entity, NULL)
-ENDCLASS(Animation)
+ENDCLASS(Keyframe)
 entity makeHostedKeyframe(entity, void(entity, float), float, float, float);
 entity makeKeyframe(entity, void(entity, float), float, float, float);
 float getNewChildStart(entity);
@@ -31,7 +31,7 @@ entity makeKeyframe(entity obj, void(entity, float) objSetter, float animDuratio
        return me;
 }
 
-entity addEasingKeyframe(entity me, float animDurationTime, float animEnd, float(float, float, float, float) func)
+entity Keyframe_addEasing(entity me, float animDurationTime, float animEnd, float(float, float, float, float) func)
 {
        entity other;
        other = makeEasing(me.object, me.setter, func, getNewChildStart(me), getNewChildDuration(me, animDurationTime), getNewChildValue(me), animEnd);
@@ -65,7 +65,7 @@ float getNewChildValue(entity me)
                return me.startValue;
 }
 
-void addAnimKeyframe(entity me, entity other)
+void Keyframe_addAnim(entity me, entity other)
 {
        if(other.parent)
                error("Can't add already added anim!");
@@ -92,7 +92,7 @@ void addAnimKeyframe(entity me, entity other)
        me.lastChild = other;
 }
 
-float calcValueKeyframe(entity me, float tickTime, float animDuration, float animStartValue, float animDelta)
+float Keyframe_calcValue(entity me, float tickTime, float animDuration, float animStartValue, float animDelta)
 {
        if (me.currentChild)
                if (me.currentChild.isFinished(me.currentChild))
diff --git a/qcsrc/menu/auto-super.pl b/qcsrc/menu/auto-super.pl
new file mode 100644 (file)
index 0000000..00926d0
--- /dev/null
@@ -0,0 +1,101 @@
+my %classoffile = ();
+my %classes = ();
+my %baseclass = ();
+my %methods = ();
+my %attrs = ();
+my %methodnames = ();
+my %old2new = ();
+
+print STDERR "Scanning...\n";
+for my $f(@ARGV)
+{
+       open my $fh, '<', $f;
+       while(<$fh>)
+       {
+               if(/^CLASS\(([^)]*)\)(?:\s*EXTENDS\(([^)]*)\))?/)
+               {
+                       $classes{$1} = defined($2) ? $2 : "Object";
+                       $classoffile{$f} = $1;
+               }
+               if(/^\s*METHOD\(([^),]*),\s*([^),]*)/)
+               {
+                       $methods{$1}{$2} = $1;
+                       $methodnames{"$1"."_"."$2"} = $f;
+                       $old2new{"$2$1"} = "$1"."_"."$2";
+               }
+               if(/^\s*ATTRIB(?:ARRAY)?\(([^),]*),\s*([^),]*)/)
+               {
+                       $attrs{$1}{$2} = $1;
+               }
+       }
+       close $fh;
+}
+
+# propagate down methods etc.
+print STDERR "Propagating...\n";
+for my $class(keys %classes)
+{
+       print STDERR "$class";
+       my $base = $class;
+       for(;;)
+       {
+               $base = $classes{$base};
+               last if not defined $base;
+               print STDERR " -> $base";
+               while(my ($method, $definingclass) = each %{$methods{$base}})
+               {
+                       $methods{$class}{$method} = $definingclass
+                               if not defined $methods{$class}{$method};
+               }
+               while(my ($attr, $definingclass) = each %{$attrs{$base}})
+               {
+                       $attrs{$class}{$attr} = $definingclass
+                               if not defined $attrs{$class}{$attr};
+               }
+       }
+       print STDERR "\n";
+}
+
+# change all calls to base method to super, complain about skipping
+print STDERR "Fixing...\n";
+for my $f(@ARGV)
+{
+       open my $fh, '<', $f;
+       my $s = do { undef local $/; <$fh>; };
+       my $s0 = $s;
+       close $fh;
+
+       my $class = $classoffile{$f};
+       my $base = $classes{$class};
+       next if not defined $base;
+
+       for(keys %old2new)
+       {
+               $s =~ s/\b$_\b/$old2new{$_}/g;
+       }
+
+       my @methods_super = map { [ $methods{$base}{$_} . "_" . $_, "SUPER($class).$_" ]; } keys %{$methods{$base}};
+       for(@methods_super)
+       {
+               my ($search, $replace) = @$_;
+               my $n = ($s =~ s/\b$search\b/$replace/g);
+               print STDERR "[$f] $search -> $replace... $n replacements\n"
+                       if $n;
+       }
+
+       for(grep { $methodnames{$_} ne $f } keys %methodnames)
+       {
+               if($s =~ /\b$_\b/)
+               {
+                       print STDERR "[$f] calls non-super external method directly: $_\n";
+               }
+       }
+
+       if($s ne $s0)
+       {
+               print STDERR "Rewriting $f...\n";
+               open my $fh, '>', $f;
+               print $fh $s;
+               close $fh;
+       }
+}
index 1d26deec5907e78639e1286e536fdf4a6cd0f26d..719425ca85dbf252f223b613885d1e1e7f59cc8f 100644 (file)
 #include "xonotic/credits.c"
 #include "xonotic/dialog_multiplayer_playersetup_weapons.c"
 #include "xonotic/weaponslist.c"
-#include "xonotic/dialog_multiplayer_playersetup_radar.c"
+#include "xonotic/dialog_multiplayer_playersetup_waypoint.c"
 #include "xonotic/dialog_multiplayer_demo.c"
 #include "xonotic/demolist.c"
 #include "xonotic/colorpicker.c"
 #include "xonotic/cvarlist.c"
 #include "xonotic/dialog_settings_misc_cvars.c"
+#include "xonotic/dialog_hudsetup_exit.c"
+#include "xonotic/dialog_hudpanel_notification.c"
+#include "xonotic/dialog_hudpanel_inventory.c"
+#include "xonotic/dialog_hudpanel_healtharmor.c"
+#include "xonotic/dialog_hudpanel_powerups.c"
+#include "xonotic/dialog_hudpanel_racetimer.c"
+#include "xonotic/dialog_hudpanel_pressedkeys.c"
+#include "xonotic/dialog_hudpanel_radar.c"
+#include "xonotic/dialog_hudpanel_score.c"
+#include "xonotic/dialog_hudpanel_timer.c"
+#include "xonotic/dialog_hudpanel_vote.c"
+#include "xonotic/dialog_hudpanel_modicons.c"
+#include "xonotic/dialog_hudpanel_chat.c"
+#include "xonotic/dialog_hudpanel_weaponicons.c"
index b504022a5174603e6fa0feb0b30c31f8ffce2ada..9e722cb12a89f1cfe4b2de43f87c0a046dd3f2d7 100644 (file)
@@ -230,22 +230,19 @@ void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector the
 }
 void draw_Text(vector theOrigin, string theText, vector theSize, vector theColor, float theAlpha, float ICanHasKallerz)
 {
-       vector fs;
        if(theSize_x <= 0 || theSize_y <= 0)
                error("Drawing zero size text?\n");
-       if not(cvar("menu_font_size_snapping_fix")) // FIXME remove this, this is to detect old engines
-       {
-               fs = draw_fontscale;
-               draw_fontscale = '1 1 0';
-       }
+
+       /*
+       float wi;
+       wi = draw_TextWidth(theText, ICanHasKallerz, theSize);
+       draw_Fill(theOrigin, '1 0 0' * wi + '0 1 0' * theSize_y, '1 0 0', 0.3);
+       */
+
        if(ICanHasKallerz)
                drawcolorcodedstring(boxToGlobal(theOrigin, draw_shift, draw_scale), theText, globalToBoxSize(boxToGlobalSize(theSize, draw_scale), draw_fontscale), theAlpha * draw_alpha, 0);
        else
                drawstring(boxToGlobal(theOrigin, draw_shift, draw_scale), theText, globalToBoxSize(boxToGlobalSize(theSize, draw_scale), draw_fontscale), theColor, theAlpha * draw_alpha, 0);
-       if not(cvar("menu_font_size_snapping_fix")) // FIXME remove this, this is to detect old engines
-       {
-               draw_fontscale = fs;
-       }
 }
 void draw_CenterText(vector theOrigin, string theText, vector theSize, vector theColor, float theAlpha, float ICanHasKallerz)
 {
@@ -257,20 +254,10 @@ float draw_TextWidth(string theText, float ICanHasKallerz, vector SizeThxBye)
 {
        //return strlen(theText);
        //print("draw_TextWidth \"", theText, "\"\n");
-       vector fs;
        vector v;
        v = '0 0 0';
        //float r;
-       if not(cvar("menu_font_size_snapping_fix")) // FIXME remove this, this is to detect old engines
-       {
-               fs = draw_fontscale;
-               draw_fontscale = '1 1 0';
-       }
-       v_x = stringwidth(theText, ICanHasKallerz, boxToGlobalSize(SizeThxBye, draw_scale)) / draw_fontscale_x;
-       if not(cvar("menu_font_size_snapping_fix")) // FIXME remove this, this is to detect old engines
-       {
-               draw_fontscale = fs;
-       }
+       v_x = stringwidth(theText, ICanHasKallerz, boxToGlobalSize(SizeThxBye, draw_scale));
        v = globalToBoxSize(v, draw_scale);
        return v_x;
 }
index 84c98e0da2db4f2f8fb76e1cc3b5b374214072bc..4a89ab9bae5958726c0254a7f7ea2fc6f7214a49 100644 (file)
@@ -62,6 +62,14 @@ void GameCommand(string theCommand)
                return;
        }
 
+       if(argv(0) == "directpanelhudmenu")
+       {
+               highlightedPanel = stof(argv(1));
+               // switch to a menu item
+               m_goto(strcat("HUD", HUD_Panel_GetName(highlightedPanel)));
+               return;
+       }
+
        if(argv(0) == "skinselect")
        {
                m_goto_skin_selector();
index b249ce9eb713ae20e30fd1507c639a6806719946..497d1cf661699974a640bcf86e28a22b8d840e57 100644 (file)
@@ -26,76 +26,76 @@ ENDCLASS(Item)
 #endif
 
 #ifdef IMPLEMENTATION
-void destroyItem(entity me)
+void Item_destroy(entity me)
 {
        // free memory associated with me
 }
 
-void relinquishFocusItem(entity me)
+void Item_relinquishFocus(entity me)
 {
        if(me.parent)
                if(me.parent.instanceOfContainer)
                        me.parent.setFocus(me.parent, NULL);
 }
 
-void resizeNotifyItem(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void Item_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
        me.origin = absOrigin;
        me.size = absSize;
        // me.tooltip = "The quick brown fox jumped over the lazy sleeping dog's back then sat on a tack. Franz jagt im komplett verwahrlosten Taxi quer durch Bayern.";
 }
 
-void drawItem(entity me)
+void Item_draw(entity me)
 {
 }
 
-void showNotifyItem(entity me)
+void Item_showNotify(entity me)
 {
 }
 
-void hideNotifyItem(entity me)
+void Item_hideNotify(entity me)
 {
 }
 
-float keyDownItem(entity me, float scan, float ascii, float shift)
+float Item_keyDown(entity me, float scan, float ascii, float shift)
 {
        return 0; // unhandled
 }
 
-float keyUpItem(entity me, float scan, float ascii, float shift)
+float Item_keyUp(entity me, float scan, float ascii, float shift)
 {
        return 0; // unhandled
 }
 
-float mouseMoveItem(entity me, vector pos)
+float Item_mouseMove(entity me, vector pos)
 {
        return 0; // unhandled
 }
 
-float mousePressItem(entity me, vector pos)
+float Item_mousePress(entity me, vector pos)
 {
        return 0; // unhandled
 }
 
-float mouseDragItem(entity me, vector pos)
+float Item_mouseDrag(entity me, vector pos)
 {
        return 0; // unhandled
 }
 
-float mouseReleaseItem(entity me, vector pos)
+float Item_mouseRelease(entity me, vector pos)
 {
        return 0; // unhandled
 }
 
-void focusEnterItem(entity me)
+void Item_focusEnter(entity me)
 {
 }
 
-void focusLeaveItem(entity me)
+void Item_focusLeave(entity me)
 {
 }
 
-string toStringItem(entity me)
+string Item_toString(entity me)
 {
        return string_null;
 }
index 1bb458ad1d1d365b4591d5eaeb372583bd12d5e3..0229b53a55b9d6e18a72ba6e97bdd313d92d5193 100644 (file)
@@ -18,7 +18,7 @@ ENDCLASS(BorderImage)
 #endif
 
 #ifdef IMPLEMENTATION
-void resizeNotifyBorderImage(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void BorderImage_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
        me.isNexposeeTitleBar = 0;
        if(me.zoomedOutTitleBar)
@@ -30,12 +30,12 @@ void resizeNotifyBorderImage(entity me, vector relOrigin, vector relSize, vector
        {
                vector scrs;
                scrs = eX * conwidth + eY * conheight;
-               resizeNotifyLabel(me, relOrigin, relSize, boxToGlobal(me.parent.Nexposee_smallOrigin, '0 0 0', scrs), boxToGlobalSize(me.parent.Nexposee_smallSize, scrs));
+               SUPER(BorderImage).resizeNotify(me, relOrigin, relSize, boxToGlobal(me.parent.Nexposee_smallOrigin, '0 0 0', scrs), boxToGlobalSize(me.parent.Nexposee_smallSize, scrs));
                me.realOrigin_y = me.realFontSize_y * me.zoomedOutTitleBarPosition;
                me.realOrigin_Nexposeed = me.realOrigin;
                me.realFontSize_Nexposeed = me.realFontSize;
        }
-       resizeNotifyLabel(me, relOrigin, relSize, absOrigin, absSize);
+       SUPER(BorderImage).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
        me.borderVec = me.borderHeight / absSize_y * (eY + eX * (absSize_y / absSize_x));
        me.realOrigin_y = 0.5 * (me.borderVec_y - me.realFontSize_y);
        if(me.closeButton)
@@ -48,14 +48,14 @@ void resizeNotifyBorderImage(entity me, vector relOrigin, vector relSize, vector
                me.closeButton.colorF = me.color;
        }
 }
-void configureBorderImageBorderImage(entity me, string theTitle, float sz, vector theColor, string path, float theBorderHeight)
+void BorderImage_configureBorderImage(entity me, string theTitle, float sz, vector theColor, string path, float theBorderHeight)
 {
        me.configureLabel(me, theTitle, sz, 0.5);
        me.src = path;
        me.color = theColor;
        me.borderHeight = theBorderHeight;
 }
-void drawBorderImage(entity me)
+void BorderImage_draw(entity me)
 {
        //print(vtos(me.borderVec), "\n");
 
@@ -76,7 +76,7 @@ void drawBorderImage(entity me)
                        draw_fontscale = globalToBoxSize(boxToGlobalSize(df, me.realFontSize), rf);
                }
 
-               drawLabel(me);
+               SUPER(BorderImage).draw(me);
 
                if(me.isNexposeeTitleBar)
                {
index 096c75b805388d5bb81f21d03b8c9b4372ff8ff2..728413135ad1d5f8f9dfb6bd189e041e63aefef5 100644 (file)
@@ -35,20 +35,20 @@ ENDCLASS(Button)
 #endif
 
 #ifdef IMPLEMENTATION
-void resizeNotifyButton(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void Button_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
        if(me.srcMulti)
                me.keepspaceLeft = 0;
        else
                me.keepspaceLeft = min(0.8, absSize_y / absSize_x);
-       resizeNotifyLabel(me, relOrigin, relSize, absOrigin, absSize);
+       SUPER(Button).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
 }
-void configureButtonButton(entity me, string txt, float sz, string gfx)
+void Button_configureButton(entity me, string txt, float sz, string gfx)
 {
-       configureLabelLabel(me, txt, sz, me.srcMulti ? 0.5 : 0);
+       SUPER(Button).configureLabel(me, txt, sz, me.srcMulti ? 0.5 : 0);
        me.src = gfx;
 }
-float keyDownButton(entity me, float key, float ascii, float shift)
+float Button_keyDown(entity me, float key, float ascii, float shift)
 {
        if(key == K_ENTER || key == K_SPACE)
        {
@@ -57,7 +57,7 @@ float keyDownButton(entity me, float key, float ascii, float shift)
        }
        return 0;
 }
-float mouseDragButton(entity me, vector pos)
+float Button_mouseDrag(entity me, vector pos)
 {
        me.pressed = 1;
        if(pos_x < 0) me.pressed = 0;
@@ -66,14 +66,14 @@ float mouseDragButton(entity me, vector pos)
        if(pos_y >= 1) me.pressed = 0;
        return 1;
 }
-float mousePressButton(entity me, vector pos)
+float Button_mousePress(entity me, vector pos)
 {
        me.mouseDrag(me, pos); // verify coordinates
        if(cvar("menu_sounds"))
                localsound("sound/misc/menu2.wav");
        return 1;
 }
-float mouseReleaseButton(entity me, vector pos)
+float Button_mouseRelease(entity me, vector pos)
 {
        me.mouseDrag(me, pos); // verify coordinates
        if(me.pressed)
@@ -84,12 +84,12 @@ float mouseReleaseButton(entity me, vector pos)
        }
        return 1;
 }
-void showNotifyButton(entity me)
+void Button_showNotify(entity me)
 {
        me.focusable = !me.disabled;
 }
 .float playedfocus;
-void drawButton(entity me)
+void Button_draw(entity me)
 {
        vector bOrigin, bSize;
        float save;
@@ -150,7 +150,7 @@ void drawButton(entity me)
 
        draw_alpha = save;
 
-       drawLabel(me);
+       SUPER(Button).draw(me);
 
        if(me.clickTime > 0 && me.clickTime <= frametime)
        {
index 40fa6675bd0df2ba8d1e92b51c8a4233bfa3d38a..5ae92d6122f097bf2d9b4e6060f6377d27229cad 100644 (file)
@@ -14,7 +14,7 @@ ENDCLASS(CheckBox)
 #endif
 
 #ifdef IMPLEMENTATION
-void setCheckedCheckBox(entity me, float val)
+void CheckBox_setChecked(entity me, float val)
 {
        me.checked = val;
 }
@@ -22,16 +22,16 @@ void CheckBox_Click(entity me, entity other)
 {
        me.setChecked(me, !me.checked);
 }
-string toStringCheckBox(entity me)
+string CheckBox_toString(entity me)
 {
-       return strcat(toStringLabel(me), ", ", me.checked ? "checked" : "unchecked");
+       return strcat(SUPER(CheckBox).toString(me), ", ", me.checked ? "checked" : "unchecked");
 }
-void configureCheckBoxCheckBox(entity me, string txt, float sz, string gfx)
+void CheckBox_configureCheckBox(entity me, string txt, float sz, string gfx)
 {
        me.configureButton(me, txt, sz, gfx);
        me.align = 0;
 }
-void drawCheckBox(entity me)
+void CheckBox_draw(entity me)
 {
        float s;
        s = me.pressed;
@@ -42,7 +42,7 @@ void drawCheckBox(entity me)
        }
        else
                me.srcSuffix = (me.checked ? "1" : "0");
-       drawButton(me);
+       SUPER(CheckBox).draw(me);
        me.pressed = s;
 }
 #endif
index 53e3eaa1acc57bdf1c787d21bf6801971bccf37a..d10e6a486d99d981083a26725e8f57237c2ead7e 100644 (file)
@@ -9,7 +9,7 @@ CLASS(Container) EXTENDS(Item)
        METHOD(Container, mouseRelease, float(entity, vector))
        METHOD(Container, focusLeave, void(entity))
        METHOD(Container, resizeNotify, void(entity, vector, vector, vector, vector))
-       METHOD(Container, resizeNotifyLie, void(entity, vector, vector, vector, vector, .vector, .vector))
+       METHOD(Container, resizeNotifyLie, void(entity, vector, vector, vector, vector, .vector, .vector, .vector))
        METHOD(Container, addItem, void(entity, entity, vector, vector, float))
        METHOD(Container, addItemCentered, void(entity, entity, vector, float))
        METHOD(Container, moveItemAfter, void(entity, entity, entity))
@@ -25,6 +25,10 @@ CLASS(Container) EXTENDS(Item)
        ATTRIB(Container, lastChild, entity, NULL)
        ATTRIB(Container, focusedChild, entity, NULL)
        ATTRIB(Container, shown, float, 0)
+
+       METHOD(Container, enterSubitem, void(entity, entity))
+       METHOD(Container, enterLieSubitem, void(entity, vector, vector, vector, float))
+       METHOD(Container, leaveSubitem, void(entity))
 ENDCLASS(Container)
 .entity nextSibling;
 .entity prevSibling;
@@ -33,10 +37,41 @@ ENDCLASS(Container)
 .vector Container_size;
 .vector Container_fontscale;
 .float Container_alpha;
+.vector Container_save_shift;
+.vector Container_save_scale;
+.vector Container_save_fontscale;
+.float Container_save_alpha;
 #endif
 
 #ifdef IMPLEMENTATION
-void showNotifyContainer(entity me)
+void Container_enterSubitem(entity me, entity sub)
+{
+       me.enterLieSubitem(me, sub.Container_origin, sub.Container_size, sub.Container_fontscale, sub.Container_alpha);
+}
+
+void Container_enterLieSubitem(entity me, vector o, vector s, vector f, float a)
+{
+       me.Container_save_shift = draw_shift;
+       me.Container_save_scale = draw_scale;
+       me.Container_save_alpha = draw_alpha;
+       me.Container_save_fontscale = draw_fontscale;
+
+       draw_shift = boxToGlobal(o, draw_shift, draw_scale);
+       draw_scale = boxToGlobalSize(s, draw_scale);
+       if(f != '0 0 0')
+               draw_fontscale = boxToGlobalSize(f, draw_fontscale);
+       draw_alpha *= a;
+}
+
+void Container_leaveSubitem(entity me)
+{
+       draw_shift = me.Container_save_shift;
+       draw_scale = me.Container_save_scale;
+       draw_alpha = me.Container_save_alpha;
+       draw_fontscale = me.Container_save_fontscale;
+}
+
+void Container_showNotify(entity me)
 {
        entity e;
        if(me.shown)
@@ -47,7 +82,7 @@ void showNotifyContainer(entity me)
                        e.showNotify(e);
 }
 
-void hideNotifyContainer(entity me)
+void Container_hideNotify(entity me)
 {
        entity e;
        if not(me.shown)
@@ -58,7 +93,7 @@ void hideNotifyContainer(entity me)
                        e.hideNotify(e);
 }
 
-void setAlphaOfContainer(entity me, entity other, float theAlpha)
+void Container_setAlphaOf(entity me, entity other, float theAlpha)
 {
        if(theAlpha <= 0)
        {
@@ -73,7 +108,7 @@ void setAlphaOfContainer(entity me, entity other, float theAlpha)
        other.Container_alpha = theAlpha;
 }
 
-void resizeNotifyLieContainer(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize, .vector originField, .vector sizeField)
+void Container_resizeNotifyLie(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize, .vector originField, .vector sizeField, .vector fontScaleField)
 {
        entity e;
        vector o, s;
@@ -82,7 +117,9 @@ void resizeNotifyLieContainer(entity me, vector relOrigin, vector relSize, vecto
        {
                o = e.originField;
                s = e.sizeField;
+               me.enterLieSubitem(me, o, s, e.fontScaleField, e.Container_alpha);
                e.resizeNotify(e, o, s, boxToGlobal(o, absOrigin, absSize), boxToGlobalSize(s, absSize));
+               me.leaveSubitem(me);
        }
        do
        {
@@ -94,19 +131,21 @@ void resizeNotifyLieContainer(entity me, vector relOrigin, vector relSize, vecto
                                d = 1;
                                o = e.originField;
                                s = e.sizeField;
+                               me.enterLieSubitem(me, o, s, e.fontScaleField, e.Container_alpha);
                                e.resizeNotify(e, o, s, boxToGlobal(o, absOrigin, absSize), boxToGlobalSize(s, absSize));
+                               me.leaveSubitem(me);
                        }
        }
        while(d);
-       resizeNotifyItem(me, relOrigin, relSize, absOrigin, absSize);
+       SUPER(Container).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
 }
 
-void resizeNotifyContainer(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void Container_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
-       me.resizeNotifyLie(me, relOrigin, relSize, absOrigin, absSize, Container_origin, Container_size);
+       me.resizeNotifyLie(me, relOrigin, relSize, absOrigin, absSize, Container_origin, Container_size, Container_fontscale);
 }
 
-entity itemFromPointContainer(entity me, vector pos)
+entity Container_itemFromPoint(entity me, vector pos)
 {
        entity e;
        vector o, s;
@@ -123,18 +162,10 @@ entity itemFromPointContainer(entity me, vector pos)
        return NULL;
 }
 
-void drawContainer(entity me)
+void Container_draw(entity me)
 {
-       vector oldshift;
-       vector oldscale;
-       float oldalpha;
-       vector oldfontscale;
        entity e;
 
-       oldshift = draw_shift;
-       oldscale = draw_scale;
-       oldalpha = draw_alpha;
-       oldfontscale = draw_fontscale;
        me.focusable = 0;
        for(e = me.firstChild; e; e = e.nextSibling)
        {
@@ -142,81 +173,110 @@ void drawContainer(entity me)
                        me.focusable += 1;
                if(e.Container_alpha < 0.003) // can't change color values anyway
                        continue;
-               draw_shift = boxToGlobal(e.Container_origin, oldshift, oldscale);
-               draw_scale = boxToGlobalSize(e.Container_size, oldscale);
-               if(e.Container_fontscale != '0 0 0')
-                       draw_fontscale = boxToGlobalSize(e.Container_fontscale, oldfontscale);
-               draw_alpha *= e.Container_alpha;
+               me.enterSubitem(me, e);
                e.draw(e);
-               draw_shift = oldshift;
-               draw_scale = oldscale;
-               draw_fontscale = oldfontscale;
-               draw_alpha = oldalpha;
+               me.leaveSubitem(me);
        }
 };
 
-void focusLeaveContainer(entity me)
+void Container_focusLeave(entity me)
 {
        me.setFocus(me, NULL);
 }
 
-float keyUpContainer(entity me, float scan, float ascii, float shift)
+float Container_keyUp(entity me, float scan, float ascii, float shift)
 {
        entity f;
+       float r;
        f = me.focusedChild;
        if(f)
-               return f.keyUp(f, scan, ascii, shift);
+       {
+               me.enterSubitem(me, f);
+               r = f.keyUp(f, scan, ascii, shift);
+               me.leaveSubitem(me);
+               return r;
+       }
        return 0;
 }
 
-float keyDownContainer(entity me, float scan, float ascii, float shift)
+float Container_keyDown(entity me, float scan, float ascii, float shift)
 {
        entity f;
+       float r;
        f = me.focusedChild;
        if(f)
-               return f.keyDown(f, scan, ascii, shift);
+       {
+               me.enterSubitem(me, f);
+               r = f.keyDown(f, scan, ascii, shift);
+               me.leaveSubitem(me);
+               return r;
+       }
        return 0;
 }
 
-float mouseMoveContainer(entity me, vector pos)
+float Container_mouseMove(entity me, vector pos)
 {
        entity f;
+       float r;
        f = me.focusedChild;
        if(f)
-               return f.mouseMove(f, globalToBox(pos, f.Container_origin, f.Container_size));
+       {
+               me.enterSubitem(me, f);
+               r = f.mouseMove(f, globalToBox(pos, f.Container_origin, f.Container_size));
+               me.leaveSubitem(me);
+               return r;
+       }
        return 0;
 }
-float mousePressContainer(entity me, vector pos)
+float Container_mousePress(entity me, vector pos)
 {
        entity f;
+       float r;
        f = me.focusedChild;
        if(f)
-               return f.mousePress(f, globalToBox(pos, f.Container_origin, f.Container_size));
+       {
+               me.enterSubitem(me, f);
+               r = f.mousePress(f, globalToBox(pos, f.Container_origin, f.Container_size));
+               me.leaveSubitem(me);
+               return r;
+       }
        return 0;
 }
-float mouseDragContainer(entity me, vector pos)
+float Container_mouseDrag(entity me, vector pos)
 {
        entity f;
+       float r;
        f = me.focusedChild;
        if(f)
-               return f.mouseDrag(f, globalToBox(pos, f.Container_origin, f.Container_size));
+       {
+               me.enterSubitem(me, f);
+               r = f.mouseDrag(f, globalToBox(pos, f.Container_origin, f.Container_size));
+               me.leaveSubitem(me);
+               return r;
+       }
        return 0;
 }
-float mouseReleaseContainer(entity me, vector pos)
+float Container_mouseRelease(entity me, vector pos)
 {
        entity f;
+       float r;
        f = me.focusedChild;
        if(f)
-               return f.mouseRelease(f, globalToBox(pos, f.Container_origin, f.Container_size));
+       {
+               me.enterSubitem(me, f);
+               r = f.mouseRelease(f, globalToBox(pos, f.Container_origin, f.Container_size));
+               me.leaveSubitem(me);
+               return r;
+       }
        return 0;
 }
 
-void addItemCenteredContainer(entity me, entity other, vector theSize, float theAlpha)
+void Container_addItemCentered(entity me, entity other, vector theSize, float theAlpha)
 {
        me.addItem(me, other, '0.5 0.5 0' - 0.5 * theSize, theSize, theAlpha);
 }
 
-void addItemContainer(entity me, entity other, vector theOrigin, vector theSize, float theAlpha)
+void Container_addItem(entity me, entity other, vector theOrigin, vector theSize, float theAlpha)
 {
        if(other.parent)
                error("Can't add already added item!");
@@ -258,7 +318,7 @@ void addItemContainer(entity me, entity other, vector theOrigin, vector theSize,
        draw_NeedResizeNotify = 1;
 }
 
-void removeItemContainer(entity me, entity other)
+void Container_removeItem(entity me, entity other)
 {
        if(other.parent != me)
                error("Can't remove from wrong container!");
@@ -285,7 +345,7 @@ void removeItemContainer(entity me, entity other)
                me.lastChild = p;
 }
 
-void setFocusContainer(entity me, entity other)
+void Container_setFocus(entity me, entity other)
 {
        if(other)
                if not(me.focused)
@@ -306,7 +366,7 @@ void setFocusContainer(entity me, entity other)
        me.focusedChild = other;
 }
 
-void moveItemAfterContainer(entity me, entity other, entity dest)
+void Container_moveItemAfter(entity me, entity other, entity dest)
 {
        // first: remove other from the chain
        entity n, p, f, l;
@@ -347,7 +407,7 @@ void moveItemAfterContainer(entity me, entity other, entity dest)
                me.lastChild = other;
 }
 
-entity preferredFocusedGrandChildContainer(entity me)
+entity Container_preferredFocusedGrandChild(entity me)
 {
        entity e, e2;
        entity best;
index 7733a60302e59c3cfea156a7b7e393bcb9082f5f..8202fbbb67e4c358989d96c20bae9eb2dd002cec 100644 (file)
@@ -71,11 +71,11 @@ void Dialog_Close(entity button, entity me)
        me.close(me);
 }
 
-void fillDialog(entity me)
+void Dialog_fill(entity me)
 {
 }
 
-void addItemSimpleDialog(entity me, float row, float col, float rowspan, float colspan, entity e, vector v)
+void Dialog_addItemSimple(entity me, float row, float col, float rowspan, float colspan, entity e, vector v)
 {
        //print(vtos(me.itemSpacing), " ", vtos(me.itemSize), "\n");
        vector o, s;
@@ -88,41 +88,41 @@ void addItemSimpleDialog(entity me, float row, float col, float rowspan, float c
        me.addItem(me, e, o, s, 1);
 }
 
-void gotoRCDialog(entity me, float row, float col)
+void Dialog_gotoRC(entity me, float row, float col)
 {
        me.currentRow = row;
        me.currentColumn = col;
 }
 
-void TRDialog(entity me)
+void Dialog_TR(entity me)
 {
        me.currentRow += 1;
        me.currentColumn = me.firstColumn;
 }
 
-void TDDialog(entity me, float rowspan, float colspan, entity e)
+void Dialog_TD(entity me, float rowspan, float colspan, entity e)
 {
        me.addItemSimple(me, me.currentRow, me.currentColumn, rowspan, colspan, e, '0 0 0');
        me.currentColumn += colspan;
 }
 
-void TDNoMarginDialog(entity me, float rowspan, float colspan, entity e, vector v)
+void Dialog_TDNoMargin(entity me, float rowspan, float colspan, entity e, vector v)
 {
        me.addItemSimple(me, me.currentRow, me.currentColumn, rowspan, colspan, e, v);
        me.currentColumn += colspan;
 }
 
-void setFirstColumnDialog(entity me, float col)
+void Dialog_setFirstColumn(entity me, float col)
 {
        me.firstColumn = col;
 }
 
-void TDemptyDialog(entity me, float colspan)
+void Dialog_TDempty(entity me, float colspan)
 {
        me.currentColumn += colspan;
 }
 
-void configureDialogDialog(entity me)
+void Dialog_configureDialog(entity me)
 {
        entity closebutton;
        float absWidth, absHeight;
@@ -164,7 +164,7 @@ void configureDialogDialog(entity me)
        me.frame.closeButton = closebutton;
 }
 
-void closeDialog(entity me)
+void Dialog_close(entity me)
 {
        if(me.parent.instanceOfNexposee)
        {
@@ -176,7 +176,7 @@ void closeDialog(entity me)
        }
 }
 
-float keyDownDialog(entity me, float key, float ascii, float shift)
+float Dialog_keyDown(entity me, float key, float ascii, float shift)
 {
        if(me.closable)
        {
@@ -186,6 +186,6 @@ float keyDownDialog(entity me, float key, float ascii, float shift)
                        return 1;
                }
        }
-       return keyDownInputContainer(me, key, ascii, shift);
+       return SUPER(Dialog).keyDown(me, key, ascii, shift);
 }
 #endif
index de0502fe632adff53a0bf51ea1438eaf5515ab3b..139e87e1a03903baa96650e607b8347cb780d93f 100644 (file)
@@ -1,23 +1,23 @@
 // Andreas Kirsch Gecko item (to test it)
 #ifdef INTERFACE
 CLASS(Gecko) EXTENDS(Item)
-       METHOD( Gecko, configureBrowser, void( entity, string ) )
-       METHOD( Gecko, draw, void(entity))
-       METHOD( Gecko, keyDown, float(entity, float, float, float))
-       METHOD( Gecko, keyUp, float(entity, float, float, float))
-       METHOD( Gecko, mouseMove, float(entity, vector))
-       METHOD( Gecko, mouseDrag, float(entity, vector))
-       METHOD( Gecko, resizeNotify, void(entity, vector, vector, vector, vector))
-       ATTRIB( Gecko, texturePath, string, string_null )
-       ATTRIB( Gecko, textureExtent, vector, '0 0 0')
-ENDCLASS(Item)
+       METHOD(Gecko, configureBrowser, void( entity, string ) )
+       METHOD(Gecko, draw, void(entity))
+       METHOD(Gecko, keyDown, float(entity, float, float, float))
+       METHOD(Gecko, keyUp, float(entity, float, float, float))
+       METHOD(Gecko, mouseMove, float(entity, vector))
+       METHOD(Gecko, mouseDrag, float(entity, vector))
+       METHOD(Gecko, resizeNotify, void(entity, vector, vector, vector, vector))
+       ATTRIB(Gecko, texturePath, string, string_null )
+       ATTRIB(Gecko, textureExtent, vector, '0 0 0')
+ENDCLASS(Gecko)
 #endif
 
 #ifdef IMPLEMENTATION
 // define static members
 float _gecko_instanceNumber;
 
-void configureBrowserGecko( entity me, string URI ) {
+void Gecko_configureBrowser( entity me, string URI ) {
        me.focusable = 1;
 
        //create a new gecko object if needed
@@ -30,7 +30,7 @@ void configureBrowserGecko( entity me, string URI ) {
        gecko_navigate( me.texturePath, URI );
 }
 
-void drawGecko(entity me)
+void Gecko_draw(entity me)
 {
        vector drawSize;
   
@@ -50,7 +50,7 @@ void drawGecko(entity me)
        }
 }
 
-float keyDownGecko(entity me, float scan, float ascii, float shift)
+float Gecko_keyDown(entity me, float scan, float ascii, float shift)
 {
        if( scan == K_ESCAPE ) {
                return 0;
@@ -61,7 +61,7 @@ float keyDownGecko(entity me, float scan, float ascii, float shift)
                return gecko_keyevent( me.texturePath, scan, GECKO_BUTTON_DOWN );
 }
 
-float keyUpGecko(entity me, float scan, float ascii, float shift)
+float Gecko_keyUp(entity me, float scan, float ascii, float shift)
 {
        if (ascii >= 32)
                return gecko_keyevent( me.texturePath, ascii, GECKO_BUTTON_UP );
@@ -69,21 +69,21 @@ float keyUpGecko(entity me, float scan, float ascii, float shift)
                return gecko_keyevent( me.texturePath, scan, GECKO_BUTTON_UP );
 }
 
-float mouseMoveGecko(entity me, vector pos)
+float Gecko_mouseMove(entity me, vector pos)
 {
        gecko_mousemove( me.texturePath, pos_x, pos_y );
        return 1;
 }
 
-float mouseDragGecko(entity me, vector pos)
+float Gecko_mouseDrag(entity me, vector pos)
 {
        gecko_mousemove( me.texturePath, pos_x, pos_y );
        return 1;
 }
 
-void resizeNotifyGecko(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void Gecko_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
-       resizeNotifyItem(me, relOrigin, relSize, absOrigin, absSize);
+       SUPER(Gecko).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
        gecko_resize( me.texturePath, absSize_x, absSize_y );
        me.textureExtent = gecko_get_texture_extent( me.texturePath );
 }
index c60ec232f2c7b2f2e4e5539f02bb69a034711464..c64561b39b4d0e2f625cab044956fae9408db48c 100644 (file)
@@ -14,19 +14,19 @@ ENDCLASS(Image)
 #endif
 
 #ifdef IMPLEMENTATION
-string toStringImage(entity me)
+string Image_toString(entity me)
 {
        return me.src;
 }
-void configureImageImage(entity me, string path)
+void Image_configureImage(entity me, string path)
 {
        me.src = path;
 }
-void drawImage(entity me)
+void Image_draw(entity me)
 {
        draw_Picture(me.imgOrigin, me.src, me.imgSize, me.color, 1);
 }
-void updateAspectImage(entity me)
+void Image_updateAspect(entity me)
 {
        float asp;
        if(me.size_x <= 0 || me.size_y <= 0)
@@ -59,9 +59,9 @@ void updateAspectImage(entity me)
                me.imgOrigin = '0.5 0.5 0' - 0.5 * me.imgSize;
        }
 }
-void resizeNotifyImage(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void Image_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
-       resizeNotifyItem(me, relOrigin, relSize, absOrigin, absSize);
+       SUPER(Image).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
        me.updateAspect(me);
 }
 #endif
index 03e1605daff2411d2a426874be3c823355024972..cb1b32e8b1c9a4225e9e3bb09885b935e3945491 100644 (file)
@@ -31,18 +31,18 @@ void InputBox_Clear_Click(entity btn, entity me);
 #endif
 
 #ifdef IMPLEMENTATION
-void configureInputBoxInputBox(entity me, string theText, float theCursorPos, float theFontSize, string gfx)
+void InputBox_configureInputBox(entity me, string theText, float theCursorPos, float theFontSize, string gfx)
 {
-       configureLabelLabel(me, theText, theFontSize, 0.0);
+       SUPER(InputBox).configureLabel(me, theText, theFontSize, 0.0);
        me.src = gfx;
        me.cursorPos = theCursorPos;
 }
 
-void setTextInputBox(entity me, string txt)
+void InputBox_setText(entity me, string txt)
 {
        if(me.text)
                strunzone(me.text);
-       setTextLabel(me, strzone(txt));
+       SUPER(InputBox).setText(me, strzone(txt));
 }
 
 void InputBox_Clear_Click(entity btn, entity me)
@@ -50,7 +50,7 @@ void InputBox_Clear_Click(entity btn, entity me)
        me.setText(me, "");
 }
 
-float mouseDragInputBox(entity me, vector pos)
+float InputBox_mouseDrag(entity me, vector pos)
 {
        float p;
        me.dragScrollPos = pos;
@@ -60,20 +60,20 @@ float mouseDragInputBox(entity me, vector pos)
        return 1;
 }
 
-float mousePressInputBox(entity me, vector pos)
+float InputBox_mousePress(entity me, vector pos)
 {
        me.dragScrollTimer = time;
        me.pressed = 1;
-       return mouseDragInputBox(me, pos);
+       return InputBox_mouseDrag(me, pos);
 }
 
-float mouseReleaseInputBox(entity me, vector pos)
+float InputBox_mouseRelease(entity me, vector pos)
 {
        me.pressed = 0;
-       return mouseDragInputBox(me, pos);
+       return InputBox_mouseDrag(me, pos);
 }
 
-void enterTextInputBox(entity me, string ch)
+void InputBox_enterText(entity me, string ch)
 {
        float i;
        for(i = 0; i < strlen(ch); ++i)
@@ -85,7 +85,7 @@ void enterTextInputBox(entity me, string ch)
        me.cursorPos += strlen(ch);
 }
 
-float keyDownInputBox(entity me, float key, float ascii, float shift)
+float InputBox_keyDown(entity me, float key, float ascii, float shift)
 {
        me.lastChangeTime = time;
        me.dragScrollTimer = time;
@@ -125,7 +125,7 @@ float keyDownInputBox(entity me, float key, float ascii, float shift)
        return 0;
 }
 
-void drawInputBox(entity me)
+void InputBox_draw(entity me)
 {
 #define CURSOR "_"
        float cursorPosInWidths, totalSizeInWidths;
@@ -303,14 +303,14 @@ void drawInputBox(entity me)
        }
        else
                draw_Text(me.realOrigin - eX * me.scrollPos, me.text, me.realFontSize, '1 1 1', 1, 0);
-               // skipping drawLabel(me);
+               // skipping SUPER(InputBox).draw(me);
        if(!me.focused || (time - me.lastChangeTime) < floor(time - me.lastChangeTime) + 0.5)
                draw_Text(me.realOrigin + eX * (cursorPosInWidths - me.scrollPos), CURSOR, me.realFontSize, '1 1 1', 1, 0);
 
        draw_ClearClip();
 }
 
-void showNotifyInputBox(entity me)
+void InputBox_showNotify(entity me)
 {
        me.focusable = !me.disabled;
 }
index 91e0012c888bd445fabe771d1ef4a81cb6e8c0ca..e1b14d3b1602d468d08ccdf6b26ef0aaf48b43df 100644 (file)
@@ -15,9 +15,9 @@ ENDCLASS(InputContainer)
 #endif
 
 #ifdef IMPLEMENTATION
-void resizeNotifyInputContainer(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void InputContainer_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
-       resizeNotifyContainer(me, relOrigin, relSize, absOrigin, absSize);
+       SUPER(InputContainer).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
        /*
        if(me.parent.instanceOfInputContainer)
                me.isTabRoot = 0;
@@ -26,16 +26,16 @@ void resizeNotifyInputContainer(entity me, vector relOrigin, vector relSize, vec
        */
 }
 
-void focusLeaveInputContainer(entity me)
+void InputContainer_focusLeave(entity me)
 {
-       focusLeaveContainer(me);
+       SUPER(InputContainer).focusLeave(me);
        me.mouseFocusedChild = NULL;
 }
 
-float keyDownInputContainer(entity me, float scan, float ascii, float shift)
+float InputContainer_keyDown(entity me, float scan, float ascii, float shift)
 {
        entity f, ff;
-       if(keyDownContainer(me, scan, ascii, shift))
+       if(SUPER(InputContainer).keyDown(me, scan, ascii, shift))
                return 1;
        if(scan == K_ESCAPE)
        {
@@ -102,7 +102,7 @@ float keyDownInputContainer(entity me, float scan, float ascii, float shift)
        return 0;
 }
 
-float _changeFocusXYInputContainer(entity me, vector pos)
+float InputContainer__changeFocusXY(entity me, vector pos)
 {
        entity e, ne;
        e = me.mouseFocusedChild;
@@ -124,37 +124,37 @@ float _changeFocusXYInputContainer(entity me, vector pos)
        return (ne != NULL);
 }
 
-float mouseDragInputContainer(entity me, vector pos)
+float InputContainer_mouseDrag(entity me, vector pos)
 {
-       if(mouseDragContainer(me, pos))
+       if(SUPER(InputContainer).mouseDrag(me, pos))
                return 1;
        if(pos_x >= 0 && pos_y >= 0 && pos_x < 1 && pos_y < 1)
                return 1;
        return 0;
 }
-float mouseMoveInputContainer(entity me, vector pos)
+float InputContainer_mouseMove(entity me, vector pos)
 {
        if(me._changeFocusXY(me, pos))
-               if(mouseMoveContainer(me, pos))
+               if(SUPER(InputContainer).mouseMove(me, pos))
                        return 1;
        if(pos_x >= 0 && pos_y >= 0 && pos_x < 1 && pos_y < 1)
                return 1;
        return 0;
 }
-float mousePressInputContainer(entity me, vector pos)
+float InputContainer_mousePress(entity me, vector pos)
 {
        me.mouseFocusedChild = NULL; // force focusing
        if(me._changeFocusXY(me, pos))
-               if(mousePressContainer(me, pos))
+               if(SUPER(InputContainer).mousePress(me, pos))
                        return 1;
        if(pos_x >= 0 && pos_y >= 0 && pos_x < 1 && pos_y < 1)
                return 1;
        return 0;
 }
-float mouseReleaseInputContainer(entity me, vector pos)
+float InputContainer_mouseRelease(entity me, vector pos)
 {
        float r;
-       r = mouseReleaseContainer(me, pos);
+       r = SUPER(InputContainer).mouseRelease(me, pos);
        if(me.focused) // am I still eligible for this? (UGLY HACK, but a mouse event could have changed focus away)
                if(me._changeFocusXY(me, pos))
                        return 1;
index 1ac50be751e0d3853fd07f9b26b826edea4c4b83..67db22a1b4e8896b4f9711c00ec36c7aa0638fa0 100644 (file)
@@ -22,22 +22,23 @@ CLASS(Label) EXTENDS(Item)
        ATTRIB(Label, disabledAlpha, float, 0.3)
        ATTRIB(Label, textEntity, entity, NULL)
        ATTRIB(Label, allowWrap, float, 0)
+       ATTRIB(Label, recalcPos, float, 0)
 ENDCLASS(Label)
 #endif
 
 #ifdef IMPLEMENTATION
-string toStringLabel(entity me)
+string Label_toString(entity me)
 {
        return me.text;
 }
-void setTextLabel(entity me, string txt)
+void Label_setText(entity me, string txt)
 {
        me.text = txt;
-       me.realOrigin_x = me.align * (1 - me.keepspaceLeft - me.keepspaceRight - min(draw_TextWidth(me.text, me.allowColors, me.realFontSize), (1 - me.keepspaceLeft - me.keepspaceRight))) + me.keepspaceLeft;
+       me.recalcPos = 1;
 }
-void resizeNotifyLabel(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void Label_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
-       resizeNotifyItem(me, relOrigin, relSize, absOrigin, absSize);
+       SUPER(Label).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
        // absSize_y is height of label
        me.realFontSize_y = me.fontSize / absSize_y;
        me.realFontSize_x = me.fontSize / absSize_x;
@@ -45,16 +46,17 @@ void resizeNotifyLabel(entity me, vector relOrigin, vector relSize, vector absOr
                me.keepspaceLeft = me.marginLeft * me.realFontSize_x;
        if(me.marginRight)
                me.keepspaceRight = me.marginRight * me.realFontSize_x;
-       me.realOrigin_x = me.align * (1 - me.keepspaceLeft - me.keepspaceRight - min(draw_TextWidth(me.text, me.allowColors, me.realFontSize), (1 - me.keepspaceLeft - me.keepspaceRight))) + me.keepspaceLeft;
        me.realOrigin_y = 0.5 * (1 - me.realFontSize_y);
+       me.realOrigin_x = me.align * (1 - me.keepspaceLeft - me.keepspaceRight - min(draw_TextWidth(me.text, me.allowColors, me.realFontSize), (1 - me.keepspaceLeft - me.keepspaceRight))) + me.keepspaceLeft;
+       me.recalcPos = 0;
 }
-void configureLabelLabel(entity me, string txt, float sz, float algn)
+void Label_configureLabel(entity me, string txt, float sz, float algn)
 {
        me.fontSize = sz;
        me.align = algn;
        me.setText(me, txt);
 }
-void drawLabel(entity me)
+void Label_draw(entity me)
 {
        string t;
        vector o;
@@ -64,10 +66,14 @@ void drawLabel(entity me)
        if(me.textEntity)
        {
                t = me.textEntity.toString(me.textEntity);
-               me.realOrigin_x = me.align * (1 - me.keepspaceLeft - me.keepspaceRight - min(draw_TextWidth(t, 0, me.realFontSize), (1 - me.keepspaceLeft - me.keepspaceRight))) + me.keepspaceLeft;
+               me.recalcPos = 1;
        }
        else
                t = me.text;
+
+       if(me.recalcPos)
+               me.realOrigin_x = me.align * (1 - me.keepspaceLeft - me.keepspaceRight - min(draw_TextWidth(t, me.allowColors, me.realFontSize), (1 - me.keepspaceLeft - me.keepspaceRight))) + me.keepspaceLeft;
+       me.recalcPos = 0;
        
        if(me.fontSize)
                if(t)
index d85b1d5285084566dae9598a08565312cd45bfd0..3dd873c33a23428e2acda977d9664fd50f563a1e 100644 (file)
@@ -41,21 +41,21 @@ ENDCLASS(ListBox)
 #endif
 
 #ifdef IMPLEMENTATION
-void setSelectedListBox(entity me, float i)
+void ListBox_setSelected(entity me, float i)
 {
        me.selectedItem = floor(0.5 + bound(0, i, me.nItems - 1));
 }
-void resizeNotifyListBox(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void ListBox_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
-       resizeNotifyItem(me, relOrigin, relSize, absOrigin, absSize);
+       SUPER(ListBox).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
        me.controlWidth = me.scrollbarWidth / absSize_x;
 }
-void configureListBoxListBox(entity me, float theScrollbarWidth, float theItemHeight)
+void ListBox_configureListBox(entity me, float theScrollbarWidth, float theItemHeight)
 {
        me.scrollbarWidth = theScrollbarWidth;
        me.itemHeight = theItemHeight;
 }
-float keyDownListBox(entity me, float key, float ascii, float shift)
+float ListBox_keyDown(entity me, float key, float ascii, float shift)
 {
        me.dragScrollTimer = time;
        if(key == K_MWHEELUP)
@@ -90,7 +90,7 @@ float keyDownListBox(entity me, float key, float ascii, float shift)
                return 0;
        return 1;
 }
-float mouseDragListBox(entity me, vector pos)
+float ListBox_mouseDrag(entity me, vector pos)
 {
        float hit;
        float i;
@@ -124,7 +124,7 @@ float mouseDragListBox(entity me, vector pos)
        }
        return 1;
 }
-float mousePressListBox(entity me, vector pos)
+float ListBox_mousePress(entity me, vector pos)
 {
        if(pos_x < 0) return 0;
        if(pos_y < 0) return 0;
@@ -164,7 +164,7 @@ float mousePressListBox(entity me, vector pos)
        }
        return 1;
 }
-float mouseReleaseListBox(entity me, vector pos)
+float ListBox_mouseRelease(entity me, vector pos)
 {
        vector absSize;
        if(me.pressed == 1)
@@ -188,7 +188,7 @@ float mouseReleaseListBox(entity me, vector pos)
        me.pressed = 0;
        return 1;
 }
-void updateControlTopBottomListBox(entity me)
+void ListBox_updateControlTopBottom(entity me)
 {
        float f;
        // scrollPos is in 0..1 and indicates where the "page" currently shown starts.
@@ -238,7 +238,7 @@ void updateControlTopBottomListBox(entity me)
                }
        }
 }
-void drawListBox(entity me)
+void ListBox_draw(entity me)
 {
        float i;
        vector absSize, fillSize;
@@ -282,12 +282,12 @@ void drawListBox(entity me)
        draw_ClearClip();
 }
 
-void clickListBoxItemListBox(entity me, float i, vector where)
+void ListBox_clickListBoxItem(entity me, float i, vector where)
 {
        // itemclick, itemclick, does whatever itemclick does
 }
 
-void drawListBoxItemListBox(entity me, float i, vector absSize, float selected)
+void ListBox_drawListBoxItem(entity me, float i, vector absSize, float selected)
 {
        draw_Text('0 0 0', strcat("Item ", ftos(i)), eX * (8 / absSize_x) + eY * (8 / absSize_y), (selected ? '0 1 0' : '1 1 1'), 1, 0);
 }
index 9befdabbfbd3976803c4b21600e5d5efa2045981..82bd6f62b8cdf1284d16b6df0a3d4c7ae7994a32 100644 (file)
@@ -52,6 +52,7 @@ void DialogCloseButton_Click(entity button, entity tab); // assumes a button has
 
 .vector ModalController_initialSize;
 .vector ModalController_initialOrigin;
+.vector ModalController_initialFontScale;
 .float ModalController_initialAlpha;
 .vector ModalController_buttonSize;
 .vector ModalController_buttonOrigin;
@@ -59,7 +60,7 @@ void DialogCloseButton_Click(entity button, entity tab); // assumes a button has
 .float ModalController_factor;
 .entity ModalController_controllingButton;
 
-void initializeDialogModalController(entity me, entity root)
+void ModalController_initializeDialog(entity me, entity root)
 {
        me.hideAll(me, 1);
        me.showChild(me, root, '0 0 0', '0 0 0', 1); // someone else animates for us
@@ -95,12 +96,12 @@ void DialogCloseButton_Click(entity button, entity tab)
        tab.parent.hideChild(tab.parent, tab, 0);
 }
 
-void resizeNotifyModalController(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void ModalController_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
-       me.resizeNotifyLie(me, relOrigin, relSize, absOrigin, absSize, ModalController_initialOrigin, ModalController_initialSize);
+       me.resizeNotifyLie(me, relOrigin, relSize, absOrigin, absSize, ModalController_initialOrigin, ModalController_initialSize, ModalController_initialFontScale);
 }
 
-void switchStateModalController(entity me, entity other, float state, float skipAnimation)
+void ModalController_switchState(entity me, entity other, float state, float skipAnimation)
 {
        float previousState;
        previousState = other.ModalController_state;
@@ -131,7 +132,7 @@ void switchStateModalController(entity me, entity other, float state, float skip
                other.ModalController_factor = 1;
 }
 
-void drawModalController(entity me)
+void ModalController_draw(entity me)
 {
        entity e;
        entity front;
@@ -140,6 +141,7 @@ void drawModalController(entity me)
        float df; // animation step size
        float prevFactor, targetFactor;
        vector targetOrigin, targetSize; float targetAlpha;
+       vector fs;
        animating = 0;
 
        for(e = me.firstChild; e; e = e.nextSibling)
@@ -216,16 +218,18 @@ void drawModalController(entity me)
                // --> (maxima)
                // o' = (to * (f - f_prev) + o * (1 - f)) / (1 - f_prev)
 
-               e.Container_fontscale = globalToBoxSize(e.Container_size, e.ModalController_initialSize);
+               fs = globalToBoxSize(e.Container_size, e.ModalController_initialSize);
+               e.Container_fontscale_x = fs_x * e.ModalController_initialFontScale_x;
+               e.Container_fontscale_y = fs_y * e.ModalController_initialFontScale_y;
        }
        if(animating || !me.focused)
                me.setFocus(me, NULL);
        else
                me.setFocus(me, front);
-       drawContainer(me);
+       SUPER(ModalController).draw(me);
 };
 
-void addTabModalController(entity me, entity other, entity tabButton)
+void ModalController_addTab(entity me, entity other, entity tabButton)
 {
        me.addItem(me, other, '0 0 0', '1 1 1', 1);
        tabButton.onClick = TabButton_Click;
@@ -239,15 +243,18 @@ void addTabModalController(entity me, entity other, entity tabButton)
        }
 }
 
-void addItemModalController(entity me, entity other, vector theOrigin, vector theSize, float theAlpha)
+void ModalController_addItem(entity me, entity other, vector theOrigin, vector theSize, float theAlpha)
 {
-       addItemContainer(me, other, theOrigin, theSize, (other == me.firstChild) ? theAlpha : 0);
+       SUPER(ModalController).addItem(me, other, theOrigin, theSize, (other == me.firstChild) ? theAlpha : 0);
+       other.ModalController_initialFontScale = other.Container_fontscale;
        other.ModalController_initialSize = other.Container_size;
        other.ModalController_initialOrigin = other.Container_origin;
        other.ModalController_initialAlpha = theAlpha; // hope Container never modifies this
+       if(other.ModalController_initialFontScale == '0 0 0')
+               other.ModalController_initialFontScale = '1 1 0';
 }
 
-void showChildModalController(entity me, entity other, vector theOrigin, vector theSize, float skipAnimation)
+void ModalController_showChild(entity me, entity other, vector theOrigin, vector theSize, float skipAnimation)
 {
        if(other.ModalController_state == 0 || skipAnimation)
        {
@@ -261,14 +268,14 @@ void showChildModalController(entity me, entity other, vector theOrigin, vector
        } // zoom in from button (factor increases)
 }
 
-void hideAllModalController(entity me, float skipAnimation)
+void ModalController_hideAll(entity me, float skipAnimation)
 {
        entity e;
        for(e = me.firstChild; e; e = e.nextSibling)
                me.hideChild(me, e, skipAnimation);
 }
 
-void hideChildModalController(entity me, entity other, float skipAnimation)
+void ModalController_hideChild(entity me, entity other, float skipAnimation)
 {
        if(other.ModalController_state || skipAnimation)
        {
index 75ebf3701cdddb8ec97bba74ece080a11e61d402..c43f44f509f38b9ee7cd2f902dfcc59fb949e885 100644 (file)
@@ -35,6 +35,7 @@ void ExposeeCloseButton_Click(entity button, entity other); // un-exposees the c
 #ifdef IMPLEMENTATION
 
 .vector Nexposee_initialSize;
+.vector Nexposee_initialFontScale;
 .vector Nexposee_initialOrigin;
 .float Nexposee_initialAlpha;
 
@@ -46,7 +47,7 @@ void ExposeeCloseButton_Click(entity button, entity other); // un-exposees the c
 .vector Nexposee_align;
 .float Nexposee_animationFactor;
 
-void closeNexposee(entity me)
+void Nexposee_close(entity me)
 {
        // user must override this
 }
@@ -58,10 +59,10 @@ void ExposeeCloseButton_Click(entity button, entity other)
        other.animationState = 3;
 }
 
-void resizeNotifyNexposee(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void Nexposee_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
        me.calc(me);
-       me.resizeNotifyLie(me, relOrigin, relSize, absOrigin, absSize, Nexposee_initialOrigin, Nexposee_initialSize);
+       me.resizeNotifyLie(me, relOrigin, relSize, absOrigin, absSize, Nexposee_initialOrigin, Nexposee_initialSize, Nexposee_initialFontScale);
 }
 
 void Nexposee_Calc_Scale(entity me, float scale)
@@ -82,7 +83,7 @@ void Nexposee_Calc_Scale(entity me, float scale)
        }
 }
 
-void calcNexposee(entity me)
+void Nexposee_calc(entity me)
 {
        /*
         * patented by Apple
@@ -127,7 +128,7 @@ void calcNexposee(entity me)
        Nexposee_Calc_Scale(me, scale);
 }
 
-void setNexposeeNexposee(entity me, entity other, vector scalecenter, float a0, float a1)
+void Nexposee_setNexposee(entity me, entity other, vector scalecenter, float a0, float a1)
 {
        other.Nexposee_scaleCenter = scalecenter;
        other.Nexposee_smallAlpha = a0;
@@ -135,12 +136,13 @@ void setNexposeeNexposee(entity me, entity other, vector scalecenter, float a0,
        other.Nexposee_mediumAlpha = a1;
 }
 
-void drawNexposee(entity me)
+void Nexposee_draw(entity me)
 {
        float a;
        float a0;
        entity e;
        float f;
+       vector fs;
 
        if(me.animationState == -1)
        {
@@ -161,7 +163,7 @@ void drawNexposee(entity me)
                        {
                                me.animationFactor = 1;
                                me.animationState = 2;
-                               setFocusContainer(me, me.selectedChild);
+                               SUPER(Nexposee).setFocus(me, me.selectedChild);
                        }
                        break;
                case 2:
@@ -203,22 +205,24 @@ void drawNexposee(entity me)
                }
                me.setAlphaOf(me, e, e.Container_alpha * (1 - f) + a * f);
 
-               e.Container_fontscale = globalToBoxSize(e.Container_size, e.Nexposee_initialSize);
+               fs = globalToBoxSize(e.Container_size, e.Nexposee_initialSize);
+               e.Container_fontscale_x = fs_x * e.Nexposee_initialFontScale_x;
+               e.Container_fontscale_y = fs_y * e.Nexposee_initialFontScale_y;
        }
 
-       drawContainer(me);
+       SUPER(Nexposee).draw(me);
 };
 
-float mousePressNexposee(entity me, vector pos)
+float Nexposee_mousePress(entity me, vector pos)
 {
        if(me.animationState == 0)
        {
                me.mouseFocusedChild = NULL;
-               mouseMoveNexposee(me, pos);
+               Nexposee_mouseMove(me, pos);
                if(me.mouseFocusedChild)
                {
                        me.animationState = 1;
-                       setFocusContainer(me, NULL);
+                       SUPER(Nexposee).setFocus(me, NULL);
                }
                else
                        me.close(me);
@@ -226,38 +230,38 @@ float mousePressNexposee(entity me, vector pos)
        }
        else if(me.animationState == 2)
        {
-               if not(mousePressContainer(me, pos))
+               if not(SUPER(Nexposee).mousePress(me, pos))
                {
                        me.animationState = 3;
-                       setFocusContainer(me, NULL);
+                       SUPER(Nexposee).setFocus(me, NULL);
                }
                return 1;
        }
        return 0;
 }
 
-float mouseReleaseNexposee(entity me, vector pos)
+float Nexposee_mouseRelease(entity me, vector pos)
 {
        if(me.animationState == 2)
-               return mouseReleaseContainer(me, pos);
+               return SUPER(Nexposee).mouseRelease(me, pos);
        return 0;
 }
 
-float mouseDragNexposee(entity me, vector pos)
+float Nexposee_mouseDrag(entity me, vector pos)
 {
        if(me.animationState == 2)
-               return mouseDragContainer(me, pos);
+               return SUPER(Nexposee).mouseDrag(me, pos);
        return 0;
 }
 
-float mouseMoveNexposee(entity me, vector pos)
+float Nexposee_mouseMove(entity me, vector pos)
 {
        entity e;
        me.mousePosition = pos;
        e = me.mouseFocusedChild;
        me.mouseFocusedChild = me.itemFromPoint(me, pos);
        if(me.animationState == 2)
-               return mouseMoveContainer(me, pos);
+               return SUPER(Nexposee).mouseMove(me, pos);
        if(me.animationState == 0)
        {
                if(me.mouseFocusedChild)
@@ -268,18 +272,18 @@ float mouseMoveNexposee(entity me, vector pos)
        return 0;
 }
 
-float keyUpNexposee(entity me, float scan, float ascii, float shift)
+float Nexposee_keyUp(entity me, float scan, float ascii, float shift)
 {
        if(me.animationState == 2)
-               return keyUpContainer(me, scan, ascii, shift);
+               return SUPER(Nexposee).keyUp(me, scan, ascii, shift);
        return 0;
 }
 
-float keyDownNexposee(entity me, float scan, float ascii, float shift)
+float Nexposee_keyDown(entity me, float scan, float ascii, float shift)
 {
        float nexposeeKey;
        if(me.animationState == 2)
-               if(keyDownContainer(me, scan, ascii, shift))
+               if(SUPER(Nexposee).keyDown(me, scan, ascii, shift))
                        return 1;
        if(scan == K_TAB)
        {
@@ -329,27 +333,30 @@ float keyDownNexposee(entity me, float scan, float ascii, float shift)
                        me.selectedChild = me.focusedChild;
                if not(me.selectedChild)
                        me.animationState = 0;
-               setFocusContainer(me, NULL);
+               SUPER(Nexposee).setFocus(me, NULL);
                return 1;
        }
        return 0;
 }
 
-void addItemNexposee(entity me, entity other, vector theOrigin, vector theSize, float theAlpha)
+void Nexposee_addItem(entity me, entity other, vector theOrigin, vector theSize, float theAlpha)
 {
-       addItemContainer(me, other, theOrigin, theSize, theAlpha);
+       SUPER(Nexposee).addItem(me, other, theOrigin, theSize, theAlpha);
+       other.Nexposee_initialFontScale = other.Container_fontscale;
        other.Nexposee_initialSize = other.Container_size;
        other.Nexposee_initialOrigin = other.Container_origin;
        other.Nexposee_initialAlpha = other.Container_alpha;
+       if(other.Nexposee_initialFontScale == '0 0 0')
+               other.Nexposee_initialFontScale = '1 1 0';
 }
 
-void focusEnterNexposee(entity me)
+void Nexposee_focusEnter(entity me)
 {
        if(me.animationState == 2)
-               setFocusContainer(me, me.selectedChild);
+               SUPER(Nexposee).setFocus(me, me.selectedChild);
 }
 
-void pullNexposeeNexposee(entity me, entity other, vector theAlign)
+void Nexposee_pullNexposee(entity me, entity other, vector theAlign)
 {
        other.Nexposee_align = theAlign;
 }
index 34ef101a703dc16e11a7347ba16897e3c0244892..80fd5329b41f70f2dedab6ced75caea971e58284 100644 (file)
@@ -10,7 +10,7 @@ ENDCLASS(RadioButton)
 #endif
 
 #ifdef IMPLEMENTATION
-void configureRadioButtonRadioButton(entity me, string txt, float sz, string gfx, float theGroup, float doAllowDeselect)
+void RadioButton_configureRadioButton(entity me, string txt, float sz, string gfx, float theGroup, float doAllowDeselect)
 {
        me.configureCheckBox(me, txt, sz, gfx);
        me.align = 0;
index eeac0edd844ba43d3e1e25ae197cd2188eda9bd6..92f3b55fe12b56516d08fa781f0a07e74b56bd79 100644 (file)
@@ -44,44 +44,44 @@ ENDCLASS(Slider)
 #endif
 
 #ifdef IMPLEMENTATION
-void setValueSlider(entity me, float val)
+void Slider_setValue(entity me, float val)
 {
        if (me.animated) {
                anim.stopObjAnim(anim, me);
                anim.removeObjAnim(anim, me);
-               makeHostedEasing(me, setSliderValueSlider, easingQuadInOut, 1, me.sliderValue, val);
+               makeHostedEasing(me, Slider_setSliderValue, easingQuadInOut, 1, me.sliderValue, val);
        } else {
                me.setSliderValue(me, val);
        }
        me.value = val;
 }
-void setSliderValueSlider(entity me, float val)
+void Slider_setSliderValue(entity me, float val)
 {
        me.sliderValue = val;
 }
-string toStringSlider(entity me)
+string Slider_toString(entity me)
 {
        return strcat(ftos(me.value), " (", me.valueToText(me, me.value), ")");
 }
-void resizeNotifySlider(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void Slider_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
-       resizeNotifyLabel(me, relOrigin, relSize, absOrigin, absSize);
+       SUPER(Slider).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
        me.controlWidth = absSize_y / absSize_x;
 }
-string valueToTextSlider(entity me, float val)
+string Slider_valueToText(entity me, float val)
 {
        if(almost_in_bounds(me.valueMin, val, me.valueMax))
                return ftos_decimals(val * me.valueDisplayMultiplier, me.valueDigits);
        return "";
 }
-void configureSliderVisualsSlider(entity me, float sz, float theAlign, float theTextSpace, string gfx)
+void Slider_configureSliderVisuals(entity me, float sz, float theAlign, float theTextSpace, string gfx)
 {
-       configureLabelLabel(me, string_null, sz, theAlign);
+       SUPER(Slider).configureLabel(me, string_null, sz, theAlign);
        me.textSpace = theTextSpace;
        me.keepspaceLeft = (theTextSpace == 0) ? 0 : (1 - theTextSpace);
        me.src = gfx;
 }
-void configureSliderValuesSlider(entity me, float theValueMin, float theValue, float theValueMax, float theValueStep, float theValueKeyStep, float theValuePageStep)
+void Slider_configureSliderValues(entity me, float theValueMin, float theValue, float theValueMax, float theValueStep, float theValueKeyStep, float theValuePageStep)
 {
        me.value = theValue;
        me.sliderValue = theValue;
@@ -98,7 +98,7 @@ void configureSliderValuesSlider(entity me, float theValueMin, float theValue, f
        if(fabs(floor(me.valueStep * 1 + 0.5) - (me.valueStep * 1)) < 0.01) // about a whole number
                me.valueDigits = 0;
 }
-float keyDownSlider(entity me, float key, float ascii, float shift)
+float Slider_keyDown(entity me, float key, float ascii, float shift)
 {
        float inRange;
        if(me.disabled)
@@ -149,7 +149,7 @@ float keyDownSlider(entity me, float key, float ascii, float shift)
        // TODO more keys
        return 0;
 }
-float mouseDragSlider(entity me, vector pos)
+float Slider_mouseDrag(entity me, vector pos)
 {
        float hit;
        float v, animed;
@@ -182,7 +182,7 @@ float mouseDragSlider(entity me, vector pos)
 
        return 1;
 }
-float mousePressSlider(entity me, vector pos)
+float Slider_mousePress(entity me, vector pos)
 {
        float controlCenter;
        if(me.disabled)
@@ -239,18 +239,18 @@ float mousePressSlider(entity me, vector pos)
                localsound("sound/misc/menu2.wav");
        return 1;
 }
-float mouseReleaseSlider(entity me, vector pos)
+float Slider_mouseRelease(entity me, vector pos)
 {
        me.pressed = 0;
        if(me.disabled)
                return 0;
        return 1;
 }
-void showNotifySlider(entity me)
+void Slider_showNotify(entity me)
 {
        me.focusable = !me.disabled;
 }
-void drawSlider(entity me)
+void Slider_draw(entity me)
 {
        float controlLeft;
        float save;
@@ -273,7 +273,7 @@ void drawSlider(entity me)
        }
        me.setText(me, me.valueToText(me, me.value));
        draw_alpha = save;
-       drawLabel(me);
+       SUPER(Slider).draw(me);
        me.text = string_null; // TEMPSTRING!
 }
 #endif
index b6a345481171b949904913e5010a6c57ac24bc08..c4a7af7a890e6a5d84ae4cf727e7cde8d5c5151f 100644 (file)
@@ -15,7 +15,7 @@ ENDCLASS(TextSlider)
 #endif
 
 #ifdef IMPLEMENTATION
-string valueToIdentifierTextSlider(entity me, float val)
+string TextSlider_valueToIdentifier(entity me, float val)
 {
        if(val >= me.nValues)
                return "custom";
@@ -23,7 +23,7 @@ string valueToIdentifierTextSlider(entity me, float val)
                return "custom";
        return me.(valueIdentifiers[val]);
 }
-string valueToTextTextSlider(entity me, float val)
+string TextSlider_valueToText(entity me, float val)
 {
        if(val >= me.nValues)
                return "custom";
@@ -31,28 +31,28 @@ string valueToTextTextSlider(entity me, float val)
                return "custom";
        return me.(valueStrings[val]);
 }
-void setValueFromIdentifierTextSlider(entity me, string id)
+void TextSlider_setValueFromIdentifier(entity me, string id)
 {
        float i;
        for(i = 0; i < me.nValues; ++i)
                if(me.valueToIdentifier(me, i) == id)
                {
-                       setValueSlider( me, i );
+                       SUPER(TextSlider).setValue( me, i );
                        return;
                }
-       setValueSlider( me, -1 );
+       SUPER(TextSlider).setValue( me, -1 );
 }
-string getIdentifierTextSlider(entity me)
+string TextSlider_getIdentifier(entity me)
 {
        return me.valueToIdentifier(me, me.value);
 }
-void addValueTextSlider(entity me, string theString, string theIdentifier)
+void TextSlider_addValue(entity me, string theString, string theIdentifier)
 {
        me.(valueStrings[me.nValues]) = theString;
        me.(valueIdentifiers[me.nValues]) = theIdentifier;
        me.nValues += 1;
 }
-void configureTextSliderValuesTextSlider(entity me, string theDefault)
+void TextSlider_configureTextSliderValues(entity me, string theDefault)
 {
        me.configureSliderValues(me, 0, 0, me.nValues - 1, 1, 1, 1);
        me.setValueFromIdentifier(me, theDefault);
index b8fee02a13263a8b9e24a7b43359c150bc1f9dad..7bec34ea0b0a1ff91aad1c9ed91d051f34ca7fc9 100644 (file)
@@ -270,6 +270,9 @@ void draw_Picture_Aligned(vector algn, float scalemode, string img, float a)
 
 void(string img, float a, string algn, float force1) drawBackground =
 {
+       if(main.mainNexposee.ModalController_state == 0)
+               return;
+
        vector v;
        float i, l;
        string c;
@@ -759,8 +762,9 @@ void() m_shutdown =
        m_hide();
        for(e = NULL; (e = nextent(e)) != NULL; )
        {
-               if(e.destroy)
-                       e.destroy(e);
+               if(e.classname != "vtbl")
+                       if(e.destroy)
+                               e.destroy(e);
        }
 };
 
@@ -792,7 +796,7 @@ void m_activate_window(entity wnd)
                // nexposee (sorry for violating abstraction here)
                par.selectedChild = wnd;
                par.animationState = 1;
-               setFocusContainer(par, NULL);
+               Container_setFocus(par, NULL);
        }
        else if(par.instanceOfContainer)
        {
index 0ee4e91379c96b4ae0d0ea0ba253ce50dc5179a9..de4224b934b327f20db496198212903dc15817ad 100644 (file)
@@ -5,10 +5,6 @@
 
 // constants
 
-const vector eX = '1 0 0';
-const vector eY = '0 1 0';
-const vector eZ = '0 0 1';
-
 const float GAME_ISSERVER      = 1;
 const float GAME_CONNECTED     = 2;
 const float GAME_DEVELOPER     = 4;
@@ -44,3 +40,5 @@ 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;
index 65bfbf55607c82eb65e2003496d41519803614a5..3553d447a81fae55be9e7ab50cd2c17257fb594f 100644 (file)
@@ -1,8 +1,26 @@
 .string classname;
+entity Object_vtbl;
+.string vtblname;
+.entity vtblbase;
+entity spawnVtbl(entity e, entity b)
+{
+       entity v;
+       v = spawn();
+       copyentity(e, v);
+       v.vtblname = v.classname;
+       v.classname = "vtbl";
+       if(b)
+               v.vtblbase = b;
+       else
+               v.vtblbase = v;
+       return v;
+}
 entity spawnObject()
 {
        entity e;
        e = spawn();
        e.classname = "Object";
+       if(!Object_vtbl)
+               Object_vtbl = spawnVtbl(e, null_entity);
        return e;
 }
index b62638017dd4bdb0af36df4f69a4a412a4b20598..85bc6c2afa9fe6678c7f239de9343c649f7a4ad9 100644 (file)
 #undef ATTRIB
 #undef ATTRIBARRAY
 #undef ENDCLASS
+#undef SUPER
 #endif
 
-#define CLASS(cname)                       entity spawn##cname();
+#define CLASS(cname)                       entity spawn##cname(); entity cname##_vtbl;
 #define EXTENDS(base)                
-#define METHOD(cname,name,prototype)       prototype name##cname; .prototype name;
+#define METHOD(cname,name,prototype)       prototype cname##_##name; .prototype name;
 #define ATTRIB(cname,name,type,val)        .type name;
 #define ATTRIBARRAY(cname,name,type,cnt)   .type name[cnt];
 #define ENDCLASS(cname)                    .float instanceOf##cname;
+#define SUPER(cname)
index 6aa2eafc4f9412bb8a184741c5ae749857bc9d44..4e758dd4727ad4c29012239b9166f40800826a2a 100644 (file)
 #undef ATTRIB
 #undef ATTRIBARRAY
 #undef ENDCLASS
+#undef SUPER
 #endif
 
 #define CLASS(cname)                       entity spawn##cname() { entity me;
-#define EXTENDS(base)                      me = spawn##base ();
-#define METHOD(cname,name,prototype)       me.name = name##cname;
+#define EXTENDS(base)                      me = spawn##base (); entity basevtbl; basevtbl = base##_vtbl;
+#define METHOD(cname,name,prototype)       me.name = cname##_##name;
 #define ATTRIB(cname,name,type,val)        me.name = val;
 #define ATTRIBARRAY(cname,name,type,cnt)   me.name = me.name;
-#define ENDCLASS(cname)                    me.instanceOf##cname = 1; me.classname = #cname; return me; }
+#define ENDCLASS(cname)                    me.instanceOf##cname = 1; me.classname = #cname; if(!cname##_vtbl) cname##_vtbl = spawnVtbl(me, basevtbl); return me; }
+#define SUPER(cname)
index 24d914050e5c30b663469a9f29badd434228c3e7..ed6bd71f36087d7527c52fe03cef45388bb03c2b 100644 (file)
@@ -13,4 +13,7 @@
 #undef ATTRIB
 #undef ATTRIBARRAY
 #undef ENDCLASS
+#undef SUPER
 #endif
+
+#define SUPER(cname) (cname##_vtbl.vtblbase)
index 8a2a11757d80a891a8bec3c36d9b605bdfaf2780..a63189b63a850dc326e46216e7429f5d80ba98cb 100644 (file)
@@ -3,7 +3,7 @@ CLASS(XonoticBigButton) EXTENDS(XonoticButton)
        METHOD(XonoticBigButton, configureXonoticBigButton, void(entity, string, vector))
        ATTRIB(XonoticBigButton, image, string, SKINGFX_BUTTON_BIG)
        ATTRIB(XonoticBigButton, grayImage, string, SKINGFX_BUTTON_BIG_GRAY)
-ENDCLASS(XonoticButton)
+ENDCLASS(XonoticBigButton)
 entity makeXonoticButton(string theText, vector theColor);
 #endif
 
@@ -16,7 +16,7 @@ entity makeXonoticBigButton(string theText, vector theColor)
        return me;
 }
 
-void configureXonoticBigButtonXonoticBigButton(entity me, string theText, vector theColor)
+void XonoticBigButton_configureXonoticBigButton(entity me, string theText, vector theColor)
 {
        me.configureXonoticButton(me, theText, theColor);
 }
index a667f0e6121a50887d19ebd004e4f74947b1731f..c96dd57a16afcc614fedff7ce68d5a65b6076182 100644 (file)
@@ -3,7 +3,7 @@ CLASS(XonoticBigCommandButton) EXTENDS(XonoticCommandButton)
        METHOD(XonoticBigCommandButton, configureXonoticBigCommandButton, void(entity, string, vector, string, float))
        ATTRIB(XonoticBigCommandButton, image, string, SKINGFX_BUTTON_BIG)
        ATTRIB(XonoticBigCommandButton, grayImage, string, SKINGFX_BUTTON_BIG_GRAY)
-ENDCLASS(XonoticCommandButton)
+ENDCLASS(XonoticBigCommandButton)
 entity makeXonoticBigCommandButton(string theText, vector theColor, string theCommand, float closesMenu);
 #endif
 
@@ -16,7 +16,7 @@ entity makeXonoticBigCommandButton(string theText, vector theColor, string theCo
        return me;
 }
 
-void configureXonoticBigCommandButtonXonoticBigCommandButton(entity me, string theText, vector theColor, string theCommand, float theFlags)
+void XonoticBigCommandButton_configureXonoticBigCommandButton(entity me, string theText, vector theColor, string theCommand, float theFlags)
 {
        me.configureXonoticCommandButton(me, theText, theColor, theCommand, theFlags);
 }
index 2112c2c5002ae4020e43903d87fb2c0c57f8f698..5522905bc2a54cdf1baa07371e6972895c5a846a 100644 (file)
@@ -23,7 +23,7 @@ entity makeXonoticButton(string theText, vector theColor)
        return me;
 }
 
-void configureXonoticButtonXonoticButton(entity me, string theText, vector theColor)
+void XonoticButton_configureXonoticButton(entity me, string theText, vector theColor)
 {
        if(theColor == '0 0 0')
        {
index 1550d3f6fc7e93df6cb637111fe3ca9312aff846..bd31f435e2f0d30e7bfcbb4c193bccfda3e5fb6c 100644 (file)
@@ -96,7 +96,7 @@ entity makeXonoticCampaignList()
        me.configureXonoticCampaignList(me);
        return me;
 }
-void configureXonoticCampaignListXonoticCampaignList(entity me)
+void XonoticCampaignList_configureXonoticCampaignList(entity me)
 {
        me.configureXonoticListBox(me);
        me.campaignGlob = search_begin("maps/campaign*.txt", TRUE, TRUE);
@@ -104,13 +104,13 @@ void configureXonoticCampaignListXonoticCampaignList(entity me)
        me.campaignGo(me, 0); // takes care of enabling/disabling buttons too
 }
 
-void destroyXonoticCampaignList(entity me)
+void XonoticCampaignList_destroy(entity me)
 {
        if(me.campaignGlob >= 0)
                search_end(me.campaignGlob);
 }
 
-void loadCvarsXonoticCampaignList(entity me)
+void XonoticCampaignList_loadCvars(entity me)
 {
        // read campaign cvars
        if(campaign_name)
@@ -133,7 +133,7 @@ void loadCvarsXonoticCampaignList(entity me)
                me.labelTitle.setText(me.labelTitle, campaign_title);
 }
 
-void saveCvarsXonoticCampaignList(entity me)
+void XonoticCampaignList_saveCvars(entity me)
 {
        // write campaign cvars
        // no reason to do this!
@@ -141,7 +141,7 @@ void saveCvarsXonoticCampaignList(entity me)
        // cvar_set(me.cvarName, ftos(me.campaignIndex)); // NOTE: only server QC does that!
 }
 
-void campaignGoXonoticCampaignList(entity me, float step)
+void XonoticCampaignList_campaignGo(entity me, float step)
 {
        float canNext, canPrev;
        string s;
@@ -203,17 +203,17 @@ void MultiCampaign_Prev(entity btn, entity me)
        me.campaignGo(me, -1);
 }
 
-void drawXonoticCampaignList(entity me)
+void XonoticCampaignList_draw(entity me)
 {
        if(cvar(me.cvarName) != me.campaignIndex || cvar_string("g_campaign_name") != campaign_name)
                me.loadCvars(me);
-       drawListBox(me);
+       SUPER(XonoticCampaignList).draw(me);
 }
 
-void resizeNotifyXonoticCampaignList(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void XonoticCampaignList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
        me.itemAbsSize = '0 0 0';
-       resizeNotifyXonoticListBox(me, relOrigin, relSize, absOrigin, absSize);
+       SUPER(XonoticCampaignList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
 
        me.realFontSize_y = me.fontSize / (me.itemAbsSize_y = (absSize_y * me.itemHeight));
        me.realFontSize_x = me.fontSize / (me.itemAbsSize_x = (absSize_x * (1 - me.controlWidth)));
@@ -233,7 +233,7 @@ void resizeNotifyXonoticCampaignList(entity me, vector relOrigin, vector relSize
 
        rewrapCampaign(me.columnNameSize, me.rowsPerItem - 3, me.emptyLineHeight, me.realFontSize);
 }
-void clickListBoxItemXonoticCampaignList(entity me, float i, vector where)
+void XonoticCampaignList_clickListBoxItem(entity me, float i, vector where)
 {
        if(i == me.lastClickedMap)
                if(time < me.lastClickedTime + 0.3)
@@ -246,7 +246,7 @@ void clickListBoxItemXonoticCampaignList(entity me, float i, vector where)
        me.lastClickedMap = i;
        me.lastClickedTime = time;
 }
-void drawListBoxItemXonoticCampaignList(entity me, float i, vector absSize, float isSelected)
+void XonoticCampaignList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
 {
        string s;
        float p;
@@ -307,18 +307,18 @@ void CampaignList_LoadMap(entity btn, entity me)
        CampaignSetup(me.selectedItem);
 }
 
-void setSelectedXonoticCampaignList(entity me, float i)
+void XonoticCampaignList_setSelected(entity me, float i)
 {
        // prevent too late items from being played
-       setSelectedListBox(me, min(i, me.campaignIndex));
+       SUPER(XonoticCampaignList).setSelected(me, min(i, me.campaignIndex));
 }
 
-float keyDownXonoticCampaignList(entity me, float scan, float ascii, float shift)
+float XonoticCampaignList_keyDown(entity me, float scan, float ascii, float shift)
 {
        if(scan == K_ENTER || scan == K_SPACE)
                CampaignList_LoadMap(me, me);
        else
-               return keyDownListBox(me, scan, ascii, shift);
+               return SUPER(XonoticCampaignList).keyDown(me, scan, ascii, shift);
        return 1;
 }
 #endif
index 5547403251dcff62c388c446e9bb0082207e3178..21a4aad6f33fa77784fc49a1ab57173acdbdc10d 100644 (file)
@@ -47,13 +47,13 @@ string CharMap_CellToChar(float c)
        }
 }
 
-void configureXonoticCharmapXonoticCharmap(entity me, entity theTextbox)
+void XonoticCharmap_configureXonoticCharmap(entity me, entity theTextbox)
 {
        me.controlledTextbox = theTextbox;
        me.configureImage(me, me.image);
 }
 
-float mouseMoveXonoticCharmap(entity me, vector coords)
+float XonoticCharmap_mouseMove(entity me, vector coords)
 {
        float x, y, c;
        x = floor(coords_x * 16);
@@ -68,11 +68,11 @@ float mouseMoveXonoticCharmap(entity me, vector coords)
                me.mouseSelectedCharacterCell = me.selectedCharacterCell = c;
        return 1;
 }
-float mouseDragXonoticCharmap(entity me, vector coords)
+float XonoticCharmap_mouseDrag(entity me, vector coords)
 {
        return me.mouseMove(me, coords);
 }
-float mousePressXonoticCharmap(entity me, vector coords)
+float XonoticCharmap_mousePress(entity me, vector coords)
 {
        me.mouseMove(me, coords);
        if(me.mouseSelectedCharacterCell >= 0)
@@ -82,7 +82,7 @@ float mousePressXonoticCharmap(entity me, vector coords)
        }
        return 1;
 }
-float mouseReleaseXonoticCharmap(entity me, vector coords)
+float XonoticCharmap_mouseRelease(entity me, vector coords)
 {
        if(!me.pressed)
                return 0;
@@ -92,7 +92,7 @@ float mouseReleaseXonoticCharmap(entity me, vector coords)
        me.pressed = 0;
        return 1;
 }
-float keyDownXonoticCharmap(entity me, float key, float ascii, float shift)
+float XonoticCharmap_keyDown(entity me, float key, float ascii, float shift)
 {
        switch(key)
        {
@@ -123,11 +123,11 @@ float keyDownXonoticCharmap(entity me, float key, float ascii, float shift)
                        return me.controlledTextbox.keyDown(me.controlledTextbox, key, ascii, shift);
        }
 }
-void focusLeaveXonoticCharmap(entity me)
+void XonoticCharmap_focusLeave(entity me)
 {
        me.controlledTextbox.saveCvars(me.controlledTextbox);
 }
-void drawXonoticCharmap(entity me)
+void XonoticCharmap_draw(entity me)
 {
        if(me.focused)
        {
@@ -139,6 +139,6 @@ void drawXonoticCharmap(entity me)
                        draw_Picture(c, me.image2, '0.0625 0.1 0', '1 1 1', 1);
                }
        }
-       drawImage(me);
+       SUPER(XonoticCharmap).draw(me);
 }
 #endif
index ad8216a9fe64c8b90c96229381692224dc369d0b..c28edcc07070982cd6d6353d3629a3303d6ee231 100644 (file)
@@ -56,7 +56,7 @@ entity makeXonoticCheckBoxEx(float theYesValue, float theNoValue, string theCvar
        me.configureXonoticCheckBox(me, theYesValue, theNoValue, theCvar, theText);
        return me;
 }
-void configureXonoticCheckBoxXonoticCheckBox(entity me, float theYesValue, float theNoValue, string theCvar, string theText)
+void XonoticCheckBox_configureXonoticCheckBox(entity me, float theYesValue, float theNoValue, string theCvar, string theText)
 {
        me.yesValue = theYesValue;
        me.noValue = theNoValue;
@@ -69,7 +69,7 @@ void configureXonoticCheckBoxXonoticCheckBox(entity me, float theYesValue, float
        }
        me.configureCheckBox(me, theText, me.fontSize, me.image);
 }
-void setCheckedXonoticCheckBox(entity me, float val)
+void XonoticCheckBox_setChecked(entity me, float val)
 {
        if(val != me.checked)
        {
@@ -77,7 +77,7 @@ void setCheckedXonoticCheckBox(entity me, float val)
                me.saveCvars(me);
        }
 }
-void loadCvarsXonoticCheckBox(entity me)
+void XonoticCheckBox_loadCvars(entity me)
 {
        float m, d;
 
@@ -88,7 +88,7 @@ void loadCvarsXonoticCheckBox(entity me)
        d = (cvar(me.cvarName) - m) / (me.yesValue - m);
        me.checked = (d > 0);
 }
-void saveCvarsXonoticCheckBox(entity me)
+void XonoticCheckBox_saveCvars(entity me)
 {
        if not(me.cvarName)
                return;
index ea05c3fd067dd63699246b247c1a92f8aa27aaea..a9d2becc3d9ef8f47f7c5309918634a856edddad 100644 (file)
@@ -30,7 +30,7 @@ entity makeXonoticSliderCheckBox(float theOffValue, float isInverted, entity the
        me.configureXonoticSliderCheckBox(me, theOffValue, isInverted, theControlledSlider, theText);
        return me;
 }
-void configureXonoticSliderCheckBoxXonoticSliderCheckBox(entity me, float theOffValue, float isInverted, entity theControlledSlider, string theText)
+void XonoticSliderCheckBox_configureXonoticSliderCheckBox(entity me, float theOffValue, float isInverted, entity theControlledSlider, string theText)
 {
        me.offValue = theOffValue;
        me.inverted = isInverted;
@@ -43,14 +43,14 @@ void configureXonoticSliderCheckBoxXonoticSliderCheckBox(entity me, float theOff
        me.configureCheckBox(me, theText, me.fontSize, me.image);
        me.tooltip = theControlledSlider.tooltip;
 }
-void drawXonoticSliderCheckBox(entity me)
+void XonoticSliderCheckBox_draw(entity me)
 {
        me.checked = ((me.controlledSlider.value == me.offValue) != me.inverted);
        if(me.controlledSlider.value == median(me.controlledSlider.valueMin, me.controlledSlider.value, me.controlledSlider.valueMax))
                me.savedValue = me.controlledSlider.value;
-       drawCheckBox(me);
+       SUPER(XonoticSliderCheckBox).draw(me);
 }
-void setCheckedXonoticSliderCheckBox(entity me, float val)
+void XonoticSliderCheckBox_setChecked(entity me, float val)
 {
        if(me.checked == val)
                return;
index 84281b6af3229de04ecf39d696aa3961255fffb6..2ca8c86c4078d056c86ba0d8512709b7d45b5df8 100644 (file)
@@ -26,7 +26,7 @@ entity makeXonoticColorButton(float theGroup, float theColor, float theValue)
        me.configureXonoticColorButton(me, theGroup, theColor, theValue);
        return me;
 }
-void configureXonoticColorButtonXonoticColorButton(entity me, float theGroup, float theColor, float theValue)
+void XonoticColorButton_configureXonoticColorButton(entity me, float theGroup, float theColor, float theValue)
 {
        me.cvarName = "_cl_color";
        me.cvarValueFloat = theValue;
@@ -36,7 +36,7 @@ void configureXonoticColorButtonXonoticColorButton(entity me, float theGroup, fl
        me.srcMulti = 1;
        me.src2 = me.image2;
 }
-void setCheckedXonoticColorButton(entity me, float val)
+void XonoticColorButton_setChecked(entity me, float val)
 {
        if(val != me.checked)
        {
@@ -44,7 +44,7 @@ void setCheckedXonoticColorButton(entity me, float val)
                me.saveCvars(me);
        }
 }
-void loadCvarsXonoticColorButton(entity me)
+void XonoticColorButton_loadCvars(entity me)
 {
        if not(me.cvarName)
                return;
@@ -54,7 +54,7 @@ void loadCvarsXonoticColorButton(entity me)
        else
                me.checked = (cvar(me.cvarName) & 15) == me.cvarValueFloat;
 }
-void saveCvarsXonoticColorButton(entity me)
+void XonoticColorButton_saveCvars(entity me)
 {
        if not(me.cvarName)
                return;
@@ -68,9 +68,9 @@ void saveCvarsXonoticColorButton(entity me)
        }
        // TODO on an apply button, read _cl_color and execute the color command for it
 }
-void drawXonoticColorButton(entity me)
+void XonoticColorButton_draw(entity me)
 {
        me.color2 = colormapPaletteColor(me.cvarValueFloat, me.cvarPart);
-       drawCheckBox(me);
+       SUPER(XonoticColorButton).draw(me);
 }
 #endif
index a8403aee955b79c5171fd1c7e8e1b000894eb92c..b888358c3748fe6919a39da1a3f038f90702bc84 100644 (file)
@@ -24,13 +24,13 @@ entity makeXonoticColorpicker(entity theTextbox)
        return me;
 }
 
-void configureXonoticColorpickerXonoticColorpicker(entity me, entity theTextbox)
+void XonoticColorpicker_configureXonoticColorpicker(entity me, entity theTextbox)
 {
        me.controlledTextbox = theTextbox;
        me.configureImage(me, me.image);
 }
 
-float mousePressXonoticColorpicker(entity me, vector coords)
+float XonoticColorpicker_mousePress(entity me, vector coords)
 {
        me.mouseDrag(me, coords);
        return 1;
@@ -51,7 +51,7 @@ vector hslimage_color(vector v, vector margin)
         return hsl_to_rgb(v_x * 6 * eX + eY + v_y / 0.875 * eZ);
 }
 
-float mouseDragXonoticColorpicker(entity me, vector coords)
+float XonoticColorpicker_mouseDrag(entity me, vector coords)
 {
        float i;
        for(;;)
@@ -97,23 +97,23 @@ float mouseDragXonoticColorpicker(entity me, vector coords)
        return 1;
 }
 
-float mouseReleaseXonoticColorpicker(entity me, vector coords)
+float XonoticColorpicker_mouseRelease(entity me, vector coords)
 {
        me.mouseDrag(me, coords);
        return 1;
 }
 
-void focusLeaveXonoticColorpicker(entity me)
+void XonoticColorpicker_focusLeave(entity me)
 {
        me.controlledTextbox.saveCvars(me.controlledTextbox);
 }
-float keyDownXonoticColorpicker(entity me, float key, float ascii, float shift)
+float XonoticColorpicker_keyDown(entity me, float key, float ascii, float shift)
 {
        return me.controlledTextbox.keyDown(me.controlledTextbox, key, ascii, shift);
 }
-void drawXonoticColorpicker(entity me)
+void XonoticColorpicker_draw(entity me)
 {
-       drawImage(me);
+       SUPER(XonoticColorpicker).draw(me);
 
        float B, C, aC;
        C = cvar("r_textcontrast");
index b54805c7382c3baa09f4cb3a9ccc7ca520022895..8ee4e7de3a75503215591c49e643a68768c580bf 100644 (file)
@@ -33,7 +33,7 @@ void XonoticCommandButton_Click(entity me, entity other)
                m_goto(string_null);
 }
 
-void configureXonoticCommandButtonXonoticCommandButton(entity me, string theText, vector theColor, string theCommand, float theFlags)
+void XonoticCommandButton_configureXonoticCommandButton(entity me, string theText, vector theColor, string theCommand, float theFlags)
 {
        me.configureXonoticButton(me, theText, theColor);
        me.onClickCommand = theCommand;
index 9beb213c22c29df1989c29745ada4fb532b80183..5c2f1585c462479d2c47486599456d36beb09511 100644 (file)
@@ -26,18 +26,18 @@ entity makeXonoticCreditsList()
        me.configureXonoticCreditsList(me);
        return me;
 }
-void configureXonoticCreditsListXonoticCreditsList(entity me)
+void XonoticCreditsList_configureXonoticCreditsList(entity me)
 {
        me.configureXonoticListBox(me);
        // load the file
        me.bufferIndex = buf_load("xonotic-credits.txt");
        me.nItems = buf_getsize(me.bufferIndex);
 }
-void destroyXonoticCreditsList(entity me)
+void XonoticCreditsList_destroy(entity me)
 {
        buf_del(me.bufferIndex);
 }
-void drawXonoticCreditsList(entity me)
+void XonoticCreditsList_draw(entity me)
 {
        float i;
        if(me.scrolling)
@@ -47,17 +47,17 @@ void drawXonoticCreditsList(entity me)
                i = max(i, ceil(me.scrollPos / me.itemHeight));
                me.setSelected(me, i);
        }
-       drawListBox(me);
+       SUPER(XonoticCreditsList).draw(me);
 }
-void resizeNotifyXonoticCreditsList(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void XonoticCreditsList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
-       resizeNotifyXonoticListBox(me, relOrigin, relSize, absOrigin, absSize);
+       SUPER(XonoticCreditsList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
 
        me.realFontSize_y = me.fontSize / (absSize_y * me.itemHeight);
        me.realFontSize_x = me.fontSize / (absSize_x * (1 - me.controlWidth));
        me.realUpperMargin = 0.5 * (1 - me.realFontSize_y);
 }
-void drawListBoxItemXonoticCreditsList(entity me, float i, vector absSize, float isSelected)
+void XonoticCreditsList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
 {
        // layout: Ping, Credits name, Map name, NP, TP, MP
        string s;
@@ -87,7 +87,7 @@ void drawListBoxItemXonoticCreditsList(entity me, float i, vector absSize, float
        draw_CenterText(me.realUpperMargin * eY + 0.5 * eX, s, me.realFontSize, theColor, theAlpha, 0);
 }
 
-float keyDownXonoticCreditsList(entity me, float scan, float ascii, float shift)
+float XonoticCreditsList_keyDown(entity me, float scan, float ascii, float shift)
 {
        float i;
        me.dragScrollTimer = time;
@@ -102,7 +102,7 @@ float keyDownXonoticCreditsList(entity me, float scan, float ascii, float shift)
        else if(scan == K_DOWNARROW)
                me.scrollPos = min(me.scrollPos + me.itemHeight, me.nItems * me.itemHeight - 1);
        else
-               return keyDownListBox(me, scan, ascii, shift);
+               return SUPER(XonoticCreditsList).keyDown(me, scan, ascii, shift);
 
        i = min(me.selectedItem, floor((me.scrollPos + 1) / me.itemHeight - 1));
        i = max(i, ceil(me.scrollPos / me.itemHeight));
index 209677ff5df16248d727f7aa945b01053356e403..b290f3d218b1faab5a5ee5de4e8ff7770a827a09 100644 (file)
@@ -25,7 +25,7 @@ entity makeXonoticCrosshairButton(float theGroup, float theCrosshair)
        me.configureXonoticCrosshairButton(me, theGroup, theCrosshair);
        return me;
 }
-void configureXonoticCrosshairButtonXonoticCrosshairButton(entity me, float theGroup, float theCrosshair)
+void XonoticCrosshairButton_configureXonoticCrosshairButton(entity me, float theGroup, float theCrosshair)
 {
        me.cvarName = "crosshair";
        me.cvarValueFloat = theCrosshair;
@@ -34,7 +34,7 @@ void configureXonoticCrosshairButtonXonoticCrosshairButton(entity me, float theG
        me.srcMulti = 1;
        me.src3 = strzone(strcat("/gfx/crosshair", ftos(me.cvarValueFloat)));
 }
-void setCheckedXonoticCrosshairButton(entity me, float val)
+void XonoticCrosshairButton_setChecked(entity me, float val)
 {
        if(val != me.checked)
        {
@@ -42,14 +42,14 @@ void setCheckedXonoticCrosshairButton(entity me, float val)
                me.saveCvars(me);
        }
 }
-void loadCvarsXonoticCrosshairButton(entity me)
+void XonoticCrosshairButton_loadCvars(entity me)
 {
        if not(me.cvarName)
                return;
 
        me.checked = (cvar(me.cvarName) == me.cvarValueFloat);
 }
-void saveCvarsXonoticCrosshairButton(entity me)
+void XonoticCrosshairButton_saveCvars(entity me)
 {
        if not(me.cvarName)
                return;
@@ -58,7 +58,7 @@ void saveCvarsXonoticCrosshairButton(entity me)
                cvar_set(me.cvarName, ftos(me.cvarValueFloat));
        // TODO on an apply button, read _cl_color and execute the color command for it
 }
-void drawXonoticCrosshairButton(entity me)
+void XonoticCrosshairButton_draw(entity me)
 {
        vector sz, rgb;
        float a;
@@ -72,7 +72,7 @@ void drawXonoticCrosshairButton(entity me)
                rgb = '1 1 1';
        }
 
-       drawCheckBox(me);
+       SUPER(XonoticCrosshairButton).draw(me);
 
        sz = draw_PictureSize(me.src3);
        sz = globalToBoxSize(sz, draw_scale);
index cf3cd940fa52d13c55d451cd82fdcf9eb1b01a63..387396bbaf050b0001950d589d8ecdf24d2a276d 100644 (file)
@@ -43,7 +43,7 @@ entity makeXonoticCvarList()
        me.configureXonoticCvarList(me);
        return me;
 }
-void configureXonoticCvarListXonoticCvarList(entity me)
+void XonoticCvarList_configureXonoticCvarList(entity me)
 {
        me.configureXonoticListBox(me);
 
@@ -51,15 +51,15 @@ void configureXonoticCvarListXonoticCvarList(entity me)
        buf_cvarlist(me.handle, "", "_");
        me.nItems = buf_getsize(me.handle);
 }
-void destroyXonoticCvarList(entity me)
+void XonoticCvarList_destroy(entity me)
 {
        buf_del(me.handle);
 }
-void setSelectedXonoticCvarList(entity me, float i)
+void XonoticCvarList_setSelected(entity me, float i)
 {
        string s;
 
-       setSelectedListBox(me, i);
+       SUPER(XonoticCvarList).setSelected(me, i);
        if(me.nItems == 0)
                return;
        
@@ -107,9 +107,9 @@ void CvarList_Filter_Change(entity box, entity me)
 
        me.setSelected(me, 0);
 }
-void resizeNotifyXonoticCvarList(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void XonoticCvarList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
-       resizeNotifyXonoticListBox(me, relOrigin, relSize, absOrigin, absSize);
+       SUPER(XonoticCvarList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
 
        me.realFontSize_y = me.fontSize / (absSize_y * me.itemHeight);
        me.realFontSize_x = me.fontSize / (absSize_x * (1 - me.controlWidth));
@@ -122,7 +122,7 @@ void resizeNotifyXonoticCvarList(entity me, vector relOrigin, vector relSize, ve
 
        me.setSelected(me, me.selectedItem);
 }
-void drawListBoxItemXonoticCvarList(entity me, float i, vector absSize, float isSelected)
+void XonoticCvarList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
 {
        string k, v, d;
        float t;
@@ -155,9 +155,9 @@ void drawListBoxItemXonoticCvarList(entity me, float i, vector absSize, float is
        draw_Text(me.realUpperMargin * eY + me.columnValueOrigin * eX, s, me.realFontSize, theColor, theAlpha, 0);
 }
 
-float keyDownXonoticCvarList(entity me, float scan, float ascii, float shift)
+float XonoticCvarList_keyDown(entity me, float scan, float ascii, float shift)
 {
-       if(keyDownListBox(me, scan, ascii, shift))
+       if(SUPER(XonoticCvarList).keyDown(me, scan, ascii, shift))
                return 1;
        else if(!me.controlledTextbox)
                return 0;
index 7a2d338ea382efc88361ca91daa48bff07cf7112..0882a3ed4af375cfb0b157c411c3fe112e27c311 100644 (file)
@@ -39,13 +39,13 @@ entity makeXonoticDemoList()
     return me;
 }
 
-void configureXonoticDemoListXonoticDemoList(entity me)
+void XonoticDemoList_configureXonoticDemoList(entity me)
 {
     me.configureXonoticListBox(me);
     me.getDemos(me);    
 }
 
-string demoNameXonoticDemoList(entity me, float i )
+string XonoticDemoList_demoName(entity me, float i )
 {
     string s;
     s = search_getfilename(me.listDemo, i);
@@ -54,7 +54,7 @@ string demoNameXonoticDemoList(entity me, float i )
 }
 
 
-void getDemosXonoticDemoList(entity me)
+void XonoticDemoList_getDemos(entity me)
 {
     string s;
     
@@ -74,15 +74,15 @@ void getDemosXonoticDemoList(entity me)
        me.nItems=search_getsize(me.listDemo);                          
 }
 
-void destroyXonoticDemoList(entity me)
+void XonoticDemoList_destroy(entity me)
 {
     search_end(me.listDemo);
 }
 
-void resizeNotifyXonoticDemoList(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void XonoticDemoList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
     me.itemAbsSize = '0 0 0';
-    resizeNotifyXonoticListBox(me, relOrigin, relSize, absOrigin, absSize);
+    SUPER(XonoticDemoList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
 
     me.realFontSize_y = me.fontSize / (me.itemAbsSize_y = (absSize_y * me.itemHeight));
     me.realFontSize_x = me.fontSize / (me.itemAbsSize_x = (absSize_x * (1 - me.controlWidth)));
@@ -92,7 +92,7 @@ void resizeNotifyXonoticDemoList(entity me, vector relOrigin, vector relSize, ve
     me.columnNameSize = 1 - 2 * me.realFontSize_x;
 }
 
-void drawListBoxItemXonoticDemoList(entity me, float i, vector absSize, float isSelected)
+void XonoticDemoList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
 {
     string s;
     if(isSelected)
@@ -103,7 +103,7 @@ void drawListBoxItemXonoticDemoList(entity me, float i, vector absSize, float is
     draw_Text(me.realUpperMargin * eY + (me.columnNameOrigin + 0.00 * (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize))) * eX, s, me.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);              
 }
 
-void showNotifyXonoticDemoList(entity me)
+void XonoticDemoList_showNotify(entity me)
 {
     me.getDemos(me);
 }
@@ -121,7 +121,7 @@ void DemoList_Filter_Change(entity box, entity me)
     me.getDemos(me);
 }
 
-void startDemoXonoticDemoList(entity me)
+void XonoticDemoList_startDemo(entity me)
 {
     string s;
     s = me.demoName(me,me.selectedItem);
@@ -140,7 +140,7 @@ void TimeDemo_Click(entity btn, entity me)
     localcmd("timedemo demos/", s, ".dem\nwait\ntogglemenu\n");        
 }
 
-void clickListBoxItemXonoticDemoList(entity me, float i, vector where)
+void XonoticDemoList_clickListBoxItem(entity me, float i, vector where)
 {
     if(i == me.lastClickedDemo)
         if(time < me.lastClickedTime + 0.3)
@@ -153,14 +153,14 @@ void clickListBoxItemXonoticDemoList(entity me, float i, vector where)
     me.lastClickedTime = time;
 }
 
-float keyDownXonoticDemoList(entity me, float scan, float ascii, float shift)
+float XonoticDemoList_keyDown(entity me, float scan, float ascii, float shift)
 {
     if(scan == K_ENTER) {
         me.startDemo(me);
         return 1;
     }
     else
-        return keyDownListBox(me, scan, ascii, shift);
+        return SUPER(XonoticDemoList).keyDown(me, scan, ascii, shift);
 }
 #endif
 
index badfbaf4449b1a015ee005b457f9b53928d020ab..7087d83cb9707987437edd588a45f71119ec8b14 100644 (file)
@@ -33,10 +33,10 @@ entity currentDialog;
 #endif
 
 #ifdef IMPLEMENTATION
-void configureDialogXonoticDialog(entity me)
+void XonoticDialog_configureDialog(entity me)
 {
        currentDialog = me;
-       configureDialogDialog(me);
+       SUPER(XonoticDialog).configureDialog(me);
        me.tooltip = getZonedTooltipForIdentifier(me.classname);
 }
 #endif
index bcd3545d9cb67a6a1b65e5984b2bf255febb09f3..07c2fc4f293bca09b22c1089263c274e66324bc2 100644 (file)
@@ -12,7 +12,7 @@ ENDCLASS(XonoticCreditsDialog)
 #endif
 
 #ifdef IMPLEMENTATION
-void fillXonoticCreditsDialog(entity me)
+void XonoticCreditsDialog_fill(entity me)
 {
        entity e;
        me.TR(me);
@@ -22,7 +22,7 @@ void fillXonoticCreditsDialog(entity me)
                        e.onClick = Dialog_Close;
                        e.onClickEntity = me;
 }
-void focusEnterXonoticCreditsDialog(entity me)
+void XonoticCreditsDialog_focusEnter(entity me)
 {
        me.creditsList.scrolling = time + 1;
 }
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_chat.c b/qcsrc/menu/xonotic/dialog_hudpanel_chat.c
new file mode 100644 (file)
index 0000000..cd9f385
--- /dev/null
@@ -0,0 +1,38 @@
+#ifdef INTERFACE
+CLASS(XonoticHUDChatDialog) EXTENDS(XonoticRootDialog)
+       METHOD(XonoticHUDChatDialog, fill, void(entity))
+       ATTRIB(XonoticHUDChatDialog, title, string, "Chat Panel Setup")
+       ATTRIB(XonoticHUDChatDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+       ATTRIB(XonoticHUDChatDialog, intendedWidth, float, 0.4)
+       ATTRIB(XonoticHUDChatDialog, rows, float, 15)
+       ATTRIB(XonoticHUDChatDialog, columns, float, 4)
+       ATTRIB(XonoticHUDChatDialog, name, string, "HUDchat")
+ENDCLASS(XonoticHUDChatDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticHUDChatDialog_fill(entity me)
+{
+       entity e;
+       me.TR(me);
+               me.TR(me);
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_chat", "On/Off"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_chat_bg_color_team"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_chat_bg_alpha"));
+       me.TR(me);
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Font size:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(6, 16, 1, "con_chatsize"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Message lifetime:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(16, 40, 2, "con_chattime"));
+               me.TR(me);
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "con_chatsound", "Message sound beep"));
+       //me.gotoRC(me, me.rows - 1, 0);
+               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+}
+#endif
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c b/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c
new file mode 100644 (file)
index 0000000..e2e896b
--- /dev/null
@@ -0,0 +1,39 @@
+#ifdef INTERFACE
+CLASS(XonoticHUDHealthArmorDialog) EXTENDS(XonoticRootDialog)
+       METHOD(XonoticHUDHealthArmorDialog, fill, void(entity))
+       ATTRIB(XonoticHUDHealthArmorDialog, title, string, "Health/Armor Panel Setup")
+       ATTRIB(XonoticHUDHealthArmorDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+       ATTRIB(XonoticHUDHealthArmorDialog, intendedWidth, float, 0.4)
+       ATTRIB(XonoticHUDHealthArmorDialog, rows, float, 15)
+       ATTRIB(XonoticHUDHealthArmorDialog, columns, float, 4)
+       ATTRIB(XonoticHUDHealthArmorDialog, name, string, "HUDhealtharmor")
+ENDCLASS(XonoticHUDHealthArmorDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticHUDHealthArmorDialog_fill(entity me)
+{
+       entity e;
+       me.TR(me);
+               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Status:"));
+               me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_healtharmor"));
+                       e.addValue(e, "Disabled", "0");
+                       e.addValue(e, "Enabled", "1");
+                       e.addValue(e, "Combined h/a", "2");
+                       e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_healtharmor_bg_color_team"));
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
+                       me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_healtharmor_bg_alpha"));
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_healtharmor_flip", "Flip"));
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_healtharmor_mirror", "Mirror"));
+       //me.gotoRC(me, me.rows - 1, 0);
+               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+}
+#endif
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_inventory.c b/qcsrc/menu/xonotic/dialog_hudpanel_inventory.c
new file mode 100644 (file)
index 0000000..b67210a
--- /dev/null
@@ -0,0 +1,32 @@
+#ifdef INTERFACE
+CLASS(XonoticHUDInventoryDialog) EXTENDS(XonoticRootDialog)
+       METHOD(XonoticHUDInventoryDialog, fill, void(entity))
+       ATTRIB(XonoticHUDInventoryDialog, title, string, "Inventory Panel Setup")
+       ATTRIB(XonoticHUDInventoryDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+       ATTRIB(XonoticHUDInventoryDialog, intendedWidth, float, 0.4)
+       ATTRIB(XonoticHUDInventoryDialog, rows, float, 15)
+       ATTRIB(XonoticHUDInventoryDialog, columns, float, 4)
+       ATTRIB(XonoticHUDInventoryDialog, name, string, "HUDinventory")
+ENDCLASS(XonoticHUDInventoryDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticHUDInventoryDialog_fill(entity me)
+{
+       entity e;
+       me.TR(me);
+               me.TR(me);
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "hud_inventory", "On/Off"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_inventory_bg_color_team"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_inventory_bg_alpha"));
+               me.TR(me);
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_inventory_onlycurrent", "Show Current Ammo Only"));             
+       me.TR(me);
+       //me.gotoRC(me, me.rows - 1, 0);
+               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+}
+#endif
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_modicons.c b/qcsrc/menu/xonotic/dialog_hudpanel_modicons.c
new file mode 100644 (file)
index 0000000..8635dae
--- /dev/null
@@ -0,0 +1,30 @@
+#ifdef INTERFACE
+CLASS(XonoticHUDModIconsDialog) EXTENDS(XonoticRootDialog)
+       METHOD(XonoticHUDModIconsDialog, fill, void(entity))
+       ATTRIB(XonoticHUDModIconsDialog, title, string, "Mod Icons Panel Setup")
+       ATTRIB(XonoticHUDModIconsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+       ATTRIB(XonoticHUDModIconsDialog, intendedWidth, float, 0.4)
+       ATTRIB(XonoticHUDModIconsDialog, rows, float, 15)
+       ATTRIB(XonoticHUDModIconsDialog, columns, float, 4)
+       ATTRIB(XonoticHUDModIconsDialog, name, string, "HUDmodicons")
+ENDCLASS(XonoticHUDModIconsDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticHUDModIconsDialog_fill(entity me)
+{
+       entity e;
+       me.TR(me);
+               me.TR(me);
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_modicons", "On/Off"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_modicons_bg_color_team"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_modicons_bg_alpha"));
+       me.TR(me);
+       //me.gotoRC(me, me.rows - 1, 0);
+               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+}
+#endif
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_notification.c b/qcsrc/menu/xonotic/dialog_hudpanel_notification.c
new file mode 100644 (file)
index 0000000..503d50a
--- /dev/null
@@ -0,0 +1,40 @@
+#ifdef INTERFACE
+CLASS(XonoticHUDNotificationDialog) EXTENDS(XonoticRootDialog)
+       METHOD(XonoticHUDNotificationDialog, fill, void(entity))
+       ATTRIB(XonoticHUDNotificationDialog, title, string, "Notification Panel Setup")
+       ATTRIB(XonoticHUDNotificationDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+       ATTRIB(XonoticHUDNotificationDialog, intendedWidth, float, 0.4)
+       ATTRIB(XonoticHUDNotificationDialog, rows, float, 15)
+       ATTRIB(XonoticHUDNotificationDialog, columns, float, 4)
+       ATTRIB(XonoticHUDNotificationDialog, name, string, "HUDnotify")
+ENDCLASS(XonoticHUDNotificationDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticHUDNotificationDialog_fill(entity me)
+{
+       entity e;
+       me.TR(me);
+               me.TR(me);
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_notify", "On/Off"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_notify_bg_color_team"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_notify_bg_alpha"));
+               me.TR(me);
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_notify_flip", "Flip"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Message lifetime:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(3, 15, 1, "hud_notify_time"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Message fadetime:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(1, 5, 1, "hud_notify_fadetime"));
+               me.TR(me);
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_notify_print", "Also print messages to console"));
+       me.TR(me);
+       //me.gotoRC(me, me.rows - 1, 0);
+               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+}
+#endif
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_powerups.c b/qcsrc/menu/xonotic/dialog_hudpanel_powerups.c
new file mode 100644 (file)
index 0000000..b6d4232
--- /dev/null
@@ -0,0 +1,34 @@
+#ifdef INTERFACE
+CLASS(XonoticHUDPowerupsDialog) EXTENDS(XonoticRootDialog)
+       METHOD(XonoticHUDPowerupsDialog, fill, void(entity))
+       ATTRIB(XonoticHUDPowerupsDialog, title, string, "Powerups Panel Setup")
+       ATTRIB(XonoticHUDPowerupsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+       ATTRIB(XonoticHUDPowerupsDialog, intendedWidth, float, 0.4)
+       ATTRIB(XonoticHUDPowerupsDialog, rows, float, 15)
+       ATTRIB(XonoticHUDPowerupsDialog, columns, float, 4)
+       ATTRIB(XonoticHUDPowerupsDialog, name, string, "HUDpowerups")
+ENDCLASS(XonoticHUDPowerupsDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticHUDPowerupsDialog_fill(entity me)
+{
+       entity e;
+       me.TR(me);
+               me.TR(me);
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_powerups", "On/Off"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_powerups_bg_color_team"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_powerups_bg_alpha"));
+               me.TR(me);
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_powerups_flip", "Flip"));
+               me.TR(me);
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_powerups_mirror", "Mirror"));
+       me.TR(me);
+       //me.gotoRC(me, me.rows - 1, 0);
+               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+}
+#endif
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c b/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c
new file mode 100644 (file)
index 0000000..9b66fc3
--- /dev/null
@@ -0,0 +1,30 @@
+#ifdef INTERFACE
+CLASS(XonoticHUDPressedKeysDialog) EXTENDS(XonoticRootDialog)
+       METHOD(XonoticHUDPressedKeysDialog, fill, void(entity))
+       ATTRIB(XonoticHUDPressedKeysDialog, title, string, "Pressed Keys Panel Setup")
+       ATTRIB(XonoticHUDPressedKeysDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+       ATTRIB(XonoticHUDPressedKeysDialog, intendedWidth, float, 0.4)
+       ATTRIB(XonoticHUDPressedKeysDialog, rows, float, 15)
+       ATTRIB(XonoticHUDPressedKeysDialog, columns, float, 4)
+       ATTRIB(XonoticHUDPressedKeysDialog, name, string, "HUDpressedkeys")
+ENDCLASS(XonoticHUDPressedKeysDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticHUDPressedKeysDialog_fill(entity me)
+{
+       entity e;
+       me.TR(me);
+               me.TR(me);
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_pressedkeys", "On/Off"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_pressedkeys_bg_color_team"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_pressedkeys_bg_alpha"));
+       me.TR(me);
+       //me.gotoRC(me, me.rows - 1, 0);
+               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+}
+#endif
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.c b/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.c
new file mode 100644 (file)
index 0000000..7fe0f68
--- /dev/null
@@ -0,0 +1,30 @@
+#ifdef INTERFACE
+CLASS(XonoticHUDRaceTimerDialog) EXTENDS(XonoticRootDialog)
+       METHOD(XonoticHUDRaceTimerDialog, fill, void(entity))
+       ATTRIB(XonoticHUDRaceTimerDialog, title, string, "Race Timer Panel Setup")
+       ATTRIB(XonoticHUDRaceTimerDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+       ATTRIB(XonoticHUDRaceTimerDialog, intendedWidth, float, 0.4)
+       ATTRIB(XonoticHUDRaceTimerDialog, rows, float, 15)
+       ATTRIB(XonoticHUDRaceTimerDialog, columns, float, 4)
+       ATTRIB(XonoticHUDRaceTimerDialog, name, string, "HUDracetimer")
+ENDCLASS(XonoticHUDRaceTimerDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticHUDRaceTimerDialog_fill(entity me)
+{
+       entity e;
+       me.TR(me);
+               me.TR(me);
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_racetimer", "On/Off"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_racetimer_bg_color_team"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_racetimer_bg_alpha"));
+       me.TR(me);
+       //me.gotoRC(me, me.rows - 1, 0);
+               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+}
+#endif
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_radar.c b/qcsrc/menu/xonotic/dialog_hudpanel_radar.c
new file mode 100644 (file)
index 0000000..a0ead55
--- /dev/null
@@ -0,0 +1,50 @@
+#ifdef INTERFACE
+CLASS(XonoticHUDRadarDialog) EXTENDS(XonoticRootDialog)
+       METHOD(XonoticHUDRadarDialog, fill, void(entity))
+       ATTRIB(XonoticHUDRadarDialog, title, string, "Radar Panel Setup")
+       ATTRIB(XonoticHUDRadarDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+       ATTRIB(XonoticHUDRadarDialog, intendedWidth, float, 0.4)
+       ATTRIB(XonoticHUDRadarDialog, rows, float, 15)
+       ATTRIB(XonoticHUDRadarDialog, columns, float, 4)
+       ATTRIB(XonoticHUDRadarDialog, name, string, "HUDradar")
+ENDCLASS(XonoticHUDRadarDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticHUDRadarDialog_fill(entity me)
+{
+       entity e;
+       me.TR(me);
+               me.TR(me);
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_radar", "On/Off"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_radar_bg_color_team"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_radar_bg_alpha"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Foreground Alpha:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_radar_foreground_alpha"));
+               me.TR(me);
+                       me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Rotation:"));
+                       me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_radar_rotation"));
+                               e.addValue(e, "Player", "0");
+                               e.addValue(e, "West", "1");
+                               e.addValue(e, "South", "2");
+                               e.addValue(e, "East", "3");
+                               e.addValue(e, "North", "4");
+                               e.configureXonoticTextSliderValues(e);
+               me.TR(me);
+                       me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Zoom:"));
+                       me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_radar_zoommode"));
+                               e.addValue(e, "Default", "0");
+                               e.addValue(e, "Zoomed", "1");
+                               e.addValue(e, "Always Zoomed", "2");
+                               e.addValue(e, "Zoomed Out", "3");
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+       //me.gotoRC(me, me.rows - 1, 0);
+               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+}
+#endif
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_score.c b/qcsrc/menu/xonotic/dialog_hudpanel_score.c
new file mode 100644 (file)
index 0000000..05fdb74
--- /dev/null
@@ -0,0 +1,30 @@
+#ifdef INTERFACE
+CLASS(XonoticHUDScoreDialog) EXTENDS(XonoticRootDialog)
+       METHOD(XonoticHUDScoreDialog, fill, void(entity))
+       ATTRIB(XonoticHUDScoreDialog, title, string, "Score Panel Setup")
+       ATTRIB(XonoticHUDScoreDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+       ATTRIB(XonoticHUDScoreDialog, intendedWidth, float, 0.4)
+       ATTRIB(XonoticHUDScoreDialog, rows, float, 15)
+       ATTRIB(XonoticHUDScoreDialog, columns, float, 4)
+       ATTRIB(XonoticHUDScoreDialog, name, string, "HUDscore")
+ENDCLASS(XonoticHUDScoreDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticHUDScoreDialog_fill(entity me)
+{
+       entity e;
+       me.TR(me);
+               me.TR(me);
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_score", "On/Off"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_score_bg_color_team"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_score_bg_alpha"));
+       me.TR(me);
+       //me.gotoRC(me, me.rows - 1, 0);
+               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+}
+#endif
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_timer.c b/qcsrc/menu/xonotic/dialog_hudpanel_timer.c
new file mode 100644 (file)
index 0000000..6bfa03b
--- /dev/null
@@ -0,0 +1,30 @@
+#ifdef INTERFACE
+CLASS(XonoticHUDTimerDialog) EXTENDS(XonoticRootDialog)
+       METHOD(XonoticHUDTimerDialog, fill, void(entity))
+       ATTRIB(XonoticHUDTimerDialog, title, string, "Timer Panel Setup")
+       ATTRIB(XonoticHUDTimerDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+       ATTRIB(XonoticHUDTimerDialog, intendedWidth, float, 0.4)
+       ATTRIB(XonoticHUDTimerDialog, rows, float, 15)
+       ATTRIB(XonoticHUDTimerDialog, columns, float, 4)
+       ATTRIB(XonoticHUDTimerDialog, name, string, "HUDtimer")
+ENDCLASS(XonoticHUDTimerDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticHUDTimerDialog_fill(entity me)
+{
+       entity e;
+       me.TR(me);
+               me.TR(me);
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_timer", "On/Off"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_timer_bg_color_team"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_timer_bg_alpha"));
+       me.TR(me);
+       //me.gotoRC(me, me.rows - 1, 0);
+               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+}
+#endif
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_vote.c b/qcsrc/menu/xonotic/dialog_hudpanel_vote.c
new file mode 100644 (file)
index 0000000..e96af57
--- /dev/null
@@ -0,0 +1,30 @@
+#ifdef INTERFACE
+CLASS(XonoticHUDVoteDialog) EXTENDS(XonoticRootDialog)
+       METHOD(XonoticHUDVoteDialog, fill, void(entity))
+       ATTRIB(XonoticHUDVoteDialog, title, string, "Vote Panel Setup")
+       ATTRIB(XonoticHUDVoteDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+       ATTRIB(XonoticHUDVoteDialog, intendedWidth, float, 0.4)
+       ATTRIB(XonoticHUDVoteDialog, rows, float, 15)
+       ATTRIB(XonoticHUDVoteDialog, columns, float, 4)
+       ATTRIB(XonoticHUDVoteDialog, name, string, "HUDvote")
+ENDCLASS(XonoticHUDVoteDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticHUDVoteDialog_fill(entity me)
+{
+       entity e;
+       me.TR(me);
+               me.TR(me);
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_vote", "On/Off"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_vote_bg_color_team"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_vote_bg_alpha"));
+       me.TR(me);
+       //me.gotoRC(me, me.rows - 1, 0);
+               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+}
+#endif
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_weaponicons.c b/qcsrc/menu/xonotic/dialog_hudpanel_weaponicons.c
new file mode 100644 (file)
index 0000000..1a55bce
--- /dev/null
@@ -0,0 +1,32 @@
+#ifdef INTERFACE
+CLASS(XonoticHUDWeaponIconsDialog) EXTENDS(XonoticRootDialog)
+       METHOD(XonoticHUDWeaponIconsDialog, fill, void(entity))
+       ATTRIB(XonoticHUDWeaponIconsDialog, title, string, "Weapon Icons Panel Setup")
+       ATTRIB(XonoticHUDWeaponIconsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+       ATTRIB(XonoticHUDWeaponIconsDialog, intendedWidth, float, 0.4)
+       ATTRIB(XonoticHUDWeaponIconsDialog, rows, float, 15)
+       ATTRIB(XonoticHUDWeaponIconsDialog, columns, float, 4)
+       ATTRIB(XonoticHUDWeaponIconsDialog, name, string, "HUDweaponicons")
+ENDCLASS(XonoticHUDWeaponIconsDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticHUDWeaponIconsDialog_fill(entity me)
+{
+       entity e;
+       me.TR(me);
+               me.TR(me);
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_weaponicons", "On/Off"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_weaponicons_bg_color_team"));
+               me.TR(me);
+                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
+                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_weaponicons_bg_alpha"));
+               me.TR(me);
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "hud_weaponicons_number", "Show Weapon Number"));
+       me.TR(me);
+       //me.gotoRC(me, me.rows - 1, 0);
+               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+}
+#endif
diff --git a/qcsrc/menu/xonotic/dialog_hudsetup_exit.c b/qcsrc/menu/xonotic/dialog_hudsetup_exit.c
new file mode 100644 (file)
index 0000000..da75603
--- /dev/null
@@ -0,0 +1,57 @@
+#ifdef INTERFACE
+CLASS(XonoticHUDExitDialog) EXTENDS(XonoticRootDialog)
+       METHOD(XonoticHUDExitDialog, fill, void(entity))
+       ATTRIB(XonoticHUDExitDialog, title, string, "HUD Setup")
+       ATTRIB(XonoticHUDExitDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+       ATTRIB(XonoticHUDExitDialog, intendedWidth, float, 0.4)
+       ATTRIB(XonoticHUDExitDialog, rows, float, 15)
+       ATTRIB(XonoticHUDExitDialog, columns, float, 4)
+       ATTRIB(XonoticHUDExitDialog, name, string, "HUDExit")
+ENDCLASS(XonoticHUDExitDialog)
+
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticHUDExitDialog_fill(entity me)
+{
+       entity e;
+       me.TR(me);
+               me.TD(me, 1, 4, makeXonoticTextLabel(0, "Panel Defaults:"));
+                       me.TR(me);
+                               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_bg", "Panel Background"));
+                       me.TR(me);
+                               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
+                                       me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_bg_color_team"));
+                       me.TR(me);
+                               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
+                                       me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_bg_alpha"));
+                       me.TR(me);
+                               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Foreground Alpha:"));
+                                       me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_fg_alpha"));
+                       me.TR(me);
+                               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Progress Bar Alpha:"));
+                                       me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_progressbar_alpha"));
+                       me.TR(me);
+                               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_checkcollisions", "Collision Check"));
+       me.TR(me);
+       
+       me.TR(me);
+               me.TD(me, 1, 4, makeXonoticTextLabel(0, "Dock Settings:"));
+
+                       me.TR(me);
+                               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
+                                       me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_dock_color_team"));
+                       me.TR(me);      
+                               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Dock Alpha:"));
+                                       me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_dock_alpha"));
+       me.TR(me);
+       
+       me.TR(me);
+               me.TD(me, 1, 4, makeXonoticTextLabel(0, "Grid Settings:"));
+
+                       me.TR(me);
+                               me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "hud_configure_grid", "Snap Panel to Grid"));
+                       me.gotoRC(me, me.rows - 1, 0);
+                               me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+}
+#endif
index 6bbe66dd164a44aba1cc6849ddb1844431ded24f..e755710c5b31bb0bb69de0cb5d85be32c85f4380 100644 (file)
@@ -10,7 +10,7 @@ ENDCLASS(XonoticMultiplayerDialog)
 #endif
 
 #ifdef IMPLEMENTATION
-void fillXonoticMultiplayerDialog(entity me)
+void XonoticMultiplayerDialog_fill(entity me)
 {
        entity mc, e;
        mc = makeXonoticTabController(me.rows - 2);
index 51ed2d442bf81d16f58b41b7e66f77f47c88a959..3aea0e4858615ec2b5f2e8c72d4a49426daf16f5 100644 (file)
@@ -26,7 +26,7 @@ entity makeXonoticServerCreateTab()
        return me;
 }
 
-void fillXonoticServerCreateTab(entity me)
+void XonoticServerCreateTab_fill(entity me)
 {
        entity e, e0;
        float n;
@@ -195,7 +195,7 @@ void GameType_ConfigureSliders(entity e, entity l, entity l2, string pLabel, flo
        }
 }
 
-void gameTypeChangeNotifyXonoticServerCreateTab(entity me)
+void XonoticServerCreateTab_gameTypeChangeNotify(entity me)
 {
        // tell the map list to update
        float gt;
index 160f15d2658a36dbcc15eaeeda2eca051a951c56..2d75d43652512e6cdcf2dac5b010de2bf13f320f 100644 (file)
@@ -13,12 +13,12 @@ ENDCLASS(XonoticAdvancedDialog)
 #endif
 
 #ifdef IMPLEMENTATION
-void showNotifyXonoticAdvancedDialog(entity me)
+void XonoticAdvancedDialog_showNotify(entity me)
 {
        loadAllCvars(me);
 }
 
-void fillXonoticAdvancedDialog(entity me)
+void XonoticAdvancedDialog_fill(entity me)
 {
        entity e;
        me.TR(me);
@@ -69,10 +69,10 @@ void fillXonoticAdvancedDialog(entity me)
                        e.onClickEntity = me;
 }
 
-void closeXonoticAdvancedDialog(entity me)
+void XonoticAdvancedDialog_close(entity me)
 {
        if(me.refilterEntity)
                me.refilterEntity.refilter(me.refilterEntity);
-       closeDialog(me);
+       SUPER(XonoticAdvancedDialog).close(me);
 }
 #endif
index e4056ba7ef3d8f0aa4a0ff96c6f621c097d41e01..05ed89887d3ce94f165028a286896b37addb89e3 100644 (file)
@@ -40,7 +40,7 @@ ENDCLASS(XonoticMapInfoDialog)
 #endif
 
 #ifdef IMPLEMENTATION
-void loadMapInfoXonoticMapInfoDialog(entity me, float i, entity mlb)
+void XonoticMapInfoDialog_loadMapInfo(entity me, float i, entity mlb)
 {
        me.currentMapIndex = i;
        me.startButton.onClickEntity = mlb;
@@ -86,7 +86,7 @@ void loadMapInfoXonoticMapInfoDialog(entity me, float i, entity mlb)
 
        MapInfo_ClearTemps();
 }
-void fillXonoticMapInfoDialog(entity me)
+void XonoticMapInfoDialog_fill(entity me)
 {
        entity e;
        float w, wgt;
index 12d7e4fccb980ce15b539d6a80ae9662faa55bb1..517f68bd311b7ee10176b8f8ab1e9b8a65127905 100644 (file)
@@ -14,7 +14,7 @@ ENDCLASS(XonoticMutatorsDialog)
 #endif
 
 #ifdef IMPLEMENTATION
-void showNotifyXonoticMutatorsDialog(entity me)
+void XonoticMutatorsDialog_showNotify(entity me)
 {
        loadAllCvars(me);
 }
@@ -60,7 +60,7 @@ string WeaponArenaString()
        return weaponarenastring;
 }
 
-string toStringXonoticMutatorsDialog(entity me)
+string XonoticMutatorsDialog_toString(entity me)
 {
        string s;
        s = "";
@@ -157,7 +157,7 @@ void preDrawLaserWeaponArenaLaserButton(entity me)
 
 
 
-void fillXonoticMutatorsDialog(entity me)
+void XonoticMutatorsDialog_fill(entity me)
 {
        entity e, s, w;
        float i, j;
@@ -276,10 +276,10 @@ void fillXonoticMutatorsDialog(entity me)
                        e.onClickEntity = me;
 }
 
-void closeXonoticMutatorsDialog(entity me)
+void XonoticMutatorsDialog_close(entity me)
 {
        if(me.refilterEntity)
                me.refilterEntity.refilter(me.refilterEntity);
-       closeDialog(me);
+       SUPER(XonoticMutatorsDialog).close(me);
 }
 #endif
index 20d8c9d42f1534d678064deabcba1233f843825a..ec57b7fca809ec5e917f1bceafc6d82e59bf07c5 100644 (file)
@@ -18,7 +18,7 @@ entity makeXonoticDemoBrowserTab()
        me.configureDialog(me);
        return me;
 }
-void fillXonoticDemoBrowserTab(entity me)
+void XonoticDemoBrowserTab_fill(entity me)
 {
        entity e;
        entity btn;
index 130f2dea0e66905a1d5426c174d062c67f0eb49f..799d33455f19f0015025c141d4e84612c01089ab 100644 (file)
@@ -18,7 +18,7 @@ entity makeXonoticServerListTab()
        me.configureDialog(me);
        return me;
 }
-void fillXonoticServerListTab(entity me)
+void XonoticServerListTab_fill(entity me)
 {
        entity e, slist, btn;
 
index 0eb42c144eedf656f39d4d4374e668a1b6586b84..7770230d316d1d39bc1930499e92c8291496fdb8 100644 (file)
@@ -45,7 +45,7 @@ void Join_Click(entity btn, entity me);
 #endif
 
 #ifdef IMPLEMENTATION
-void loadServerInfoXonoticServerInfoDialog(entity me, float i)
+void XonoticServerInfoDialog_loadServerInfo(entity me, float i)
 {
        float m;
        string s, typestr, versionstr, numh, maxp;
@@ -108,7 +108,7 @@ void loadServerInfoXonoticServerInfoDialog(entity me, float i)
        me.pingLabel.setText(me.pingLabel, me.currentServerPing);
 }
 
-void fillXonoticServerInfoDialog(entity me)
+void XonoticServerInfoDialog_fill(entity me)
 {
        entity e;
        me.TR(me);
index f3d3fbf758dd40dc3a7468c37a13fa1a1894da6a..8c75c1f469f84a3c0b6c524d8f3d226a043cc04e 100644 (file)
@@ -10,9 +10,12 @@ CLASS(XonoticPlayerSettingsTab) EXTENDS(XonoticTab)
        ATTRIB(XonoticPlayerSettingsTab, playerNameLabelAlpha, float, 0)
 ENDCLASS(XonoticPlayerSettingsTab)
 entity makeXonoticPlayerSettingsTab();
+
+void HUDSetup_Join_Click(entity me, entity btn);
 #endif
 
 #ifdef IMPLEMENTATION
+
 entity makeXonoticPlayerSettingsTab()
 {
        entity me;
@@ -20,15 +23,15 @@ entity makeXonoticPlayerSettingsTab()
        me.configureDialog(me);
        return me;
 }
-void drawXonoticPlayerSettingsTab(entity me)
+void XonoticPlayerSettingsTab_draw(entity me)
 {
        if(cvar_string("_cl_name") == "Player")
                me.playerNameLabel.alpha = ((mod(time * 2, 2) < 1) ? 1 : 0);
        else
                me.playerNameLabel.alpha = me.playerNameLabelAlpha;
-       drawContainer(me);
+       SUPER(XonoticPlayerSettingsTab).draw(me);
 }
-void fillXonoticPlayerSettingsTab(entity me)
+void XonoticPlayerSettingsTab_fill(entity me)
 {
        entity e, pms, sl, label, e0, box;
        float i, r, m, n;
@@ -148,9 +151,15 @@ void fillXonoticPlayerSettingsTab(entity me)
                me.TD(me, 1, 2/3, e = makeXonoticRadioButton(1, "crosshair_hittest", "1.25", "Enemies"));
        me.TR(me);
                me.TDempty(me, 0.4);
-               me.TD(me, 1, 2.2, e = makeXonoticButton("Radar, HUD & Waypoints...", '0 0 0'));
+               me.TD(me, 1, 2.2, e = makeXonoticButton("Waypoints Setup", '0 0 0'));
                        e.onClick = DialogOpenButton_Click;
-                       e.onClickEntity = main.radarDialog;
+                       e.onClickEntity = main.waypointDialog;
+               me.TDempty(me, 0.5);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 2.2, e = makeXonoticButton("HUD Setup", '0 0 0'));
+                       e.onClick = HUDSetup_Join_Click;
+                       e.onClickEntity = me;
                me.TDempty(me, 0.5);
        me.TR(me);
        #ifdef ALLOW_FORCEMODELS
@@ -159,7 +168,6 @@ void fillXonoticPlayerSettingsTab(entity me)
                me.TD(me, 1, 2/3, e = makeXonoticRadioButton(2, "cl_forceplayermodelsfromxonotic", string_null, "Custom"));
                me.TD(me, 1, 2/3, e = makeXonoticRadioButton(2, "cl_forceplayermodels", string_null, "All"));
        #endif
-       me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_gentle", "Disable gore effects"));
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Gibs:"));
@@ -175,4 +183,14 @@ void fillXonoticPlayerSettingsTab(entity me)
        me.gotoRC(me, me.rows - 1, 0);
                me.TD(me, 1, me.columns, makeXonoticCommandButton("Apply immediately", '0 0 0', "color -1 -1;name \"$_cl_name\";cl_cmd sendcvar cl_weaponpriority;sendcvar cl_zoomfactor;sendcvar cl_zoomspeed;sendcvar cl_autoswitch;sendcvar cl_shownames;sendcvar cl_forceplayermodelsfromxonotic;sendcvar cl_forceplayermodels;playermodel $_cl_playermodel;playerskin $_cl_playerskin", COMMANDBUTTON_APPLY));
 }
+void HUDSetup_Join_Click(entity me, entity btn)
+{
+       if(! (gamestatus & (GAME_CONNECTED | GAME_ISSERVER)))
+       {
+               localcmd("map hudsetup/hudsetup", "\n");
+       }
+       else
+               localcmd("togglemenu 0\n");
+       localcmd("_hud_configure 1", "\n");
+}
 #endif
diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_radar.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_radar.c
deleted file mode 100644 (file)
index dd1ebc5..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-#ifdef INTERFACE
-CLASS(XonoticRadarDialog) EXTENDS(XonoticDialog)
-       METHOD(XonoticRadarDialog, toString, string(entity))
-       METHOD(XonoticRadarDialog, fill, void(entity))
-       METHOD(XonoticRadarDialog, showNotify, void(entity))
-       ATTRIB(XonoticRadarDialog, title, string, "Radar, HUD & Waypoints")
-       ATTRIB(XonoticRadarDialog, color, vector, SKINCOLOR_DIALOG_RADAR)
-       ATTRIB(XonoticRadarDialog, intendedWidth, float, 0.7)
-       ATTRIB(XonoticRadarDialog, rows, float, 19)
-       ATTRIB(XonoticRadarDialog, columns, float, 4)
-ENDCLASS(XonoticRadarDialog)
-#endif
-
-#ifdef IMPLEMENTATION
-void showNotifyXonoticRadarDialog(entity me)
-{
-        loadAllCvars(me);
-}
-string toStringXonoticRadarDialog(entity me)
-{
-       return "XXX";
-}
-void fillXonoticRadarDialog(entity me)
-{
-       entity e, sl;
-       me.TR(me);
-               me.TD(me, 1, 4, makeXonoticTextLabel(0, "Radar settings:"));
-       me.TR(me);
-               me.TDempty(me, 0.2);
-               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, "Position:"));
-               me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "cl_teamradar_position", "0 0", "Top left"));
-               me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "cl_teamradar_position", "0.5 0", "Top middle"));
-               me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "cl_teamradar_position", "1 0", "Top right"));
-       me.TR(me);
-               me.TDempty(me, 1);
-               me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "cl_teamradar_position", "0 0.5", "Middle left"));
-               me.TDempty(me, 1);
-               me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "cl_teamradar_position", "1 0.5", "Middle right"));
-       me.TR(me);
-               me.TDempty(me, 0.2);
-               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, "Size:"));
-               me.TD(me, 1, 3, e = makeXonoticTextSlider("cl_teamradar_size"));
-                       e.addValue(e, "96x96", "96 96");
-                       e.addValue(e, "128x96", "128 96");
-                       e.addValue(e, "128x128", "128 128");
-                       e.addValue(e, "192x144", "192 144");
-                       e.addValue(e, "192x192", "192 192");
-                       e.addValue(e, "256x192", "256 192");
-                       e.addValue(e, "256x256", "256 256");
-                       e.configureXonoticTextSliderValues(e);
-       me.TR(me);
-               me.TDempty(me, 0.2);
-               sl = makeXonoticSlider(0.20, 1, 0.01, "cl_teamradar_background_alpha");
-               me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1, 1, sl, "Background:"));
-               me.TD(me, 1, 3, sl);
-       me.TR(me);
-       me.TR(me);
-               me.TD(me, 1, 4, makeXonoticTextLabel(0, "HUD settings:"));
-       me.TR(me);
-               me.TDempty(me, 0.2);
-               me.TD(me, 1, 0.8, e = makeXonoticCheckBoxEx(100, 110, "viewsize", "Background:"));
-               me.TD(me, 1, 3, e = makeXonoticSlider(0, 1, 0.01, "sbar_alpha_bg"));
-                       setDependent(e, "viewsize", 0, 100);
-               me.TR(me);
-                       me.TDempty(me, 0.2);
-                       me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, "Default red:"));
-                       me.TD(me, 1, 3, e = makeXonoticSlider(0, 1, 0.01, "sbar_color_bg_r"));
-                               setDependent(e, "viewsize", 0, 100);
-               me.TR(me);
-                       me.TDempty(me, 0.2);
-                       me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, "Default green:"));
-                       me.TD(me, 1, 3, e = makeXonoticSlider(0, 1, 0.01, "sbar_color_bg_g"));
-                               setDependent(e, "viewsize", 0, 100);
-               me.TR(me);
-                       me.TDempty(me, 0.2);
-                       me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, "Default blue:"));
-                       me.TD(me, 1, 3, e = makeXonoticSlider(0, 1, 0.01, "sbar_color_bg_b"));
-                               setDependent(e, "viewsize", 0, 100);
-               me.TR(me);
-                       me.TDempty(me, 0.2);
-                       me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, "Team color:"));
-                       me.TD(me, 1, 3, e = makeXonoticSlider(0.1, 1, 0.01, "sbar_color_bg_team"));
-                               setDependent(e, "viewsize", 0, 100);
-       me.TR(me);
-       me.TR(me);
-               me.TD(me, 1, 4, makeXonoticTextLabel(0, "Waypoint settings:"));
-       me.TR(me);
-               me.TDempty(me, 0.2);
-               me.TD(me, 1, 3.8, e = makeXonoticCheckBox(1, "cl_hidewaypoints", "Show base waypoints"));
-       me.TR(me);
-               me.TDempty(me, 0.2);
-               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, "Waypoint scale:"));
-                       me.TD(me, 1, 3, e = makeXonoticSlider(0.5, 1.5, 0.01, "g_waypointsprite_scale"));
-                               setDependent(e, "cl_hidewaypoints", 0, 0);
-       me.TR(me);
-               me.TDempty(me, 0.2);
-               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, "Waypoint alpha:"));
-                       me.TD(me, 1, 3, e = makeXonoticSlider(0.1, 1, 0.01, "g_waypointsprite_alpha"));
-                               setDependent(e, "cl_hidewaypoints", 0, 0);
-       me.TR(me);
-               me.TDempty(me, 0.2);
-               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, "Show names:"));
-               me.TD(me, 1, 3, e = makeXonoticTextSlider("cl_shownames"));
-                       e.addValue(e, "Never", "0");
-                       e.addValue(e, "Teammates", "1");
-                       e.addValue(e, "All players", "2");
-                       e.configureXonoticTextSliderValues(e);
-       me.gotoRC(me, me.rows - 1, 0);
-               me.TD(me, 1, me.columns, e = makeXonoticButton("OK", '0 0 0'));
-                       e.onClick = Dialog_Close;
-                       e.onClickEntity = me;
-}
-
-#endif
diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c
new file mode 100644 (file)
index 0000000..584e1d9
--- /dev/null
@@ -0,0 +1,56 @@
+#ifdef INTERFACE
+CLASS(XonoticWaypointDialog) EXTENDS(XonoticDialog)
+       METHOD(XonoticWaypointDialog, toString, string(entity))
+       METHOD(XonoticWaypointDialog, fill, void(entity))
+       METHOD(XonoticWaypointDialog, showNotify, void(entity))
+       ATTRIB(XonoticWaypointDialog, title, string, "Waypoints")
+       ATTRIB(XonoticWaypointDialog, color, vector, SKINCOLOR_DIALOG_RADAR)
+       ATTRIB(XonoticWaypointDialog, intendedWidth, float, 0.7)
+       ATTRIB(XonoticWaypointDialog, rows, float, 6)
+       ATTRIB(XonoticWaypointDialog, columns, float, 4)
+ENDCLASS(XonoticWaypointDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticWaypointDialog_showNotify(entity me)
+{
+        loadAllCvars(me);
+}
+string XonoticWaypointDialog_toString(entity me)
+{
+       return "XXX";
+}
+void XonoticWaypointDialog_fill(entity me)
+{
+       entity e, sl;
+       
+       me.TR(me);
+               me.TD(me, 1, 4, makeXonoticTextLabel(0, "Waypoint settings:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 3.8, e = makeXonoticCheckBox(1, "cl_hidewaypoints", "Show base waypoints"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, "Waypoint scale:"));
+                       me.TD(me, 1, 3, e = makeXonoticSlider(0.5, 1.5, 0.01, "g_waypointsprite_scale"));
+                               setDependent(e, "cl_hidewaypoints", 0, 0);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, "Waypoint alpha:"));
+                       me.TD(me, 1, 3, e = makeXonoticSlider(0.1, 1, 0.01, "g_waypointsprite_alpha"));
+                               setDependent(e, "cl_hidewaypoints", 0, 0);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, "Show names:"));
+               me.TD(me, 1, 3, e = makeXonoticTextSlider("cl_shownames"));
+                       e.addValue(e, "Never", "0");
+                       e.addValue(e, "Teammates", "1");
+                       e.addValue(e, "All players", "2");
+                       e.configureXonoticTextSliderValues(e);
+       me.gotoRC(me, me.rows - 1, 0);
+               me.TD(me, 1, me.columns, e = makeXonoticButton("OK", '0 0 0'));
+                       e.onClick = Dialog_Close;
+                       e.onClickEntity = me;
+}
+
+#endif
index 0b31a823f15a0674123f69d4af81250b4c1c1136..ca6d705c6fd68df9a85226533dd8573c9601faa5 100644 (file)
@@ -13,15 +13,15 @@ ENDCLASS(XonoticWeaponsDialog)
 #endif
 
 #ifdef IMPLEMENTATION
-void showNotifyXonoticWeaponsDialog(entity me)
+void XonoticWeaponsDialog_showNotify(entity me)
 {
         loadAllCvars(me);
 }
-string toStringXonoticWeaponsDialog(entity me)
+string XonoticWeaponsDialog_toString(entity me)
 {
        return me.weaponsList.toString(me.weaponsList);
 }
-void fillXonoticWeaponsDialog(entity me)
+void XonoticWeaponsDialog_fill(entity me)
 {
        entity e;
 
index 67de2d214534327b5acc6c878b4c63fc539e57a3..cfe91afceece6fe5e7ca8c57dc7fe2877203ece5 100644 (file)
@@ -10,7 +10,7 @@ ENDCLASS(XonoticNewsDialog)
 #endif
 
 #ifdef IMPLEMENTATION
-void fillXonoticNewsDialog(entity me)
+void XonoticNewsDialog_fill(entity me)
 {
        entity e;
        me.TR(me);
index a58b2e4555eb2602938cb39a332520a6cbecfe66..0229e026766d4037daa76339c003a3e910f4a80f 100644 (file)
@@ -10,7 +10,7 @@ ENDCLASS(XonoticQuitDialog)
 #endif
 
 #ifdef IMPLEMENTATION
-void fillXonoticQuitDialog(entity me)
+void XonoticQuitDialog_fill(entity me)
 {
        entity e;
        me.TR(me);
index f0adf0488a6d8a593e72596b8108a152cb91498f..1f19bf656531e1bc26d27d9f49e487ec5395515e 100644 (file)
@@ -10,7 +10,7 @@ ENDCLASS(XonoticSettingsDialog)
 #endif
 
 #ifdef IMPLEMENTATION
-void fillXonoticSettingsDialog(entity me)
+void XonoticSettingsDialog_fill(entity me)
 {
        entity mc;
        mc = makeXonoticTabController(me.rows - 2);
index 7c3c754d4cce746dbb49ad9acf44c44ec8814fa4..7d1f17f0f2c51609f13d2af59e5129594dba87a2 100644 (file)
@@ -18,7 +18,7 @@ entity makeXonoticAudioSettingsTab()
        return me;
 }
 
-void fillXonoticAudioSettingsTab(entity me)
+void XonoticAudioSettingsTab_fill(entity me)
 {
        entity e, s, sl;
 
index eb080a50f5f8ada5697f4dbc8ba9a326dbeb05ba..fcb2b8ccfd7205cdd4156a890002b4a1f6a4d499 100644 (file)
@@ -29,7 +29,7 @@ float someShadowCvarIsEnabled(entity box)
        return FALSE;
 }
 
-void fillXonoticEffectsSettingsTab(entity me)
+void XonoticEffectsSettingsTab_fill(entity me)
 {
        entity e, s;
        float n;
index bd6ade81b96692f1fe81c00df1b32db0bcfc1227..df3bd084a5ec4633be91cd4a651b598c9f092974 100644 (file)
@@ -17,7 +17,7 @@ entity makeXonoticInputSettingsTab()
        me.configureDialog(me);
        return me;
 }
-void fillXonoticInputSettingsTab(entity me)
+void XonoticInputSettingsTab_fill(entity me)
 {
        entity e;
        entity kb;
@@ -25,20 +25,20 @@ void fillXonoticInputSettingsTab(entity me)
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticTextLabel(0, "Key bindings:"));
        me.TR(me);
-               me.TD(me, me.rows - 2, 3, kb = makeXonoticKeyBinder());
+               me.TD(me, me.rows - 2, 3.3, kb = makeXonoticKeyBinder());
        me.gotoRC(me, me.rows - 1, 0);
        me.TR(me);
-               me.TD(me, 1, 1, e = makeXonoticButton("Change key...", '0 0 0'));
+               me.TD(me, 1, 1.1, e = makeXonoticButton("Change key...", '0 0 0'));
                        e.onClick = KeyBinder_Bind_Change;
                        e.onClickEntity = kb;
                        kb.keyGrabButton = e;
-               me.TD(me, 1, 1, e = makeXonoticButton("Edit...", '0 0 0'));
+               me.TD(me, 1, 1.1, e = makeXonoticButton("Edit...", '0 0 0'));
                        e.onClick = KeyBinder_Bind_Edit;
                        e.onClickEntity = kb;
                        kb.userbindEditButton = e;
                        kb.userbindEditDialog = main.userbindEditDialog;
                        main.userbindEditDialog.keybindBox = kb;
-               me.TD(me, 1, 1, e = makeXonoticButton("Clear", '0 0 0'));
+               me.TD(me, 1, 1.1, e = makeXonoticButton("Clear", '0 0 0'));
                        e.onClick = KeyBinder_Bind_Clear;
                        e.onClickEntity = kb;
 
index 38660b89a8d2a8544d69c31594d2564391a1f4b0..3cdfa95b739c957670fc42ff5d17a36e2c3098f4 100644 (file)
@@ -22,7 +22,7 @@ void XonoticUserbindEditDialog_Save(entity btn, entity me)
        Dialog_Close(btn, me);
 }
 
-void loadUserBindXonoticUserbindEditDialog(entity me, string theName, string theCommandPress, string theCommandRelease)
+void XonoticUserbindEditDialog_loadUserBind(entity me, string theName, string theCommandPress, string theCommandRelease)
 {
        me.nameBox.setText(me.nameBox, theName);
                me.nameBox.keyDown(me.nameBox, K_END, 0, 0);
@@ -32,7 +32,7 @@ void loadUserBindXonoticUserbindEditDialog(entity me, string theName, string the
                me.nameBox.keyDown(me.commandReleaseBox, K_END, 0, 0);
 }
 
-void fillXonoticUserbindEditDialog(entity me)
+void XonoticUserbindEditDialog_fill(entity me)
 {
        entity e;
        me.TR(me);
index 2494d4593fb8df6181040d7b1a8265179522969d..2dcf83f1f044ac34658d21819637cfd90bc57442 100644 (file)
@@ -17,7 +17,7 @@ entity makeXonoticMiscSettingsTab()
        me.configureDialog(me);
        return me;
 }
-void fillXonoticMiscSettingsTab(entity me)
+void XonoticMiscSettingsTab_fill(entity me)
 {
        entity e;
        entity sk;
index c8bc46cdcaf1ae287922d6b50690a086293930ee..0d846caf2ae5f60643f4b8b376bd7a0c89e86278 100644 (file)
@@ -12,15 +12,15 @@ ENDCLASS(XonoticCvarsDialog)
 #endif
 
 #ifdef IMPLEMENTATION
-void showNotifyXonoticCvarsDialog(entity me)
+void XonoticCvarsDialog_showNotify(entity me)
 {
        loadAllCvars(me);
 }
-string toStringXonoticCvarsDialog(entity me)
+string XonoticCvarsDialog_toString(entity me)
 {
        return "XXX";
 }
-void fillXonoticCvarsDialog(entity me)
+void XonoticCvarsDialog_fill(entity me)
 {
        entity e, cvarlist, btn;
        cvarlist = makeXonoticCvarList();
index 929da470df03d705bdba695e35258a8ab84260fd..6e0c472afb4dc07a92a6a175f457d584353323a5 100644 (file)
@@ -18,7 +18,7 @@ entity makeXonoticNetworkSettingsTab()
        return me;
 }
 
-void fillXonoticNetworkSettingsTab(entity me)
+void XonoticNetworkSettingsTab_fill(entity me)
 {
        entity e;
 
index 5eb228ae9323710656ee6ac0ca0e8e57d73379d2..dd2f960c730af59c7b97ee480363e21c909a00bb 100644 (file)
@@ -18,7 +18,7 @@ entity makeXonoticVideoSettingsTab()
        me.configureDialog(me);
        return me;
 }
-void fillXonoticVideoSettingsTab(entity me)
+void XonoticVideoSettingsTab_fill(entity me)
 {
        entity e;
 
index e8b1d943a79d949a29ea68a311f3d128c8d732d7..560192ff1d6edfdb6021f796b8de44e7b74c1938 100644 (file)
@@ -50,7 +50,7 @@ void InstantAction_LoadMap(entity btn, entity dummy)
        fclose(fh);
 }
 
-void fillXonoticSingleplayerDialog(entity me)
+void XonoticSingleplayerDialog_fill(entity me)
 {
        entity e, btnPrev, btnNext, lblTitle;
 
index b0df2d3d29ff1ef27fa3f17f78aaa91319621a80..5d377e6d0a1747d0884fa1f235fef802cc413e17 100644 (file)
@@ -10,7 +10,7 @@ ENDCLASS(XonoticWinnerDialog)
 #endif
 
 #ifdef IMPLEMENTATION
-void fillXonoticWinnerDialog(entity me)
+void XonoticWinnerDialog_fill(entity me)
 {
        entity e;
 
index 4a2f81231f9d2f998b2f5f3ee20fe7fc30df0a13..e0908ee364d76d3b4666adfb3dbe1ad981cfcb36 100644 (file)
@@ -23,7 +23,7 @@ entity makeTeamButton(string theName, vector theColor, string commandtheName)
        return b;
 }
 
-void showNotifyXonoticTeamSelectDialog(entity me)
+void XonoticTeamSelectDialog_showNotify(entity me)
 {
        float teams, nTeams;
        teams = cvar("_teams_available");
@@ -34,7 +34,7 @@ void showNotifyXonoticTeamSelectDialog(entity me)
        me.team4.disabled = !(teams & 8); nTeams += !!(teams & 8);
 }
 
-void fillXonoticTeamSelectDialog(entity me)
+void XonoticTeamSelectDialog_fill(entity me)
 {
        entity e;
        me.TR(me);
index f88cb0029cf19eb6d071489093c0cd48923a5d2b..c1dc04c7300e53f0c297ea804723121bd1b6c667 100644 (file)
@@ -30,7 +30,7 @@ entity makeXonoticGametypeButton(float theGroup, string theCvar, string theText)
        me.configureXonoticGametypeButton(me, theGroup, theCvar, theText);
        return me;
 }
-void configureXonoticGametypeButtonXonoticGametypeButton(entity me, float theGroup, string theCvar, string theText)
+void XonoticGametypeButton_configureXonoticGametypeButton(entity me, float theGroup, string theCvar, string theText)
 {
        if(theCvar)
        {
@@ -43,7 +43,7 @@ void configureXonoticGametypeButtonXonoticGametypeButton(entity me, float theGro
        me.onClick = GameTypeButton_Click;
        me.onClickEntity = NULL;
 }
-void setCheckedXonoticGametypeButton(entity me, float val)
+void XonoticGametypeButton_setChecked(entity me, float val)
 {
        if(val != me.checked)
        {
@@ -51,14 +51,14 @@ void setCheckedXonoticGametypeButton(entity me, float val)
                me.saveCvars(me);
        }
 }
-void loadCvarsXonoticGametypeButton(entity me)
+void XonoticGametypeButton_loadCvars(entity me)
 {
        if not(me.cvarName)
                return;
 
        me.checked = cvar(me.cvarName);
 }
-void saveCvarsXonoticGametypeButton(entity me)
+void XonoticGametypeButton_saveCvars(entity me)
 {
        if not(me.cvarName)
                return;
index 65f5ee9d817b84957f105519ae5789ad8b32e2ab..9f0de67b8a1deb592ddf0aff2eb8c6f5b03097d0 100644 (file)
@@ -13,7 +13,7 @@ entity makeXonoticImage(string theImage, float theAspect)
        me.configureXonoticImage(me, theImage, theAspect);
        return me;
 }
-void configureXonoticImageXonoticImage(entity me, string theImage, float theAspect)
+void XonoticImage_configureXonoticImage(entity me, string theImage, float theAspect)
 {
        me.configureImage(me, theImage);
        me.forcedAspect = theAspect;
index 0793ae181227fade01f859aa06b40c9c4ddfdb97..26dc4536c477fa198a1abdf44c2adac91833ebb5 100644 (file)
@@ -32,7 +32,7 @@ entity makeXonoticInputBox(float doEditColorCodes, string theCvar)
        me.configureXonoticInputBox(me, doEditColorCodes, theCvar);
        return me;
 }
-void configureXonoticInputBoxXonoticInputBox(entity me, float doEditColorCodes, string theCvar)
+void XonoticInputBox_configureXonoticInputBox(entity me, float doEditColorCodes, string theCvar)
 {
        me.configureInputBox(me, "", 0, me.fontSize, me.image);
        me.editColorCodes = doEditColorCodes;
@@ -44,33 +44,33 @@ void configureXonoticInputBoxXonoticInputBox(entity me, float doEditColorCodes,
        }
        me.cursorPos = strlen(me.text);
 }
-void focusLeaveXonoticInputBox(entity me)
+void XonoticInputBox_focusLeave(entity me)
 {
        me.saveCvars(me);
 }
-void setTextXonoticInputBox(entity me, string new)
+void XonoticInputBox_setText(entity me, string new)
 {
        if(me.text != new)
        {
-               setTextInputBox(me, new);
+               SUPER(XonoticInputBox).setText(me, new);
                me.onChange(me, me.onChangeEntity);
        }
        else
-               setTextInputBox(me, new);
+               SUPER(XonoticInputBox).setText(me, new);
 }
-void loadCvarsXonoticInputBox(entity me)
+void XonoticInputBox_loadCvars(entity me)
 {
        if not(me.cvarName)
                return;
-       setTextInputBox(me, cvar_string(me.cvarName));
+       SUPER(XonoticInputBox).setText(me, cvar_string(me.cvarName));
 }
-void saveCvarsXonoticInputBox(entity me)
+void XonoticInputBox_saveCvars(entity me)
 {
        if not(me.cvarName)
                return;
        cvar_set(me.cvarName, me.text);
 }
-float keyDownXonoticInputBox(entity me, float key, float ascii, float shift)
+float XonoticInputBox_keyDown(entity me, float key, float ascii, float shift)
 {
        float r;
        r = 0;
@@ -83,7 +83,7 @@ float keyDownXonoticInputBox(entity me, float key, float ascii, float shift)
                }
                me.onEnter(me, me.onEnterEntity);
        }
-       if(keyDownInputBox(me, key, ascii, shift))
+       if(SUPER(XonoticInputBox).keyDown(me, key, ascii, shift))
                r = 1;
        return r;
 }
index 6b490be23115a380ece36e67930e7551b0f73f32..2eb51755dca6027427873bc4aabe7719fac22f3c 100644 (file)
@@ -68,7 +68,7 @@ entity makeXonoticKeyBinder()
        me.configureXonoticKeyBinder(me);
        return me;
 }
-void configureXonoticKeyBinderXonoticKeyBinder(entity me)
+void XonoticKeyBinder_configureXonoticKeyBinder(entity me)
 {
        me.configureXonoticListBox(me);
        if(Xonotic_KeyBinds_Count < 0)
@@ -76,9 +76,9 @@ void configureXonoticKeyBinderXonoticKeyBinder(entity me)
        me.nItems = Xonotic_KeyBinds_Count;
        me.setSelected(me, 0);
 }
-void resizeNotifyXonoticKeyBinder(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void XonoticKeyBinder_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
-       resizeNotifyXonoticListBox(me, relOrigin, relSize, absOrigin, absSize);
+       SUPER(XonoticKeyBinder).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
 
        me.realFontSize_y = me.fontSize / (absSize_y * me.itemHeight);
        me.realFontSize_x = me.fontSize / (absSize_x * (1 - me.controlWidth));
@@ -103,7 +103,7 @@ void KeyBinder_Bind_Change(entity btn, entity me)
        me.keyGrabButton.forcePressed = 1;
        keyGrabber = me;
 }
-void keyGrabbedXonoticKeyBinder(entity me, float key, float ascii)
+void XonoticKeyBinder_keyGrabbed(entity me, float key, float ascii)
 {
        float n, j, k, nvalid;
        string func;
@@ -135,7 +135,7 @@ void keyGrabbedXonoticKeyBinder(entity me, float key, float ascii)
        }
        localcmd("\nbind \"", keynumtostring(key), "\" \"", func, "\"\n");
 }
-void editUserbindXonoticKeyBinder(entity me, string theName, string theCommandPress, string theCommandRelease)
+void XonoticKeyBinder_editUserbind(entity me, string theName, string theCommandPress, string theCommandRelease)
 {
        string func, descr;
 
@@ -195,7 +195,7 @@ void KeyBinder_Bind_Clear(entity btn, entity me)
        }
 
 }
-void clickListBoxItemXonoticKeyBinder(entity me, float i, vector where)
+void XonoticKeyBinder_clickListBoxItem(entity me, float i, vector where)
 {
        if(i == me.lastClickedServer)
                if(time < me.lastClickedTime + 0.3)
@@ -206,7 +206,7 @@ void clickListBoxItemXonoticKeyBinder(entity me, float i, vector where)
        me.lastClickedServer = i;
        me.lastClickedTime = time;
 }
-void setSelectedXonoticKeyBinder(entity me, float i)
+void XonoticKeyBinder_setSelected(entity me, float i)
 {
        // handling of "unselectable" items
        i = floor(0.5 + bound(0, i, me.nItems - 1));
@@ -231,9 +231,9 @@ void setSelectedXonoticKeyBinder(entity me, float i)
                me.previouslySelected = i;
        if(me.userbindEditButton)
                me.userbindEditButton.disabled = (substring(Xonotic_KeyBinds_Descriptions[i], 0, 1) != "$");
-       setSelectedListBox(me, i);
+       SUPER(XonoticKeyBinder).setSelected(me, i);
 }
-float keyDownXonoticKeyBinder(entity me, float key, float ascii, float shift)
+float XonoticKeyBinder_keyDown(entity me, float key, float ascii, float shift)
 {
        float r;
        r = 1;
@@ -248,12 +248,12 @@ float keyDownXonoticKeyBinder(entity me, float key, float ascii, float shift)
                        KeyBinder_Bind_Clear(me, me);
                        break;
                default:
-                       r = keyDownListBox(me, key, ascii, shift);
+                       r = SUPER(XonoticKeyBinder).keyDown(me, key, ascii, shift);
                        break;
        }
        return r;
 }
-void drawListBoxItemXonoticKeyBinder(entity me, float i, vector absSize, float isSelected)
+void XonoticKeyBinder_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
 {
        string s;
        float j, k, n;
@@ -297,7 +297,8 @@ void drawListBoxItemXonoticKeyBinder(entity me, float i, vector absSize, float i
                                theAlpha *= SKINALPHA_DISABLED;
        }
 
-       draw_Text(me.realUpperMargin * eY + extraMargin * eX, descr, me.realFontSize, theColor, theAlpha, 0);
+       s = draw_TextShortenToWidth(descr, me.columnFunctionSize, 0, me.realFontSize);
+       draw_Text(me.realUpperMargin * eY + extraMargin * eX, s, me.realFontSize, theColor, theAlpha, 0);
        if(func != "")
        {
                n = tokenize(findkeysforcommand(func)); // uses '...' strings
index ce08d4bf4d762985dda216d1d54aa69a4235cd51..23fa58d83263637ede8ab7c0311cfe1a9f7e5e19 100644 (file)
@@ -25,13 +25,13 @@ entity makeXonoticListBox()
        me.configureXonoticListBox(me);
        return me;
 }
-void configureXonoticListBoxXonoticListBox(entity me)
+void XonoticListBox_configureXonoticListBox(entity me)
 {
        me.configureListBox(me, me.scrollbarWidth, 1); // item height gets set up later
 }
-void resizeNotifyXonoticListBox(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void XonoticListBox_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
        me.itemHeight = me.rowsPerItem * me.fontSize / absSize_y;
-       resizeNotifyListBox(me, relOrigin, relSize, absOrigin, absSize);
+       SUPER(XonoticListBox).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
 }
 #endif
index 979bb572b0c33a040a32d72133ecb70d4d690591..f1cbfffc7555f42d1eedacc0b500811cc5d3b926 100644 (file)
@@ -7,7 +7,7 @@ CLASS(MainWindow) EXTENDS(ModalController)
        ATTRIB(MainWindow, mapInfoDialog, entity, NULL)
        ATTRIB(MainWindow, userbindEditDialog, entity, NULL)
        ATTRIB(MainWindow, winnerDialog, entity, NULL)
-       ATTRIB(MainWindow, radarDialog, entity, NULL)
+       ATTRIB(MainWindow, waypointDialog, entity, NULL)
        ATTRIB(MainWindow, serverInfoDialog, entity, NULL)
        ATTRIB(MainWindow, cvarsDialog, entity, NULL)
        ATTRIB(MainWindow, mainNexposee, entity, NULL)
@@ -25,13 +25,69 @@ void DemoButton_Click(entity me, entity other)
                me.setText(me, "Do not press this button again!");
 }
 
-void configureMainWindowMainWindow(entity me)
+void MainWindow_configureMainWindow(entity me)
 {
        entity n, i;
 
        i = spawnXonoticTeamSelectDialog();
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       
+       i = spawnXonoticHUDExitDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       
+       i = spawnXonoticHUDNotificationDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       
+       i = spawnXonoticHUDInventoryDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       
+       i = spawnXonoticHUDHealthArmorDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       
+       i = spawnXonoticHUDChatDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       
+       i = spawnXonoticHUDModIconsDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       
+       i = spawnXonoticHUDPowerupsDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       
+       i = spawnXonoticHUDPressedKeysDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       
+       i = spawnXonoticHUDRaceTimerDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       
+       i = spawnXonoticHUDRadarDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       
+       i = spawnXonoticHUDScoreDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       
+       i = spawnXonoticHUDTimerDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       
+       i = spawnXonoticHUDVoteDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       
+       i = spawnXonoticHUDWeaponIconsDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
        me.advancedDialog = i = spawnXonoticAdvancedDialog();
        i.configureDialog(i);
@@ -57,7 +113,7 @@ void configureMainWindowMainWindow(entity me)
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       me.radarDialog = i = spawnXonoticRadarDialog();
+       me.waypointDialog = i = spawnXonoticWaypointDialog();
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
        
index 9bce96dfd776bdd0520eee3545873211be46732e..7a5a4ba150c6f5d332eaaa0648c3cd0961c3ac96 100644 (file)
@@ -51,7 +51,7 @@ void MapList_LoadMap(entity btn, entity me);
 #endif
 
 #ifdef IMPLEMENTATION
-void destroyXonoticMapList(entity me)
+void XonoticMapList_destroy(entity me)
 {
        MapInfo_Shutdown();
 }
@@ -64,22 +64,22 @@ entity makeXonoticMapList()
        return me;
 }
 
-void configureXonoticMapListXonoticMapList(entity me)
+void XonoticMapList_configureXonoticMapList(entity me)
 {
        me.configureXonoticListBox(me);
        me.refilter(me);
 }
 
-void loadCvarsXonoticMapList(entity me)
+void XonoticMapList_loadCvars(entity me)
 {
        me.refilter(me);
 }
 
-float g_maplistCacheQueryXonoticMapList(entity me, float i)
+float XonoticMapList_g_maplistCacheQuery(entity me, float i)
 {
        return stof(substring(me.g_maplistCache, i, 1));
 }
-void g_maplistCacheToggleXonoticMapList(entity me, float i)
+void XonoticMapList_g_maplistCacheToggle(entity me, float i)
 {
        string a, b, c, s, bspname;
        float n;
@@ -113,17 +113,17 @@ void g_maplistCacheToggleXonoticMapList(entity me, float i)
        }
 }
 
-void drawXonoticMapList(entity me)
+void XonoticMapList_draw(entity me)
 {
        if(me.startButton)
                me.startButton.disabled = ((me.selectedItem < 0) || (me.selectedItem >= me.nItems));
-       drawListBox(me);
+       SUPER(XonoticMapList).draw(me);
 }
 
-void resizeNotifyXonoticMapList(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void XonoticMapList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
        me.itemAbsSize = '0 0 0';
-       resizeNotifyXonoticListBox(me, relOrigin, relSize, absOrigin, absSize);
+       SUPER(XonoticMapList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
 
        me.realFontSize_y = me.fontSize / (me.itemAbsSize_y = (absSize_y * me.itemHeight));
        me.realFontSize_x = me.fontSize / (me.itemAbsSize_x = (absSize_x * (1 - me.controlWidth)));
@@ -139,7 +139,7 @@ void resizeNotifyXonoticMapList(entity me, vector relOrigin, vector relSize, vec
        me.checkMarkOrigin = eY + eX * (me.columnPreviewOrigin + me.columnPreviewSize) - me.checkMarkSize;
 }
 
-void clickListBoxItemXonoticMapList(entity me, float i, vector where)
+void XonoticMapList_clickListBoxItem(entity me, float i, vector where)
 {
        if(where_x <= me.columnPreviewOrigin + me.columnPreviewSize)
        {
@@ -163,7 +163,7 @@ void clickListBoxItemXonoticMapList(entity me, float i, vector where)
                        }
 }
 
-void drawListBoxItemXonoticMapList(entity me, float i, vector absSize, float isSelected)
+void XonoticMapList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
 {
        // layout: Ping, Map name, Map name, NP, TP, MP
        string s;
@@ -197,7 +197,7 @@ void drawListBoxItemXonoticMapList(entity me, float i, vector absSize, float isS
        MapInfo_ClearTemps();
 }
 
-void refilterXonoticMapList(entity me)
+void XonoticMapList_refilter(entity me)
 {
        float i, j, n;
        string s;
@@ -233,7 +233,7 @@ void refilterXonoticMapList(entity me)
        }
 }
 
-void refilterCallbackXonoticMapList(entity me, entity cb)
+void XonoticMapList_refilterCallback(entity me, entity cb)
 {
        me.refilter(me);
 }
@@ -292,7 +292,7 @@ void MapList_LoadMap(entity btn, entity me)
        }
 }
 
-float keyDownXonoticMapList(entity me, float scan, float ascii, float shift)
+float XonoticMapList_keyDown(entity me, float scan, float ascii, float shift)
 {
        string ch, save;
        if(scan == K_ENTER)
@@ -348,7 +348,7 @@ float keyDownXonoticMapList(entity me, float scan, float ascii, float shift)
                        me.setSelected(me, MapInfo_FindName_firstResult);
        }
        else
-               return keyDownListBox(me, scan, ascii, shift);
+               return SUPER(XonoticMapList).keyDown(me, scan, ascii, shift);
        return 1;
 }
 
index 32253b0c0eaef1efef0f9c463a65ede8761a50ee..b375393c02a30047a31ed6442a0c7d16d6bc4a5a 100644 (file)
@@ -15,11 +15,11 @@ entity makeXonoticNexposee()
        return me;
 }
 
-void configureXonoticNexposeeXonoticNexposee(entity me)
+void XonoticNexposee_configureXonoticNexposee(entity me)
 {
 }
 
-void closeXonoticNexposee(entity me)
+void XonoticNexposee_close(entity me)
 {
        m_goto(string_null); // hide
 }
index 4406e58055b6232a0809f5ea48f48d8f62279866..f409a1b99df2742445a88bd1cfe1ea3b5f63ce2b 100644 (file)
@@ -34,7 +34,7 @@ entity makeXonoticPlayerList()
        return me;
 }
 
-void setPlayerListXonoticPlayerList(entity me, string plist)
+void XonoticPlayerList_setPlayerList(entity me, string plist)
 {
        dprint(plist,"------------\n");
 
@@ -71,15 +71,15 @@ void setPlayerListXonoticPlayerList(entity me, string plist)
        me.playerList = buf;
 }
 
-string getPlayerListXonoticPlayerList(entity me, float i, float key)
+string XonoticPlayerList_getPlayerList(entity me, float i, float key)
 {
        return bufstr_get(me.playerList, i * PLAYERPARM_COUNT + key);
 }
 
-void resizeNotifyXonoticPlayerList(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void XonoticPlayerList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
        me.itemAbsSize = '0 0 0';
-       resizeNotifyXonoticListBox(me, relOrigin, relSize, absOrigin, absSize);
+       SUPER(XonoticPlayerList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
 
        me.realFontSize_y = me.fontSize / (me.itemAbsSize_y = (absSize_y * me.itemHeight));
        me.realFontSize_x = me.fontSize / (me.itemAbsSize_x = (absSize_x * (1 - me.controlWidth)));
@@ -93,7 +93,7 @@ void resizeNotifyXonoticPlayerList(entity me, vector relOrigin, vector relSize,
        me.columnScoreOrigin = me.columnNameOrigin + me.columnNameSize + me.realFontSize_x;
 }
 
-void drawListBoxItemXonoticPlayerList(entity me, float i, vector absSize, float isSelected)
+void XonoticPlayerList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
 {
        string s;
        string score;
index 27d5721afd3c6d432e50fc50e15049989c0a7548..585a5f7fc1cf342c1dd919eb81959eb750a0b119 100644 (file)
@@ -42,7 +42,7 @@ entity makeXonoticPlayerModelSelector()
 #define BUFMODELS_DESC 4
 #define BUFMODELS_COUNT 5
 
-void configureXonoticPlayerModelSelectorXonoticPlayerModelSelector(entity me)
+void XonoticPlayerModelSelector_configureXonoticPlayerModelSelector(entity me)
 {
        float sortbuf, glob, i;
        string fn;
@@ -87,13 +87,13 @@ void configureXonoticPlayerModelSelectorXonoticPlayerModelSelector(entity me)
        get_model_parameters(string_null, 0);
        me.loadCvars(me);
 }
-void destroyXonoticPlayerModelSelector(entity me)
+void XonoticPlayerModelSelector_destroy(entity me)
 {
        buf_del(me.bufModels);
        me.bufModels = -1;
 }
 
-void loadCvarsXonoticPlayerModelSelector(entity me)
+void XonoticPlayerModelSelector_loadCvars(entity me)
 {
        float i;
        if(me.currentModel)
@@ -112,7 +112,7 @@ void loadCvarsXonoticPlayerModelSelector(entity me)
        me.go(me, 0); // this will set the other vars for currentSkin and currentModel
 }
 
-void goXonoticPlayerModelSelector(entity me, float d)
+void XonoticPlayerModelSelector_go(entity me, float d)
 {
        me.idxModels = mod(me.idxModels + d + me.numModels, me.numModels);
 
@@ -149,19 +149,19 @@ void PlayerModelSelector_Prev_Click(entity btn, entity me)
        me.saveCvars(me);
 }
 
-void saveCvarsXonoticPlayerModelSelector(entity me)
+void XonoticPlayerModelSelector_saveCvars(entity me)
 {
        // we can't immediately apply here because of flood control
        cvar_set("_cl_playermodel", me.currentModel);
        cvar_set("_cl_playerskin", ftos(me.currentSkin));
 }
 
-void drawXonoticPlayerModelSelector(entity me)
+void XonoticPlayerModelSelector_draw(entity me)
 {
        float i, n;
        vector o;
 
-       drawImage(me);
+       SUPER(XonoticPlayerModelSelector).draw(me);
 
        // draw text on the image, handle \n in the description
        draw_CenterText('0.5 0 0', me.currentModelTitle, me.realFontSize * (me.titleFontSize / me.fontSize), SKINCOLOR_MODELTITLE, SKINALPHA_MODELTITLE, FALSE);
@@ -174,9 +174,9 @@ void drawXonoticPlayerModelSelector(entity me)
        }
 }
 
-void resizeNotifyXonoticPlayerModelSelector(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void XonoticPlayerModelSelector_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
-       resizeNotifyImage(me, relOrigin, relSize, absOrigin, absSize);
+       SUPER(XonoticPlayerModelSelector).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
        me.realFontSize_y = me.fontSize / absSize_y;
        me.realFontSize_x = me.fontSize / absSize_x;
 }
index 0281a542db6db7cda64db38a99461a28efbfe16b..8c353eae6725aec683419db78b88d6e3ce5274d5 100644 (file)
@@ -30,7 +30,7 @@ entity makeXonoticRadioButton(float theGroup, string theCvar, string theValue, s
        me.configureXonoticRadioButton(me, theGroup, theCvar, theValue, theText);
        return me;
 }
-void configureXonoticRadioButtonXonoticRadioButton(entity me, float theGroup, string theCvar, string theValue, string theText)
+void XonoticRadioButton_configureXonoticRadioButton(entity me, float theGroup, string theCvar, string theValue, string theText)
 {
        if(theCvar)
        {
@@ -41,7 +41,7 @@ void configureXonoticRadioButtonXonoticRadioButton(entity me, float theGroup, st
        }
        me.configureRadioButton(me, theText, me.fontSize, me.image, theGroup, 0);
 }
-void setCheckedXonoticRadioButton(entity me, float val)
+void XonoticRadioButton_setChecked(entity me, float val)
 {
        if(val != me.checked)
        {
@@ -49,7 +49,7 @@ void setCheckedXonoticRadioButton(entity me, float val)
                me.saveCvars(me);
        }
 }
-void loadCvarsXonoticRadioButton(entity me)
+void XonoticRadioButton_loadCvars(entity me)
 {
        if(me.cvarValue)
        {
@@ -72,7 +72,7 @@ void loadCvarsXonoticRadioButton(entity me)
                }
        }
 }
-void drawXonoticRadioButton(entity me)
+void XonoticRadioButton_draw(entity me)
 {
        if not(me.cvarValue)
                if not(me.cvarName)
@@ -89,9 +89,9 @@ void drawXonoticRadioButton(entity me)
                        if(!found)
                                me.setChecked(me, 1);
                }
-       drawCheckBox(me);
+       SUPER(XonoticRadioButton).draw(me);
 }
-void saveCvarsXonoticRadioButton(entity me)
+void XonoticRadioButton_saveCvars(entity me)
 {
        if(me.cvarValue)
        {
index d784cba4498262a1f1fc8d437969080ac3135d16..efc00822d8f72456979fd721890afcfe4798e3af 100644 (file)
@@ -14,7 +14,7 @@ ENDCLASS(XonoticRootDialog)
 #endif
 
 #ifdef IMPLEMENTATION
-void closeXonoticRootDialog(entity me)
+void XonoticRootDialog_close(entity me)
 {
        m_goto(string_null);
 }
index d4b01e28207a0cad033622b03594a2e0f0036e06..c205fba70574e031eb1951cecbfa33d413c766ba 100644 (file)
@@ -141,7 +141,7 @@ entity makeXonoticServerList()
        me.configureXonoticServerList(me);
        return me;
 }
-void configureXonoticServerListXonoticServerList(entity me)
+void XonoticServerList_configureXonoticServerList(entity me)
 {
        me.configureXonoticListBox(me);
 
@@ -149,11 +149,11 @@ void configureXonoticServerListXonoticServerList(entity me)
 
        me.nItems = 0;
 }
-void setSelectedXonoticServerList(entity me, float i)
+void XonoticServerList_setSelected(entity me, float i)
 {
        float save;
        save = me.selectedItem;
-       setSelectedListBox(me, i);
+       SUPER(XonoticServerList).setSelected(me, i);
        /*
        if(me.selectedItem == save)
                return;
@@ -171,7 +171,7 @@ void setSelectedXonoticServerList(entity me, float i)
        me.ipAddressBox.cursorPos = strlen(me.selectedServer);
        me.ipAddressBoxFocused = -1;
 }
-void refreshServerListXonoticServerList(entity me, float mode)
+void XonoticServerList_refreshServerList(entity me, float mode)
 {
        // 0: just reparametrize
        // 1: also ask for new servers
@@ -234,7 +234,7 @@ void refreshServerListXonoticServerList(entity me, float mode)
                        refreshhostcache();
        }
 }
-void focusEnterXonoticServerList(entity me)
+void XonoticServerList_focusEnter(entity me)
 {
        if(time < me.nextRefreshTime)
        {
@@ -244,7 +244,7 @@ void focusEnterXonoticServerList(entity me)
        me.nextRefreshTime = time + 10;
        me.refreshServerList(me, 1);
 }
-void drawXonoticServerList(entity me)
+void XonoticServerList_draw(entity me)
 {
        float i, found, owned;
 
@@ -317,7 +317,7 @@ void drawXonoticServerList(entity me)
                me.ipAddressBoxFocused = me.ipAddressBox.focused;
        }
 
-       drawListBox(me);
+       SUPER(XonoticServerList).draw(me);
 }
 void ServerList_PingSort_Click(entity btn, entity me)
 {
@@ -413,7 +413,7 @@ void ServerList_ShowFull_Click(entity box, entity me)
        me.ipAddressBox.cursorPos = 0;
        me.ipAddressBoxFocused = -1;
 }
-void setSortOrderXonoticServerList(entity me, float field, float direction)
+void XonoticServerList_setSortOrder(entity me, float field, float direction)
 {
        if(me.currentSortField == field)
                direction = -me.currentSortOrder;
@@ -430,7 +430,7 @@ void setSortOrderXonoticServerList(entity me, float field, float direction)
        me.selectedServer = string_null;
        me.refreshServerList(me, 0);
 }
-void positionSortButtonXonoticServerList(entity me, entity btn, float theOrigin, float theSize, string theTitle, void(entity, entity) theFunc)
+void XonoticServerList_positionSortButton(entity me, entity btn, float theOrigin, float theSize, string theTitle, void(entity, entity) theFunc)
 {
        vector originInLBSpace, sizeInLBSpace;
        originInLBSpace = eY * (-me.itemHeight);
@@ -447,9 +447,9 @@ void positionSortButtonXonoticServerList(entity me, entity btn, float theOrigin,
        btn.onClickEntity = me;
        btn.resized = 1;
 }
-void resizeNotifyXonoticServerList(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void XonoticServerList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
-       resizeNotifyXonoticListBox(me, relOrigin, relSize, absOrigin, absSize);
+       SUPER(XonoticServerList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
 
        me.realFontSize_y = me.fontSize / (absSize_y * me.itemHeight);
        me.realFontSize_x = me.fontSize / (absSize_x * (1 - me.controlWidth));
@@ -502,7 +502,7 @@ void ServerList_Info_Click(entity btn, entity me)
        main.serverInfoDialog.loadServerInfo(main.serverInfoDialog, me.selectedItem);
        DialogOpenButton_Click(me, main.serverInfoDialog);
 }
-void clickListBoxItemXonoticServerList(entity me, float i, vector where)
+void XonoticServerList_clickListBoxItem(entity me, float i, vector where)
 {
        if(i == me.lastClickedServer)
                if(time < me.lastClickedTime + 0.3)
@@ -513,7 +513,7 @@ void clickListBoxItemXonoticServerList(entity me, float i, vector where)
        me.lastClickedServer = i;
        me.lastClickedTime = time;
 }
-void drawListBoxItemXonoticServerList(entity me, float i, vector absSize, float isSelected)
+void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
 {
        // layout: Ping, Server name, Map name, NP, TP, MP
        string s;
@@ -574,7 +574,7 @@ void drawListBoxItemXonoticServerList(entity me, float i, vector absSize, float
        draw_Text(me.realUpperMargin * eY + (me.columnPlayersOrigin + (me.columnPlayersSize - draw_TextWidth(s, 0, me.realFontSize)) * 0.5) * eX, s, me.realFontSize, theColor, theAlpha, 0);
 }
 
-float keyDownXonoticServerList(entity me, float scan, float ascii, float shift)
+float XonoticServerList_keyDown(entity me, float scan, float ascii, float shift)
 {
        float i;
        vector org, sz;
@@ -601,7 +601,7 @@ float keyDownXonoticServerList(entity me, float scan, float ascii, float shift)
                        me.ipAddressBoxFocused = -1;
                }
        }
-       else if(keyDownListBox(me, scan, ascii, shift))
+       else if(SUPER(XonoticServerList).keyDown(me, scan, ascii, shift))
                return 1;
        else if(!me.controlledTextbox)
                return 0;
index 78ff80ca40306d73070eff7a543e1d3dedfe54d5..bcb62251aa9f30650c41894a486add3546383ae4 100644 (file)
@@ -50,14 +50,14 @@ entity makeXonoticSkinList()
        return me;
 }
 
-void configureXonoticSkinListXonoticSkinList(entity me)
+void XonoticSkinList_configureXonoticSkinList(entity me)
 {
        me.configureXonoticListBox(me);
        me.getSkins(me);
        me.loadCvars(me);
 }
 
-void loadCvarsXonoticSkinList(entity me)
+void XonoticSkinList_loadCvars(entity me)
 {
        string s;
        float i, n;
@@ -73,17 +73,17 @@ void loadCvarsXonoticSkinList(entity me)
        }
 }
 
-void saveCvarsXonoticSkinList(entity me)
+void XonoticSkinList_saveCvars(entity me)
 {
        cvar_set("menu_skin", me.skinParameter(me, me.selectedItem, SKINPARM_NAME));
 }
 
-string skinParameterXonoticSkinList(entity me, float i, float key)
+string XonoticSkinList_skinParameter(entity me, float i, float key)
 {
        return bufstr_get(me.skinlist, i * SKINPARM_COUNT + key);
 }
 
-void getSkinsXonoticSkinList(entity me)
+void XonoticSkinList_getSkins(entity me)
 {
        float glob, buf, i, n, fh;
        string s;
@@ -128,15 +128,15 @@ void getSkinsXonoticSkinList(entity me)
        me.nItems = n;
 }
 
-void destroyXonoticSkinList(entity me)
+void XonoticSkinList_destroy(entity me)
 {
        buf_del(me.skinlist);
 }
 
-void resizeNotifyXonoticSkinList(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void XonoticSkinList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
        me.itemAbsSize = '0 0 0';
-       resizeNotifyXonoticListBox(me, relOrigin, relSize, absOrigin, absSize);
+       SUPER(XonoticSkinList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
 
        me.realFontSize_y = me.fontSize / (me.itemAbsSize_y = (absSize_y * me.itemHeight));
        me.realFontSize_x = me.fontSize / (me.itemAbsSize_x = (absSize_x * (1 - me.controlWidth)));
@@ -149,7 +149,7 @@ void resizeNotifyXonoticSkinList(entity me, vector relOrigin, vector relSize, ve
        me.columnNameSize = 1 - me.columnPreviewSize - 2 * me.realFontSize_x;
 }
 
-void drawListBoxItemXonoticSkinList(entity me, float i, vector absSize, float isSelected)
+void XonoticSkinList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
 {
        string s;
        
@@ -169,7 +169,7 @@ void drawListBoxItemXonoticSkinList(entity me, float i, vector absSize, float is
        draw_Text(me.realUpperMargin2 * eY + (me.columnNameOrigin + 1.00 * (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize))) * eX, s, me.realFontSize, SKINCOLOR_SKINLIST_AUTHOR, SKINALPHA_TEXT, 0);
 }
 
-void setSkinXonoticSkinList(entity me)
+void XonoticSkinList_setSkin(entity me)
 {
        me.saveCvars(me);
        localcmd("\nmenu_restart\ntogglemenu\ndefer 0.1 \"menu_cmd skinselect\"\n");
@@ -180,7 +180,7 @@ void SetSkin_Click(entity btn, entity me)
        me.setSkin(me);
 }
 
-void clickListBoxItemXonoticSkinList(entity me, float i, vector where)
+void XonoticSkinList_clickListBoxItem(entity me, float i, vector where)
 {
        if(i == me.lastClickedSkin)
                if(time < me.lastClickedTime + 0.3)
@@ -193,13 +193,13 @@ void clickListBoxItemXonoticSkinList(entity me, float i, vector where)
        me.lastClickedTime = time;
 }
 
-float keyDownXonoticSkinList(entity me, float scan, float ascii, float shift)
+float XonoticSkinList_keyDown(entity me, float scan, float ascii, float shift)
 {
        if(scan == K_ENTER) {
                me.setSkin(me);
                return 1;
        }
        else
-               return keyDownListBox(me, scan, ascii, shift);
+               return SUPER(XonoticSkinList).keyDown(me, scan, ascii, shift);
 }
 #endif
index 134557da7dcd9bd1c12065e89f213d78fea799d1..46a01bb5ac0e3c1c1e089a90836c4de3b851370f 100644 (file)
@@ -31,7 +31,7 @@ entity makeXonoticSlider(float theValueMin, float theValueMax, float theValueSte
        me.configureXonoticSlider(me, theValueMin, theValueMax, theValueStep, theCvar);
        return me;
 }
-void configureXonoticSliderXonoticSlider(entity me, float theValueMin, float theValueMax, float theValueStep, string theCvar)
+void XonoticSlider_configureXonoticSlider(entity me, float theValueMin, float theValueMax, float theValueStep, string theCvar)
 {
        float v, vk, vp;
        v = theValueMin;
@@ -49,22 +49,22 @@ void configureXonoticSliderXonoticSlider(entity me, float theValueMin, float the
                        me.tooltip = getZonedTooltipForIdentifier(theCvar);
        }
 }
-void setValueXonoticSlider(entity me, float val)
+void XonoticSlider_setValue(entity me, float val)
 {
        if(val != me.value)
        {
-               setValueSlider( me, val );
+               SUPER(XonoticSlider).setValue( me, val );
                me.saveCvars(me);
        }
 }
-void loadCvarsXonoticSlider(entity me)
+void XonoticSlider_loadCvars(entity me)
 {
        if not(me.cvarName)
                return;
 
        me.setValue( me, cvar(me.cvarName) );
 }
-void saveCvarsXonoticSlider(entity me)
+void XonoticSlider_saveCvars(entity me)
 {
        if not(me.cvarName)
                return;
index ba7cffc22f049b99564ca11fb7582225716b90db..0e4b4e3720e8c0bece5fe57d26cf79620c6428ce 100644 (file)
@@ -16,7 +16,7 @@ entity makeXonoticDecibelsSlider(float theValueMin, float theValueMax, float the
        me.configureXonoticSlider(me, theValueMin, theValueMax, theValueStep, theCvar);
        return me;
 }
-void loadCvarsXonoticDecibelsSlider(entity me)
+void XonoticDecibelsSlider_loadCvars(entity me)
 {
        float v;
 
@@ -25,13 +25,13 @@ void loadCvarsXonoticDecibelsSlider(entity me)
 
        v = cvar(me.cvarName);
        if(v >= 0.98)
-               setValueSlider( me, 0 );
+               Slider_setValue( me, 0 );
        else if(v < 0.0005)
-               setValueSlider( me, -1000000 );
+               Slider_setValue( me, -1000000 );
        else
-               setValueSlider( me, 0.1 * floor(0.5 + 10.0 * log10(cvar(me.cvarName)) * 10) );
+               Slider_setValue( me, 0.1 * floor(0.5 + 10.0 * log10(cvar(me.cvarName)) * 10) );
 }
-void saveCvarsXonoticDecibelsSlider(entity me)
+void XonoticDecibelsSlider_saveCvars(entity me)
 {
        if not(me.cvarName)
                return;
@@ -44,13 +44,13 @@ void saveCvarsXonoticDecibelsSlider(entity me)
                cvar_set(me.cvarName, ftos(pow(10, me.value / 10)));
 }
 
-string valueToTextXonoticDecibelsSlider(entity me, float v)
+string XonoticDecibelsSlider_valueToText(entity me, float v)
 {
        if(v < -33)
                return "OFF";
        else if(v >= -0.1)
                return "MAX";
-       return strcat(valueToTextSlider(me, v), " dB");
+       return strcat(SUPER(XonoticDecibelsSlider).valueToText(me, v), " dB");
 }
 
 #endif
index ed6db5b69eaef49cd3c4ce2c64147660ba81c619..de34a410d9fb2ef9722efb6b9e28382f11b563dd 100644 (file)
@@ -60,12 +60,12 @@ entity makeXonoticResolutionSlider()
        me.configureXonoticResolutionSlider(me);
        return me;
 }
-void addResolutionXonoticResolutionSlider(entity me, float w, float h, float pixelheight)
+void XonoticResolutionSlider_addResolution(entity me, float w, float h, float pixelheight)
 {
        me.addValue(me, strzone(strcat(ftos(w), "x", ftos(h))), strzone(strcat(ftos(w), " ", ftos(h), " ", ftos(pixelheight))));
        // FIXME (in case you ever want to dynamically instantiate this): THIS IS NEVER FREED
 }
-void configureXonoticResolutionSliderXonoticResolutionSlider(entity me)
+void XonoticResolutionSlider_configureXonoticResolutionSlider(entity me)
 {
        float i;
        vector r0, r;
@@ -90,11 +90,11 @@ void configureXonoticResolutionSliderXonoticResolutionSlider(entity me)
 
        me.configureXonoticTextSliderValues(me);
 }
-void loadCvarsXonoticResolutionSlider(entity me)
+void XonoticResolutionSlider_loadCvars(entity me)
 {
        me.setValueFromIdentifier(me, strcat(cvar_string("menu_vid_width"), " ", cvar_string("menu_vid_height"), " ", cvar_string("menu_vid_pixelheight")));
 }
-void saveCvarsXonoticResolutionSlider(entity me)
+void XonoticResolutionSlider_saveCvars(entity me)
 {
        if(me.value >= 0 || me.value < me.nValues)
        {
index d771d7157b65355c92cdbe28bfb96764bb7eabf4..d1a867a2f88817253b5285838a772c444caf9994 100644 (file)
@@ -22,9 +22,9 @@ ENDCLASS(XonoticTab)
 #endif
 
 #ifdef IMPLEMENTATION
-void showNotifyXonoticTab(entity me)
+void XonoticTab_showNotify(entity me)
 {
        loadAllCvars(me);
-       showNotifyContainer(me);
+       SUPER(XonoticTab).showNotify(me);
 }
 #endif
index e454e23e066089f60cddec00de2b633c4ad6ce4d..1faa625aee83c607a4af8eab55117a0ddde091ea 100644 (file)
@@ -17,11 +17,11 @@ entity makeXonoticTabController(float theRows)
        me.configureXonoticTabController(me, theRows);
        return me;
 }
-void configureXonoticTabControllerXonoticTabController(entity me, float theRows)
+void XonoticTabController_configureXonoticTabController(entity me, float theRows)
 {
        me.rows = theRows;
 }
-entity makeTabButtonXonoticTabController(entity me, string theTitle, entity tab)
+entity XonoticTabController_makeTabButton(entity me, string theTitle, entity tab)
 {
        entity b;
        if(me.rows != tab.rows)
index 020f79035f1bf05c8b6a515c5e5878809f6c6b5c..757e07ff1bc74e77408c5b22e364ea1727863275 100644 (file)
@@ -17,12 +17,12 @@ entity makeXonoticTextLabel(float theAlign, string theText)
        me.configureXonoticTextLabel(me, theAlign, theText);
        return me;
 }
-void configureXonoticTextLabelXonoticTextLabel(entity me, float theAlign, string theText)
+void XonoticTextLabel_configureXonoticTextLabel(entity me, float theAlign, string theText)
 {
        me.configureLabel(me, theText, me.fontSize, theAlign);
 }
-void drawXonoticTextLabel(entity me)
+void XonoticTextLabel_draw(entity me)
 {
-       drawLabel(me);
+       SUPER(XonoticTextLabel).draw(me);
 }
 #endif
index 2236bc51fe362b88705c10b353e0e57b6e5ef7fe..69270a67ac11f3e7f0419b07c7a52c40d5fb5d41 100644 (file)
@@ -32,7 +32,7 @@ entity makeXonoticTextSlider(string theCvar)
        me.configureXonoticTextSlider(me, theCvar);
        return me;
 }
-void configureXonoticTextSliderXonoticTextSlider(entity me, string theCvar)
+void XonoticTextSlider_configureXonoticTextSlider(entity me, string theCvar)
 {
        me.configureSliderVisuals(me, me.fontSize, me.align, me.valueSpace, me.image);
        if(theCvar)
@@ -42,15 +42,15 @@ void configureXonoticTextSliderXonoticTextSlider(entity me, string theCvar)
                // don't load it yet
        }
 }
-void setValueXonoticTextSlider(entity me, float val)
+void XonoticTextSlider_setValue(entity me, float val)
 {
        if(val != me.value)
        {
-               setValueSlider( me, val );
+               SUPER(XonoticTextSlider).setValue( me, val );
                me.saveCvars(me);
        }
 }
-void loadCvarsXonoticTextSlider(entity me)
+void XonoticTextSlider_loadCvars(entity me)
 {
        if not(me.cvarName)
                return;
@@ -62,7 +62,7 @@ void loadCvarsXonoticTextSlider(entity me)
                s = strcat(s, " ", cvar_string(argv(i)));
        me.setValueFromIdentifier(me, s);
 }
-void saveCvarsXonoticTextSlider(entity me)
+void XonoticTextSlider_saveCvars(entity me)
 {
        if not(me.cvarName)
                return;
@@ -94,7 +94,7 @@ void saveCvarsXonoticTextSlider(entity me)
                }
        }
 }
-void configureXonoticTextSliderValuesXonoticTextSlider(entity me)
+void XonoticTextSlider_configureXonoticTextSliderValues(entity me)
 {
        me.configureTextSliderValues(me, string_null);
        me.loadCvars(me);
index 3571e1ba834c6b47c5c9cb7392f9e071ee9289ec..9a40ba25be82174cce4fe4c25c1f01393aeafe15 100644 (file)
@@ -393,3 +393,11 @@ string resolvemod(string m)
        else
                return m;
 }
+
+string HUD_Panel_GetSettingName(float theSetting)
+{
+       switch(theSetting) {
+               case HUD_MENU_ENABLE: return ""; break;
+               default: return "";
+       }
+}
index 55d994115652b37a4194fe244afc3781d7183057..78eb7c1c43caa7cea3019c50652e7ab4173497db 100644 (file)
@@ -18,3 +18,5 @@ void unloadTooltips();
 string getZonedTooltipForIdentifier(string s);
 
 string resolvemod(string m);
+
+string HUD_Panel_GetSettingName(float setting);
index 012f7bc7e68ea7e739e4028bbddbae5e984314f4..bd2acdf5a60ea0e20718ea363b9c9ee1d905a2bc 100644 (file)
@@ -25,11 +25,11 @@ entity makeXonoticWeaponsList()
        me.configureXonoticWeaponsList(me);
        return me;
 }
-void configureXonoticWeaponsListXonoticWeaponsList(entity me)
+void XonoticWeaponsList_configureXonoticWeaponsList(entity me)
 {
        me.configureXonoticListBox(me);
 }
-void drawXonoticWeaponsList(entity me)
+void XonoticWeaponsList_draw(entity me)
 {
        // read in cvar?
        string s, t;
@@ -41,7 +41,7 @@ void drawXonoticWeaponsList(entity me)
                cvar_set("cl_weaponpriority", W_NameWeaponOrder(t));
        }
        me.nItems = tokenize_console(t);
-       drawListBox(me);
+       SUPER(XonoticWeaponsList).draw(me);
 }
 void WeaponsList_MoveUp_Click(entity box, entity me)
 {
@@ -59,24 +59,24 @@ void WeaponsList_MoveDown_Click(entity box, entity me)
                me.selectedItem += 1;
        }
 }
-void resizeNotifyXonoticWeaponsList(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void XonoticWeaponsList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
-       resizeNotifyXonoticListBox(me, relOrigin, relSize, absOrigin, absSize);
+       SUPER(XonoticWeaponsList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
 
        me.realFontSize_y = me.fontSize / (absSize_y * me.itemHeight);
        me.realFontSize_x = me.fontSize / (absSize_x * (1 - me.controlWidth));
        me.realUpperMargin = 0.5 * (1 - me.realFontSize_y);
 }
-float mouseDragXonoticWeaponsList(entity me, vector pos)
+float XonoticWeaponsList_mouseDrag(entity me, vector pos)
 {
        float f, i;
        i = me.selectedItem;
-       f = mouseDragListBox(me, pos);
+       f = SUPER(XonoticWeaponsList).mouseDrag(me, pos);
        if(me.selectedItem != i)
                cvar_set("cl_weaponpriority", swapInPriorityList(cvar_string("cl_weaponpriority"), me.selectedItem, i));
        return f;
 }
-string toStringXonoticWeaponsList(entity me)
+string XonoticWeaponsList_toString(entity me)
 {
        float n, i;
        string s;
@@ -90,7 +90,7 @@ string toStringXonoticWeaponsList(entity me)
        }
        return substring(s, 0, strlen(s) - 2);
 }
-void drawListBoxItemXonoticWeaponsList(entity me, float i, vector absSize, float isSelected)
+void XonoticWeaponsList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
 {
        entity e;
        if(isSelected)
@@ -99,7 +99,7 @@ void drawListBoxItemXonoticWeaponsList(entity me, float i, vector absSize, float
        draw_Text(me.realUpperMargin * eY, e.message, me.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
 }
 
-float keyDownXonoticWeaponsList(entity me, float scan, float ascii, float shift)
+float XonoticWeaponsList_keyDown(entity me, float scan, float ascii, float shift)
 {
        if(ascii == 43) // +
        {
@@ -111,7 +111,7 @@ float keyDownXonoticWeaponsList(entity me, float scan, float ascii, float shift)
                WeaponsList_MoveDown_Click(NULL, me);
                return 1;
        }
-       else if(keyDownListBox(me, scan, ascii, shift))
+       else if(SUPER(XonoticWeaponsList).keyDown(me, scan, ascii, shift))
                return 1;
        return 0;
 }
diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
new file mode 100644 (file)
index 0000000..36334b2
--- /dev/null
@@ -0,0 +1,3 @@
+float autocvar_sv_cheats;
+float autocvar_g_bastet;
+var float autocvar_g_movement_highspeed = 1;
index 940782c8239d9538f474405d87d7b21f967dc447..3ef50481dc5eb785e6cf2d60a0d26c47078b9436 100644 (file)
@@ -136,7 +136,8 @@ void bot_setnameandstuff()
                        prio = 1;
                        FOR_EACH_CLIENT(p)
                        {
-                               if(strcat(prefix, s, suffix) == p.netname)
+                               if(clienttype(p) == CLIENTTYPE_BOT)
+                               if(s == p.cleanname)
                                {
                                        prio = 0;
                                        break;
@@ -200,8 +201,6 @@ void bot_setnameandstuff()
        else
                name = bot_name;
 
-       self.cleanname = strzone(name);
-
        // number bots with identical names
        float i;
        i = 0;
@@ -212,7 +211,11 @@ void bot_setnameandstuff()
                                ++i;
        }
        if (i)
-               name = strcat(name, "(", ftos(i), ")");
+               self.netname = self.netname_freeme = strzone(strcat(prefix, name, "(", ftos(i), ")", suffix));
+       else
+               self.netname = self.netname_freeme = strzone(strcat(prefix, name, suffix));
+
+       self.cleanname = strzone(name);
 
        // pick the model and skin
        if(substring(bot_model, -4, 1) != ".")
@@ -220,8 +223,6 @@ void bot_setnameandstuff()
        self.playermodel = self.playermodel_freeme = strzone(strcat("models/player/", bot_model));
        self.playerskin = self.playerskin_freeme = strzone(bot_skin);
 
-       self.netname = self.netname_freeme = strzone(strcat(prefix, name, suffix));
-
        self.cvar_cl_accuracy_data_share = 1;  // share the bots weapon accuracy data with the world
        self.cvar_cl_accuracy_data_receive = 0;  // don't receive any weapon accuracy data
 };
index 45eab621ea6b83caf327e662ceff0648dc2d09fe..6ef82679444fc021f0e4d53b42bf278333cf9b8f 100644 (file)
@@ -15,7 +15,6 @@ void Drag_MoveDrag(entity from, entity to) { }
 
 .float maycheat;
 float sv_cheats;
-float autocvar_sv_cheats;
 
 #define CHIMPULSE_SPEEDRUN_INIT 30
 #define CHIMPULSE_GIVE_ALL 99
index 3a405c40be8f52fe179c71cb631ec044da90213c..ac6789586793c86387026ffdfbb787d44850cebd 100644 (file)
@@ -641,7 +641,6 @@ void race_send_speedaward_alltimebest(float msg)
 string GetMapname(void);
 float speedaward_lastupdate;
 float speedaward_lastsent;
-var float autocvar_g_movement_highspeed = 1;
 void SV_PlayerPhysics()
 {
        local vector wishvel, wishdir, v;
index 04b656c9a134e0daf0ee956dff64e7dd5251b753..4ab7abde4b200cf0bf122f2ef955408018ddc4d4 100644 (file)
@@ -121,9 +121,9 @@ void W_NextWeaponOnImpulse(float imp)
 void W_NextWeapon(float list)
 {
        if(list == 0)
-               W_CycleWeapon(weaponpriority_hudselector_0, -1);
+               W_CycleWeapon(weaponorder_byid, -1);
        else if(list == 1)
-               W_CycleWeapon(weaponpriority_hudselector_1, -1);
+               W_CycleWeapon(weaponorder_byimpulse, -1);
        else if(list == 2)
                W_CycleWeapon(self.cvar_cl_weaponpriority, -1);
 }
@@ -132,9 +132,9 @@ void W_NextWeapon(float list)
 void W_PreviousWeapon(float list)
 {
        if(list == 0)
-               W_CycleWeapon(weaponpriority_hudselector_0, +1);
+               W_CycleWeapon(weaponorder_byid, +1);
        else if(list == 1)
-               W_CycleWeapon(weaponpriority_hudselector_1, +1);
+               W_CycleWeapon(weaponorder_byimpulse, +1);
        else if(list == 2)
                W_CycleWeapon(self.cvar_cl_weaponpriority, +1);
 }
index 1d40efcc2c5bcfd67b15485ea2b75e6155d0ca27..4148136daf62dd0454c3c80f9c92c3359edeb75e 100644 (file)
@@ -290,7 +290,8 @@ void DropFlag(entity e, entity penalty_receiver, entity attacker)
                dprint("FLAG: drop - owner is not carrying this flag??\n");
                return;
        }
-       bprint(p.netname, "^7 lost the ", e.netname, "\n");
+       //bprint(p.netname, "^7 lost the ", e.netname, "\n");
+       Send_KillNotification (p.netname, e.netname, "", INFO_LOSTFLAG, MSG_INFO);
 
        if(penalty_receiver)
                UpdateFrags(penalty_receiver, -ctf_score_value("penalty_suicidedrop"));
@@ -542,7 +543,8 @@ void FlagTouch()
                other.flagcarried = self;
                self.cnt = FLAG_CARRY;
                self.angles = '0 0 0';
-               bprint(other.netname, "^7 got the ", self.netname, "\n");
+               //bprint(other.netname, "^7 got the ", self.netname, "\n");
+               Send_KillNotification (other.netname, self.netname, "", INFO_GOTFLAG, MSG_INFO);
                UpdateFrags(other, ctf_score_value("score_pickup_base"));
                self.dropperid = other.playerid;
                PlayerScore_Add(other, SP_CTF_PICKUPS, 1);
@@ -569,7 +571,8 @@ void FlagTouch()
                if (other.team == self.team || (other.team != COLOR_TEAM1 && other.team != COLOR_TEAM2))
                {
                        // return flag
-                       bprint(other.netname, "^7 returned the ", self.netname, "\n");
+                       Send_KillNotification (other.netname, self.netname, "", INFO_RETURNFLAG, MSG_INFO);
+                       //bprint(other.netname, "^7 returned the ", self.netname, "\n");
 
                        // punish the player who last had it
                        FOR_EACH_PLAYER(player)
@@ -619,7 +622,8 @@ void FlagTouch()
                        self.owner = other;
                        other.flagcarried = self;
                        self.cnt = FLAG_CARRY;
-                       bprint(other.netname, "^7 picked up the ", self.netname, "\n");
+                       Send_KillNotification (other.netname, self.netname, "", INFO_PICKUPFLAG, MSG_INFO);
+                       //bprint(other.netname, "^7 picked up the ", self.netname, "\n");
 
                        float f;
                        f = bound(0, (self.pain_finished - time) / cvar("g_ctf_flag_returntime"), 1);
index 505b2e7688a659d890b36faa422a41228ce66c61..30e49cd56f7d782b11c0721fee96bde7bba0396b 100644 (file)
@@ -245,10 +245,39 @@ void LogDeath(string mode, float deathtype, entity killer, entity killed)
        GameLogEcho(s);
 }
 
+void Send_KillNotification (string s1, string s2, string s3, float msg, float type)
+{
+       WriteByte(MSG_ALL, SVC_TEMPENTITY);
+       WriteByte(MSG_ALL, TE_CSQC_NOTIFY);
+       WriteByte(MSG_ALL, CSQC_KILLNOTIFY);
+       WriteString(MSG_ALL, s1);
+       WriteString(MSG_ALL, s2);
+       WriteString(MSG_ALL, s3);
+       WriteShort(MSG_ALL, msg);
+       WriteByte(MSG_ALL, type);
+}
+
+// TODO: writespectatable?
+// Function is used to send a generic centerprint whose content CSQC gets to decide (gentle version or not in the below cases)
+void Send_CSQC_Centerprint(entity e, string s1, string s2, float msg, float type)
+{
+       if (clienttype(e) == CLIENTTYPE_REAL)
+       {
+               msg_entity = e;
+               WriteByte(MSG_ONE, SVC_TEMPENTITY);
+               WriteByte(MSG_ONE, TE_CSQC_NOTIFY);
+               WriteByte(MSG_ONE, CSQC_CENTERPRINT);
+               WriteString(MSG_ONE, s1);
+               WriteString(MSG_ONE, s2);
+               WriteShort(MSG_ONE, msg);
+               WriteByte(MSG_ONE, type);
+       }
+}
+
 void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 {
-       string  s, a;
-       float p, w;
+       string  s, a, msg;
+       float p, w, type;
 
        if (targ.classname == "player" || targ.classname == "corpse")
        {
@@ -259,115 +288,66 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 
                a = attacker.netname;
 
-               if (targ == attacker)
+               if (targ == attacker) // suicides
                {
-                       if (deathtype == DEATH_TEAMCHANGE) {
-                               centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, "You are now on: ", ColoredTeamName(targ.team)));
-                       } else if (deathtype == DEATH_AUTOTEAMCHANGE) {
-                               centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, "You have been moved into a different team to improve team balance\nYou are now on: ", ColoredTeamName(targ.team)));
-                               return;
-                       } else if (deathtype == DEATH_CAMP) {
-                               if(sv_gentle)
-                                       centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, "^1Reconsider your tactics, camper!"));
-                               else
-                                       centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, "^1Die camper!"));
-                       } else if (deathtype == DEATH_NOAMMO) {
-                               if(sv_gentle)
-                                       centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, "^1You are reinserted into the game for running out of ammo..."));
-                               else
-                                       centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were killed for running out of ammo..."));
-                       } else if (deathtype == DEATH_ROT) {
-                               if(sv_gentle)
-                                       centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, "^1You need to preserve your health"));
-                               else
-                                       centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, "^1You grew too old without taking your medicine"));
-                       } else if (deathtype == DEATH_MIRRORDAMAGE) {
-                               if(sv_gentle)
-                                       centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, "^1Don't go against team mates!"));
-                               else
-                                       centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, "^1Don't shoot your team mates!"));
-                       } else if (deathtype == DEATH_QUIET) {
-                               // do nothing
-                       } else {
-                               if(sv_gentle)
-                                       centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, "^1You need to be more careful!"));
-                               else
-                                       centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, "^1You killed your own dumb self!"));
-                       }
-                       if(sv_gentle) {
-                               if (deathtype == DEATH_CAMP)
-                                       bprint ("^1",s, "^1 thought they found a nice camping ground\n");
-                               else if (deathtype == DEATH_MIRRORDAMAGE)
-                                       bprint ("^1",s, "^1 didn't become friends with the Lord of Teamplay\n");
-                               else
-                                       bprint ("^1",s, "^1 will be reinserted into the game due to their own actions\n");
+                       if (deathtype == DEATH_TEAMCHANGE || deathtype == DEATH_AUTOTEAMCHANGE)
+                               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);
-                               }
+                       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");
-                       } else {
-                               w = DEATH_WEAPONOF(deathtype);
-                               if(WEP_VALID(w))
-                               {
-                                       w_deathtypestring = "couldn't resist the urge to self-destruct";
-                                       w_deathtype = deathtype;
-                                       weapon_action(w, WR_SUICIDEMESSAGE);
-                                       bprint("^1", s, "^1 ", w_deathtypestring, "\n");
-                               }
-                               else if (deathtype == DEATH_KILL)
-                                       bprint ("^1",s, "^1 couldn't take it anymore\n");
-                               else if (deathtype == DEATH_ROT)
-                                       bprint ("^1",s, "^1 died\n");
-                               else if (deathtype == DEATH_NOAMMO)
-                                       bprint ("^7",s, "^7 committed suicide. What's the point of living without ammo?\n");
-                               else if (deathtype == DEATH_CAMP)
-                                       bprint ("^1",s, "^1 thought they found a nice camping ground\n");
-                               else if (deathtype == DEATH_MIRRORDAMAGE)
-                                       bprint ("^1",s, "^1 didn't become friends with the Lord of Teamplay\n");
-                               else if (deathtype == DEATH_CHEAT)
-                                       bprint ("^1",s, "^1 unfairly eliminated themself\n");
-                               else if (deathtype == DEATH_FIRE)
-                                       bprint ("^1",s, "^1 burned to death\n");
-                               else if (deathtype != DEATH_TEAMCHANGE && deathtype != DEATH_QUIET)
-                                       bprint ("^1",s, "^1 couldn't resist the urge to self-destruct\n");
-
-                               if(deathtype != DEATH_TEAMCHANGE && deathtype != DEATH_QUIET)
-                               {
-                                       LogDeath("suicide", deathtype, targ, targ);
-                                       GiveFrags(attacker, targ, -1);
-                               }
-                               if (targ.killcount > 2)
-                                       bprint ("^1",s,"^1 ended it all after a ",ftos(targ.killcount)," kill spree\n");
+                       */
+
+                       // TODO: wut is this?
+                       // givefrags for logging apparently?
+                       if(deathtype != DEATH_TEAMCHANGE && deathtype != DEATH_QUIET)
+                       {
+                               LogDeath("suicide", deathtype, targ, targ);
+                               GiveFrags(attacker, targ, -1);
                        }
+
+                       if (targ.killcount > 2)
+                               msg = ftos(targ.killcount);
+                       if(teams_matter && attacker.team == targ.team)
+                       {
+                               if(attacker.team == COLOR_TEAM1)
+                                       deathtype = KILL_TEAM_RED;
+                               else
+                                       deathtype = KILL_TEAM_BLUE;
+                       }
+
+                       Send_KillNotification(s, msg, ftos(w), deathtype, MSG_SUICIDE);
                }
                else if (attacker.classname == "player" || attacker.classname == "gib")
                {
                        if(teams_matter && attacker.team == targ.team)
                        {
-                               if(sv_gentle) {
-                                       centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You went against a team mate!"));
-                                       bprint ("^1", a, "^1 took action against a team mate\n");
-                               } else {
-                                       centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You fragged ", s, ", a team mate!"));
-                                       bprint ("^1", a, "^1 mows down a team mate\n");
-                               }
+                               if(attacker.team == COLOR_TEAM1)
+                                       type = KILL_TEAM_RED;
+                               else
+                                       type = KILL_TEAM_BLUE;
+
                                GiveFrags(attacker, targ, -1);
+
+                               Send_CSQC_Centerprint(attacker, s, "", type, MSG_KILL);
+
                                if (targ.killcount > 2) {
-                                       if(sv_gentle)
-                                               bprint ("^1",s,"'s ^1",ftos(targ.killcount)," scoring spree was ended by a team mate!\n");
-                                       else
-                                               bprint ("^1",s,"'s ^1",ftos(targ.killcount)," kill spree was ended by a team mate!\n");
+                                       msg = ftos(targ.killcount);
                                }
+
                                if (attacker.killcount > 2) {
-                                       if(sv_gentle)
-                                               bprint ("^1",a,"^1 ended a ",ftos(attacker.killcount)," scoring spree by going against a team mate\n");
-                                       else
-                                               bprint ("^1",a,"^1 ended a ",ftos(attacker.killcount)," kill spree by killing a team mate\n");
+                                       msg = ftos(attacker.killcount);
+                                       type = KILL_TEAM_SPREE;
                                }
+                               Send_KillNotification(a, s, msg, type, MSG_KILL);
+
                                attacker.killcount = 0;
 
                                LogDeath("tk", deathtype, attacker, targ);
@@ -378,99 +358,30 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                if (!checkrules_firstblood)
                                {
                                        checkrules_firstblood = TRUE;
-                                       if(sv_gentle)
-                                       {
-                                               bprint("^1",a, "^1 was the first to score", "\n");
-                                               blood_message = "^1First point\n";
-                                               //victim_message = "^1First victim\n";  // or First casualty
-                                       }
-                                       else
-                                       {
-                                               bprint("^1",a, "^1 drew first blood", "\n");
-                                               blood_message = "^1First blood\n";
-                                               victim_message = "^1First victim\n";  // or First casualty
-                                       }
+                                       Send_KillNotification(a, "", "", KILL_FIRST_BLOOD, MSG_KILL);
+                                       // TODO: make these print at newline if they dont
+                                       Send_CSQC_Centerprint(attacker, "", "", KILL_FIRST_BLOOD, MSG_KILL);
+                                       Send_CSQC_Centerprint(targ, "", "", KILL_FIRST_VICTIM, MSG_KILL);
                                }
-                               if(sv_gentle > 0) {
-                                       centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^4You scored against ^7", s, GetAdvancedDeathReports(targ)));
-                                       centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, a,"^1 scored against you ^7", GetAdvancedDeathReports(attacker)));
+
+                               if((cvar("sv_fragmessage_information_typefrag")) && (targ.BUTTON_CHAT)) {
+                                       Send_CSQC_Centerprint(attacker, s, GetAdvancedDeathReports(targ), KILL_TYPEFRAG, MSG_KILL);
+                                       Send_CSQC_Centerprint(targ, a, GetAdvancedDeathReports(attacker), KILL_TYPEFRAGGED, MSG_KILL);
                                } else {
-                                       if((cvar("sv_fragmessage_information_typefrag")) && (targ.BUTTON_CHAT)) {
-                                               centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^1You typefragged ^7", s, GetAdvancedDeathReports(targ)));
-                                               centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were typefragged by ^7", a, GetAdvancedDeathReports(attacker)));
-                                       } else {
-                                               centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^4You fragged ^7", s, GetAdvancedDeathReports(targ)));
-                                               centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were fragged by ^7", a, GetAdvancedDeathReports(attacker)));
-                                       }
-                                       attacker.taunt_soundtime = time + 1;
+                                       Send_CSQC_Centerprint(attacker, s, GetAdvancedDeathReports(targ), KILL_FRAG, MSG_KILL);
+                                       Send_CSQC_Centerprint(targ, a, GetAdvancedDeathReports(attacker), KILL_FRAGGED, MSG_KILL);
                                }
 
-                               if(sv_gentle) {
-                                       bprint ("^1",s, "^1 needs a restart thanks to ", a, "\n");
-                               } else {
-                                       w = DEATH_WEAPONOF(deathtype);
-                                       if(WEP_VALID(w))
-                                       {
-                                               w_deathtypestring = "was blasted by";
-                                               w_deathtype = deathtype;
-                                               weapon_action(w, WR_KILLMESSAGE);
-                                               p = strstrofs(w_deathtypestring, "#", 0);
-                                               if(p < 0)
-                                                       bprint("^1", s, "^1 ", w_deathtypestring, " ", a, "\n");
-                                               else
-                                                       bprint("^1", s, "^1 ", substring(w_deathtypestring, 0, p), a, "^1", substring(w_deathtypestring, p+1, strlen(w_deathtypestring) - (p+1)), "\n");
-                                       }
-                                       else if (deathtype == DEATH_TELEFRAG)
-                                               bprint ("^1",s, "^1 was telefragged by ", a, "\n");
-                                       else if (deathtype == DEATH_DROWN)
-                                               bprint ("^1",s, "^1 was drowned by ", a, "\n");
-                                       else if (deathtype == DEATH_SLIME)
-                                               bprint ("^1",s, "^1 was slimed by ", a, "\n");
-                                       else if (deathtype == DEATH_LAVA)
-                                               bprint ("^1",s, "^1 was cooked by ", a, "\n");
-                                       else if (deathtype == DEATH_FALL)
-                                               bprint ("^1",s, "^1 was grounded by ", a, "\n");
-                                       else if (deathtype == DEATH_SHOOTING_STAR)
-                                               bprint ("^1",s, "^1 was shot into space by ", a, "\n");
-                                       else if (deathtype == DEATH_SWAMP)
-                                               bprint ("^1",s, "^1 was conserved by ", a, "\n");
+                               attacker.taunt_soundtime = time + 1;
+
+                               // TODO: fix this?
+                                       if (deathtype == DEATH_CUSTOM)
+                                               msg = strcat(deathmessage, " by ^1", msg);
                                        else if (deathtype == DEATH_HURTTRIGGER && inflictor.message2 != "")
                                        {
-                                               p = strstrofs(inflictor.message2, "#", 0);
-                                               if(p < 0)
-                                                       bprint("^1", s, "^1 ", inflictor.message2, " ", a, "\n");
-                                               else
-                                                       bprint("^1", s, "^1 ", substring(inflictor.message2, 0, p), a, "^1", substring(inflictor.message2, p+1, strlen(inflictor.message2) - (p+1)), "\n");
+                                               msg = ftos(strstrofs(inflictor.message2, "#", 0));
                                        }
-                                       else if(deathtype == DEATH_SBCRUSH)
-                        bprint ("^1",s, "^1 was crushed by ^1", a, "\n");
-                                       else if(deathtype == DEATH_SBMINIGUN)
-                        bprint ("^1",s, "^1 got shredded by ^1", a, "\n");
-                                       else if(deathtype == DEATH_SBROCKET)
-                        bprint ("^1",s, "^1 was blased to bits by ^1", a, "\n");
-                                       else if(deathtype == DEATH_SBBLOWUP)
-                        bprint ("^1",s, "^1 got cought in the destruction of ^1", a, "'s vehicle\n");
-
-                                       else if(deathtype == DEATH_WAKIGUN)
-                        bprint ("^1",s, "^1 was bolted down by ^1", a, "\n");
-                                       else if(deathtype == DEATH_WAKIROCKET)
-                        bprint ("^1",s, "^1 could find no shelter from ^1", a, "'s rockets\n");
-                                       else if(deathtype == DEATH_WAKIBLOWUP)
-                        bprint ("^1",s, "^1 dies when ^1", a, "'s wakizashi dies.\n");
-
-                                       else if(deathtype == DEATH_TURRET)
-                                               bprint ("^1",s, "^1 was pushed into the line of fire by ^1", a, "\n");
-                                       else if(deathtype == DEATH_TOUCHEXPLODE)
-                                               bprint ("^1",s, "^1 was pushed into an accident by ^1", a, "\n");
-                                       else if(deathtype == DEATH_CHEAT)
-                                               bprint ("^1",s, "^1 was unfairly eliminated by ^1", a, "\n");
-                                       else if (deathtype == DEATH_FIRE)
-                                       bprint ("^1",s, "^1 was burnt to death by ^1", a, "\n");
-                                       else if (deathtype == DEATH_CUSTOM)
-                                               bprint ("^1",s, "^1 ", deathmessage, " by ^1", a, "\n");
-                                       else
-                                               bprint ("^1",s, "^1 was fragged by ", a, "\n");
-                               }
+                                       Send_KillNotification(s, a, msg, deathtype, MSG_KILL);
 
                                if(g_ctf && targ.flagcarried)
                                {
@@ -482,145 +393,70 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                        GiveFrags(attacker, targ, 1);
 
                                if (targ.killcount > 2) {
-                                       if(sv_gentle)
-                                               bprint ("^1",s,"'s ^1", ftos(targ.killcount), " scoring spree was ended by ", a, "\n");
-                                       else
-                                               bprint ("^1",s,"'s ^1", ftos(targ.killcount), " kill spree was ended by ", a, "\n");
+                                       Send_KillNotification(s, ftos(targ.killcount), a, KILL_END_SPREE, MSG_SPREE);
                                }
 
                                attacker.killcount = attacker.killcount + 1;
 
                                if (attacker.killcount > 2) {
-                                       if(sv_gentle)
-                                               bprint ("^1",a,"^1 made ",ftos(attacker.killcount)," scores in a row\n");
-                                       else
-                                               bprint ("^1",a,"^1 has ",ftos(attacker.killcount)," frags in a row\n");
+                                       Send_KillNotification(a, ftos(attacker.killcount), "", KILL_SPREE, MSG_SPREE);
                                }
 
                                LogDeath("frag", deathtype, attacker, targ);
 
                                if (attacker.killcount == 3)
                                {
-                                       if(sv_gentle) {
-                                               bprint (a,"^7 made a ^1TRIPLE SCORE\n");
-                                       } else {
-                                               bprint (a,"^7 made a ^1TRIPLE FRAG\n");
-                                               AnnounceTo(attacker, "03kills");
-                                       }
+                                       Send_KillNotification(a, "", "", KILL_SPREE_3, MSG_SPREE);
+                                       AnnounceTo(attacker, "03kills");
                                }
                                else if (attacker.killcount == 5)
                                {
-                                       if(sv_gentle) {
-                                               bprint (a,"^7 unleashes ^1SCORING RAGE\n");
-                                       } else {
-                                               bprint (a,"^7 unleashes ^1RAGE\n");
-                                               AnnounceTo(attacker, "05kills");
-                                       }
+                                       Send_KillNotification(a, "", "", KILL_SPREE_5, MSG_SPREE);
+                                       AnnounceTo(attacker, "05kills");
                                }
                                else if (attacker.killcount == 10)
                                {
-                                       if(sv_gentle) {
-                                               bprint (a,"^7 made ^1TEN SCORES IN A ROW!\n");
-                                       } else {
-                                               bprint (a,"^7 starts the ^1MASSACRE!\n");
-                                               AnnounceTo(attacker, "10kills");
-                                       }
+                                       Send_KillNotification(a, "", "", KILL_SPREE_10, MSG_SPREE);
+                                       AnnounceTo(attacker, "10kills");
                                }
                                else if (attacker.killcount == 15)
                                {
-                                       if(sv_gentle) {
-                                               bprint (a,"^7 made ^1FIFTEEN SCORES IN A ROW!\n");
-                                       } else {
-                                               bprint (a,"^7 executes ^1MAYHEM!\n");
-                                               AnnounceTo(attacker, "15kills");
-                                       }
+                                       Send_KillNotification(a, "", "", KILL_SPREE_15, MSG_SPREE);
+                                       AnnounceTo(attacker, "15kills");
                                }
                                else if (attacker.killcount == 20)
                                {
-                                       if(sv_gentle) {
-                                               bprint (a,"^7 made ^1TWENTY SCORES IN A ROW!\n");
-                                       } else {
-                                               bprint (a,"^7 is a ^1BERSERKER!\n");
-                                               AnnounceTo(attacker, "20kills");
-                                       }
+                                       Send_KillNotification(a, "", "", KILL_SPREE_20, MSG_SPREE);
+                                       AnnounceTo(attacker, "20kills");
                                }
                                else if (attacker.killcount == 25)
                                {
-                                       if(sv_gentle) {
-                                               bprint (a,"^7 made ^1TWENTY FIFE SCORES IN A ROW!\n");
-                                       } else {
-                                               bprint (a,"^7 inflicts ^1CARNAGE!\n");
-                                               AnnounceTo(attacker, "25kills");
-                                       }
+                                       Send_KillNotification(a, "", "", KILL_SPREE_25, MSG_SPREE);
+                                       AnnounceTo(attacker, "25kills");
                                }
                                else if (attacker.killcount == 30)
                                {
-                                       if(sv_gentle) {
-                                               bprint (a,"^7 made ^1THIRTY SCORES IN A ROW!\n");
-                                       } else {
-                                               bprint (a,"^7 unleashes ^1ARMAGEDDON!\n");
-                                               AnnounceTo(attacker, "30kills");
-                                       }
+                                       Send_KillNotification(a, "", "", KILL_SPREE_30, MSG_SPREE);
+                                       AnnounceTo(attacker, "30kills");
                                }
                        }
                }
                else
                {
-                       centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, "^1Watch your step!"));
+                       Send_CSQC_Centerprint(targ, "", "", deathtype, MSG_KILL_ACTION);
                        if (deathtype == DEATH_HURTTRIGGER && inflictor.message != "")
-                               bprint ("^1",s, "^1 ", inflictor.message, "\n");
-                       else if (deathtype == DEATH_DROWN)
-                               if(sv_gentle)
-                                       bprint ("^1",s, "^1 was in the water for too long\n");
-                               else
-                                       bprint ("^1",s, "^1 drowned\n");
-                       else if (deathtype == DEATH_SLIME)
-                               bprint ("^1",s, "^1 was slimed\n");
-                       else if (deathtype == DEATH_LAVA)
-                               if(sv_gentle)
-                                       bprint ("^1",s, "^1 found a hot place\n");
-                               else
-                                       bprint ("^1",s, "^1 turned into hot slag\n");
-                       else if (deathtype == DEATH_FALL)
-                               if(sv_gentle)
-                                       bprint ("^1",s, "^1 tested gravity (and it worked)\n");
-                               else
-                                       bprint ("^1",s, "^1 hit the ground with a crunch\n");
-                       else if (deathtype == DEATH_SHOOTING_STAR)
-                               bprint ("^1",s, "^1 became a shooting star\n");
-                       else if (deathtype == DEATH_SWAMP)
-                               if(sv_gentle)
-                                       bprint ("^1",s, "^1 discovered a swamp\n");
-                               else
-                                       bprint ("^1",s, "^1 is now conserved for centuries to come\n");
-                       else if(deathtype == DEATH_TURRET)
-                               bprint ("^1",s, "^1 was mowed down by a turret \n");
-            else if (deathtype == DEATH_CUSTOM)
-                bprint ("^1",s, "^1 ", deathmessage, "\n");
-                       else if(deathtype == DEATH_TOUCHEXPLODE)
-                               bprint ("^1",s, "^1 died in an accident\n");
-                       else if(deathtype == DEATH_CHEAT)
-                               bprint ("^1",s, "^1 was unfairly eliminated\n");
-                       else if(deathtype == DEATH_FIRE)
-                               if(sv_gentle)
-                                       bprint ("^1",s, "^1 felt a little hot\n");
-                               else
-                                       bprint ("^1",s, "^1 burnt to death\n");
-                       else
-                               if(sv_gentle)
-                                       bprint ("^1",s, "^1 needs a restart\n");
-                               else
-                                       bprint ("^1",s, "^1 died\n");
+                               msg = inflictor.message;
+                       else if (deathtype == DEATH_CUSTOM)
+                               msg = deathmessage;
+
                        GiveFrags(targ, targ, -1);
                        if(PlayerScore_Add(targ, SP_SCORE, 0) == -5) {
                                AnnounceTo(targ, "botlike");
                        }
+                       Send_KillNotification(s, msg, "", deathtype, MSG_KILL_ACTION);
 
                        if (targ.killcount > 2)
-                               if(sv_gentle)
-                                       bprint ("^1",s,"^1 needs a restart after a ",ftos(targ.killcount)," scoring spree\n");
-                               else
-                                       bprint ("^1",s,"^1 died with a ",ftos(targ.killcount)," kill spree\n");
+                               Send_KillNotification(s, ftos(targ.killcount), "", 0, MSG_KILL_ACTION_SPREE);
 
                        LogDeath("accident", deathtype, targ, targ);
                }
index 3f14bf3e7ea9eaa12dc459cb2c9e15b36c850494..64226b21b2a3e16d30807a80159fd62a1edab0e5 100644 (file)
@@ -8,7 +8,6 @@ compile with -DTETRIS
 
 #ifdef TETRIS
 
-float autocvar_g_bastet;
 .vector tet_org;
 
 float tet_vs_current_id;
index d1d0d1d3af9677dc9f6470d359a82707ee8f7b9c..c174177b2002cf0251ed6bc05d8762592f7c0b24 100644 (file)
@@ -6,6 +6,7 @@ pre-builtins.qh
 builtins.qh
 extensions.qh
 post-builtins.qh
+autocvars.qh
 
 ../warpzonelib/anglestransform.qh
 ../warpzonelib/mathlib.qh
index c3c9d52f9b43926370c8af33e53e78714e69e18e..8fc8d839da6ca97b686bc86079c7c52cccbdf2f7 100644 (file)
@@ -250,38 +250,6 @@ float w_campingrifle(float req)
                return self.ammo_nails >= cvar("g_balance_campingrifle_primary_ammo");
        else if (req == WR_CHECKAMMO2)
                return self.ammo_nails >= cvar("g_balance_campingrifle_secondary_ammo");
-       else if (req == WR_SUICIDEMESSAGE)
-       {
-               if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = "shot themself automatically";
-               else
-                       w_deathtypestring = "sniped themself somehow";
-       }
-       else if (req == WR_KILLMESSAGE)
-       {
-               if(w_deathtype & HITTYPE_SECONDARY)
-               {
-                       if(w_deathtype & HITTYPE_BOUNCE)
-                               w_deathtypestring = "failed to hide from #'s bullet hail";
-                       else
-                               w_deathtypestring = "died in #'s bullet hail";
-               }
-               else
-               {
-                       if(w_deathtype & HITTYPE_BOUNCE)
-                       {
-                               // TODO special headshot message here too?
-                               w_deathtypestring = "failed to hide from #'s rifle";
-                       }
-                       else
-                       {
-                               if(w_deathtype & HITTYPE_HEADSHOT)
-                                       w_deathtypestring = "got hit in the head by #";
-                               else
-                                       w_deathtypestring = "was sniped by #";
-                       }
-               }
-       }
        else if (req == WR_RELOAD)
        {
                W_CampingRifle_Reload();
@@ -319,6 +287,38 @@ float w_campingrifle(float req)
                precache_sound("weapons/ric2.wav");
                precache_sound("weapons/ric3.wav");
        }
+       else if (req == WR_SUICIDEMESSAGE)
+       {
+               if(w_deathtype & HITTYPE_SECONDARY)
+                       w_deathtypestring = "shot themself automatically";
+               else
+                       w_deathtypestring = "sniped themself somehow";
+       }
+       else if (req == WR_KILLMESSAGE)
+       {
+               if(w_deathtype & HITTYPE_SECONDARY)
+               {
+                       if(w_deathtype & HITTYPE_BOUNCE)
+                               w_deathtypestring = "failed to hide from #'s bullet hail";
+                       else
+                               w_deathtypestring = "died in #'s bullet hail";
+               }
+               else
+               {
+                       if(w_deathtype & HITTYPE_BOUNCE)
+                       {
+                               // TODO special headshot message here too?
+                               w_deathtypestring = "failed to hide from #'s rifle";
+                       }
+                       else
+                       {
+                               if(w_deathtype & HITTYPE_HEADSHOT)
+                                       w_deathtypestring = "got hit in the head by #";
+                               else
+                                       w_deathtypestring = "was sniped by #";
+                       }
+               }
+       }
        return TRUE;
 }
 #endif
index 7f6062d3f6a65bd262f0278a5b59f1ee31aa2b42..d80317a346ef1a1b3a3be3479b3c67e038133aad 100644 (file)
@@ -220,19 +220,6 @@ float w_crylink(float req)
                return self.ammo_cells >= cvar("g_balance_crylink_primary_ammo");
        else if (req == WR_CHECKAMMO2)
                return self.ammo_cells >= cvar("g_balance_crylink_secondary_ammo");
-       else if (req == WR_SUICIDEMESSAGE)
-       {
-               w_deathtypestring = "succeeded at self-destructing themself with the Crylink";
-       }
-       else if (req == WR_KILLMESSAGE)
-       {
-               if(w_deathtype & HITTYPE_BOUNCE)
-                       w_deathtypestring = "could not hide from #'s Crylink"; // unchecked: SPLASH (SECONDARY can't be)
-               else if(w_deathtype & HITTYPE_SPLASH)
-                       w_deathtypestring = "was too close to #'s Crylink"; // unchecked: SECONDARY
-               else
-                       w_deathtypestring = "took a close look at #'s Crylink"; // unchecked: SECONDARY
-       }
        return TRUE;
 };
 #endif
@@ -261,6 +248,19 @@ float w_crylink(float req)
                precache_sound("weapons/crylink_impact2.wav");
                precache_sound("weapons/crylink_impact.wav");
        }
+       else if (req == WR_SUICIDEMESSAGE)
+       {
+               w_deathtypestring = "succeeded at self-destructing themself with the Crylink";
+       }
+       else if (req == WR_KILLMESSAGE)
+       {
+               if(w_deathtype & HITTYPE_BOUNCE)
+                       w_deathtypestring = "could not hide from #'s Crylink"; // unchecked: SPLASH (SECONDARY can't be)
+               else if(w_deathtype & HITTYPE_SPLASH)
+                       w_deathtypestring = "was too close to #'s Crylink"; // unchecked: SECONDARY
+               else
+                       w_deathtypestring = "took a close look at #'s Crylink"; // unchecked: SECONDARY
+       }
        return TRUE;
 }
 #endif
index 45168cdacf66fcf60d685f5521ec16f64e2a25aa..0b35eae662de8cc2848cb04ebe8d9e52a88f428a 100644 (file)
@@ -285,32 +285,6 @@ float w_electro(float req)
                return self.ammo_cells >= cvar("g_balance_electro_primary_ammo");
        else if (req == WR_CHECKAMMO2)
                return self.ammo_cells >= cvar("g_balance_electro_secondary_ammo");
-       else if (req == WR_SUICIDEMESSAGE)
-       {
-               if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = "could not remember where they put plasma";
-               else
-                       w_deathtypestring = "played with plasma";
-       }
-       else if (req == WR_KILLMESSAGE)
-       {
-               if(w_deathtype & HITTYPE_SECONDARY)
-               {
-                       if(w_deathtype & HITTYPE_SPLASH) // unchecked: BOUNCE
-                               w_deathtypestring = "just noticed #'s blue ball";
-                       else // unchecked: BOUNCE
-                               w_deathtypestring = "got in touch with #'s blue ball";
-               }
-               else
-               {
-                       if(w_deathtype & HITTYPE_BOUNCE) // combo
-                               w_deathtypestring = "felt the electrifying air of #'s combo";
-                       else if(w_deathtype & HITTYPE_SPLASH)
-                               w_deathtypestring = "got too close to #'s blue beam";
-                       else
-                               w_deathtypestring = "was blasted by #'s blue beam";
-               }
-       }
        else if (req == WR_RESETPLAYER)
        {
                self.electro_secondarytime = time;
@@ -353,6 +327,32 @@ float w_electro(float req)
                precache_sound("weapons/electro_impact.wav");
                precache_sound("weapons/electro_impact_combo.wav");
        }
+       else if (req == WR_SUICIDEMESSAGE)
+       {
+               if(w_deathtype & HITTYPE_SECONDARY)
+                       w_deathtypestring = "could not remember where they put plasma";
+               else
+                       w_deathtypestring = "played with plasma";
+       }
+       else if (req == WR_KILLMESSAGE)
+       {
+               if(w_deathtype & HITTYPE_SECONDARY)
+               {
+                       if(w_deathtype & HITTYPE_SPLASH) // unchecked: BOUNCE
+                               w_deathtypestring = "just noticed #'s blue ball";
+                       else // unchecked: BOUNCE
+                               w_deathtypestring = "got in touch with #'s blue ball";
+               }
+               else
+               {
+                       if(w_deathtype & HITTYPE_BOUNCE) // combo
+                               w_deathtypestring = "felt the electrifying air of #'s combo";
+                       else if(w_deathtype & HITTYPE_SPLASH)
+                               w_deathtypestring = "got too close to #'s blue beam";
+                       else
+                               w_deathtypestring = "was blasted by #'s blue beam";
+               }
+       }
        return TRUE;
 }
 #endif
index d5c0b13f950fcc72542db32c4cd6a11c917ba122..278099c633877a2e056bc2fcbd9a72d20d773af9 100644 (file)
@@ -351,6 +351,36 @@ float w_fireball(float req)
                return self.ammo_fuel >= cvar("g_balance_fireball_primary_ammo");
        else if (req == WR_CHECKAMMO2)
                return self.ammo_fuel >= cvar("g_balance_fireball_secondary_ammo");
+       else if (req == WR_RESETPLAYER)
+       {
+               self.fireball_primarytime = time;
+       }
+       return TRUE;
+};
+#endif
+#ifdef CSQC
+float w_fireball(float req)
+{
+       if(req == WR_IMPACTEFFECT)
+       {
+               vector org2;
+               if(w_deathtype & HITTYPE_SECONDARY)
+               {
+                       // firemine goes out silently
+               }
+               else
+               {
+                       org2 = w_org + w_backoff * 16;
+                       pointparticles(particleeffectnum("fireball_explode"), org2, '0 0 0', 1);
+                       if(!w_issilent)
+                               sound(self, CHAN_PROJECTILE, "weapons/fireball_impact2.wav", VOL_BASE, ATTN_NORM * 0.25); // long range boom
+               }
+       }
+       else if(req == WR_PRECACHE)
+       {
+               precache_sound("weapons/fireball_impact.wav");
+               precache_sound("weapons/fireball_impact2.wav");
+       }
        else if (req == WR_SUICIDEMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
@@ -386,36 +416,6 @@ float w_fireball(float req)
                                w_deathtypestring = "tasted #'s fireball";
                }
        }
-       else if (req == WR_RESETPLAYER)
-       {
-               self.fireball_primarytime = time;
-       }
-       return TRUE;
-};
-#endif
-#ifdef CSQC
-float w_fireball(float req)
-{
-       if(req == WR_IMPACTEFFECT)
-       {
-               vector org2;
-               if(w_deathtype & HITTYPE_SECONDARY)
-               {
-                       // firemine goes out silently
-               }
-               else
-               {
-                       org2 = w_org + w_backoff * 16;
-                       pointparticles(particleeffectnum("fireball_explode"), org2, '0 0 0', 1);
-                       if(!w_issilent)
-                               sound(self, CHAN_PROJECTILE, "weapons/fireball_impact2.wav", VOL_BASE, ATTN_NORM * 0.25); // long range boom
-               }
-       }
-       else if(req == WR_PRECACHE)
-       {
-               precache_sound("weapons/fireball_impact.wav");
-               precache_sound("weapons/fireball_impact2.wav");
-       }
        return TRUE;
 }
 #endif
index b340f76c90bc79f2eaa85c0f83076ddddbadce3e..a7d9a4935d7202a7a4a2bf18975cdafb4b1c5af1 100644 (file)
@@ -217,23 +217,6 @@ float w_glauncher(float req)
                return self.ammo_rockets >= cvar("g_balance_grenadelauncher_primary_ammo");
        else if (req == WR_CHECKAMMO2)
                return self.ammo_rockets >= cvar("g_balance_grenadelauncher_secondary_ammo");
-       else if (req == WR_SUICIDEMESSAGE)
-       {
-               if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = "tried out his own grenade";
-               else
-                       w_deathtypestring = "detonated";
-       }
-       else if (req == WR_KILLMESSAGE)
-       {
-               if(w_deathtype & HITTYPE_SPLASH)
-                       if(w_deathtype & HITTYPE_BOUNCE) // (must be secondary then)
-                               w_deathtypestring = "didn't see #'s grenade";
-                       else // unchecked: SECONDARY
-                               w_deathtypestring = "almost dodged #'s grenade";
-               else // unchecked: SECONDARY, BOUNCE
-                       w_deathtypestring = "ate #'s grenade";
-       }
        return TRUE;
 };
 #endif
@@ -252,6 +235,23 @@ float w_glauncher(float req)
        {
                precache_sound("weapons/grenade_impact.wav");
        }
+       else if (req == WR_SUICIDEMESSAGE)
+       {
+               if(w_deathtype & HITTYPE_SECONDARY)
+                       w_deathtypestring = "tried out his own grenade";
+               else
+                       w_deathtypestring = "detonated";
+       }
+       else if (req == WR_KILLMESSAGE)
+       {
+               if(w_deathtype & HITTYPE_SPLASH)
+                       if(w_deathtype & HITTYPE_BOUNCE) // (must be secondary then)
+                               w_deathtypestring = "didn't see #'s grenade";
+                       else // unchecked: SECONDARY
+                               w_deathtypestring = "almost dodged #'s grenade";
+               else // unchecked: SECONDARY, BOUNCE
+                       w_deathtypestring = "ate #'s grenade";
+       }
        return TRUE;
 }
 #endif
index c95a90e5dae9d78cf135fc143ea3c69b1f75cebe..d3723573687c76230d790fc810ed4bfc282877ea 100644 (file)
@@ -151,15 +151,6 @@ float w_hagar(float req)
                return self.ammo_rockets >= cvar("g_balance_hagar_primary_ammo");
        else if (req == WR_CHECKAMMO2)
                return self.ammo_rockets >= cvar("g_balance_hagar_secondary_ammo");
-       else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "played with tiny rockets";
-       else if (req == WR_KILLMESSAGE)
-       {
-               if(w_deathtype & HITTYPE_BOUNCE) // must be secondary; unchecked: SPLASH
-                       w_deathtypestring = "hoped #'s missiles wouldn't bounce";
-               else // unchecked: SPLASH, SECONDARY
-                       w_deathtypestring = "was pummeled by";
-       }
        return TRUE;
 };
 #endif
@@ -187,6 +178,15 @@ float w_hagar(float req)
                precache_sound("weapons/hagexp2.wav");
                precache_sound("weapons/hagexp3.wav");
        }
+       else if (req == WR_SUICIDEMESSAGE)
+               w_deathtypestring = "played with tiny rockets";
+       else if (req == WR_KILLMESSAGE)
+       {
+               if(w_deathtype & HITTYPE_BOUNCE) // must be secondary; unchecked: SPLASH
+                       w_deathtypestring = "hoped #'s missiles wouldn't bounce";
+               else // unchecked: SPLASH, SECONDARY
+                       w_deathtypestring = "was pummeled by";
+       }
        return TRUE;
 }
 #endif
index 5fe75ab2ca46bfbdfa0828b564b68aa419e8c060..88990de62821685de13d1ce24ca0decad035ac23 100644 (file)
@@ -207,10 +207,6 @@ float w_hlac(float req)
                return self.ammo_cells >= cvar("g_balance_hlac_primary_ammo");
        else if (req == WR_CHECKAMMO2)
                return self.ammo_cells >= cvar("g_balance_hlac_secondary_ammo");
-       else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "should have used a smaller gun";
-       else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = "was cut down by";
        return TRUE;
 };
 #endif
@@ -229,6 +225,10 @@ float w_hlac(float req)
        {
                precache_sound("weapons/laserimpact.wav");
        }
+       else if (req == WR_SUICIDEMESSAGE)
+               w_deathtypestring = "should have used a smaller gun";
+       else if (req == WR_KILLMESSAGE)
+               w_deathtypestring = "was cut down by";
        return TRUE;
 }
 #endif
index 9e5868355991106d4b48cd6feae4171c2903802d..c8d1369f7b42b11363f032163ec8b95eb306dc81 100644 (file)
@@ -239,10 +239,6 @@ float w_hook(float req)
        {
                return self.ammo_cells >= cvar("g_balance_hook_secondary_ammo");
        }
-       else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
-       else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = "has run into #'s gravity bomb";
        else if (req == WR_RESETPLAYER)
        {
                self.hook_refire = time;
@@ -265,6 +261,10 @@ float w_hook(float req)
        {
                precache_sound("weapons/hookbomb_impact.wav");
        }
+       else if (req == WR_SUICIDEMESSAGE)
+               w_deathtypestring = "did the impossible";
+       else if (req == WR_KILLMESSAGE)
+               w_deathtypestring = "has run into #'s gravity bomb";
        return TRUE;
 }
 #endif
index a17f2a4c54031886124a3b2bfec6a2c9bf971fe8..cdfdaa537c048af9fa45594d5334f35c256eda78 100644 (file)
@@ -178,12 +178,6 @@ float w_laser(float req)
                return TRUE;
        else if (req == WR_CHECKAMMO2)
                return TRUE;
-       else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "lasered themself to hell";
-       else if (req == WR_KILLMESSAGE)
-       {
-               w_deathtypestring = "was lasered to death by"; // unchecked: SPLASH
-       }
        return TRUE;
 };
 #endif
@@ -202,6 +196,12 @@ float w_laser(float req)
        {
                precache_sound("weapons/laserimpact.wav");
        }
+       else if (req == WR_SUICIDEMESSAGE)
+               w_deathtypestring = "lasered themself to hell";
+       else if (req == WR_KILLMESSAGE)
+       {
+               w_deathtypestring = "was lasered to death by"; // unchecked: SPLASH
+       }
        return TRUE;
 }
 #endif
index f28c8581cc5ee3c6fa2550561a6c994f8fcd55a5..65d02dcb2d6422151b971a9b6c47e92cb1aa9e8f 100644 (file)
@@ -232,10 +232,6 @@ float w_minstanex(float req)
        }
        else if (req == WR_CHECKAMMO2)
                return TRUE;
-       else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
-       else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = "has been vaporized by";
        else if (req == WR_RESETPLAYER)
        {
                self.minstanex_lasthit = 0;
@@ -258,6 +254,10 @@ float w_minstanex(float req)
        {
                precache_sound("weapons/neximpact.wav");
        }
+       else if (req == WR_SUICIDEMESSAGE)
+               w_deathtypestring = "did the impossible";
+       else if (req == WR_KILLMESSAGE)
+               w_deathtypestring = "has been vaporized by";
        return TRUE;
 }
 #endif
index c23a47b5d668fbe1b000321698f4404e5dcc260d..4c30f4c675c5f6b1bd45102cd199324c11476708 100644 (file)
@@ -74,10 +74,6 @@ float w_nex(float req)
                return self.ammo_cells >= cvar("g_balance_nex_ammo");
        else if (req == WR_CHECKAMMO2)
                return FALSE;
-       else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
-       else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = "has been vaporized by";
        return TRUE;
 };
 #endif
@@ -96,6 +92,10 @@ float w_nex(float req)
        {
                precache_sound("weapons/neximpact.wav");
        }
+       else if (req == WR_SUICIDEMESSAGE)
+               w_deathtypestring = "did the impossible";
+       else if (req == WR_KILLMESSAGE)
+               w_deathtypestring = "has been vaporized by";
        return TRUE;
 }
 #endif
index 1ab117885b02dde03a068e511da43c681403e366..b78e85574312d4cda870c4fec880701f29324686 100644 (file)
@@ -269,10 +269,6 @@ float w_porto(float req)
        }
        else if (req == WR_SETUP)
                weapon_setup(WEP_PORTO);
-       else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
-       else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = "felt # doing the impossible to him";
        else if (req == WR_RESETPLAYER)
        {
                self.porto_current = world;
@@ -291,6 +287,10 @@ float w_porto(float req)
        {
                // nothing to do
        }
+       else if (req == WR_SUICIDEMESSAGE)
+               w_deathtypestring = "did the impossible";
+       else if (req == WR_KILLMESSAGE)
+               w_deathtypestring = "felt # doing the impossible to him";
        return TRUE;
 }
 #endif
index f6975b3b6a0d13d6903830adc2526c8c9940110f..35ca569777f4cce38f988bcb93ad9671352fcac6 100644 (file)
@@ -544,17 +544,6 @@ float w_rlauncher(float req)
        }
        else if (req == WR_CHECKAMMO2)
                return FALSE;
-       else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "exploded";
-       else if (req == WR_KILLMESSAGE)
-       {
-               if(w_deathtype & HITTYPE_BOUNCE) // (remote detonation)
-                       w_deathtypestring = "got too close to #'s rocket";
-               else if(w_deathtype & HITTYPE_SPLASH)
-                       w_deathtypestring = "almost dodged #'s rocket";
-               else
-                       w_deathtypestring = "ate #'s rocket";
-       }
        else if (req == WR_RESETPLAYER)
        {
                self.rl_release = 0;
@@ -577,6 +566,17 @@ float w_rlauncher(float req)
        {
                precache_sound("weapons/rocket_impact.wav");
        }
+       else if (req == WR_SUICIDEMESSAGE)
+               w_deathtypestring = "exploded";
+       else if (req == WR_KILLMESSAGE)
+       {
+               if(w_deathtype & HITTYPE_BOUNCE) // (remote detonation)
+                       w_deathtypestring = "got too close to #'s rocket";
+               else if(w_deathtype & HITTYPE_SPLASH)
+                       w_deathtypestring = "almost dodged #'s rocket";
+               else
+                       w_deathtypestring = "ate #'s rocket";
+       }
        return TRUE;
 }
 #endif
index 512eb28e8ca1800407a4c838cc02c175d363c805..c347648dff324c5300e837630fa197b1be17992d 100644 (file)
@@ -140,12 +140,6 @@ float w_shotgun(float req)
                return self.ammo_shells >= cvar("g_balance_shotgun_primary_ammo");
        else if (req == WR_CHECKAMMO2)
                return self.ammo_shells >= cvar("g_balance_shotgun_secondary_ammo") * 3;
-       else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
-       else if (req == WR_KILLMESSAGE)
-       {
-               w_deathtypestring = "was gunned by"; // unchecked: SECONDARY
-       }
        return TRUE;
 };
 #endif
@@ -173,6 +167,12 @@ float w_shotgun(float req)
                precache_sound("weapons/ric2.wav");
                precache_sound("weapons/ric3.wav");
        }
+       else if (req == WR_SUICIDEMESSAGE)
+               w_deathtypestring = "did the impossible";
+       else if (req == WR_KILLMESSAGE)
+       {
+               w_deathtypestring = "was gunned by"; // unchecked: SECONDARY
+       }
        return TRUE;
 }
 #endif
index f3b91649159d9aef03eda4e9685cd140f036d184..243b32b20e2b0bdbb3b787dec2275f6bba515d79 100644 (file)
@@ -241,14 +241,6 @@ float w_tuba(float req)
                return TRUE; // TODO use fuel?
        else if (req == WR_CHECKAMMO2)
                return TRUE; // TODO use fuel?
-       else if (req == WR_SUICIDEMESSAGE)
-       {
-               w_deathtypestring = "hurt his own ears with the @!#%'n Tuba";
-       }
-       else if (req == WR_KILLMESSAGE)
-       {
-               w_deathtypestring = "died of #'s great playing on the @!#%'n Tuba";
-       }
        return TRUE;
 };
 #endif
@@ -263,6 +255,14 @@ float w_tuba(float req)
        {
                // nothing to do
        }
+       else if (req == WR_SUICIDEMESSAGE)
+       {
+               w_deathtypestring = "hurt his own ears with the @!#%'n Tuba";
+       }
+       else if (req == WR_KILLMESSAGE)
+       {
+               w_deathtypestring = "died of #'s great playing on the @!#%'n Tuba";
+       }
        return TRUE;
 }
 #endif
index 5879b00b8c029a9ddb516d8e7fc5ae9c65108559..245ad652f6d8bb33eab902171e4975c7580195af 100644 (file)
@@ -126,15 +126,6 @@ float w_uzi(float req)
                return self.ammo_nails >= cvar("g_balance_uzi_first_ammo");
        else if (req == WR_CHECKAMMO2)
                return self.ammo_nails >= cvar("g_balance_uzi_first_ammo");
-       else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
-       else if (req == WR_KILLMESSAGE)
-       {
-               if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = "was sniped by";
-               else
-                       w_deathtypestring = "was riddled full of holes by";
-       }
        return TRUE;
 };
 #endif
@@ -160,6 +151,15 @@ float w_uzi(float req)
                precache_sound("weapons/ric2.wav");
                precache_sound("weapons/ric3.wav");
        }
+       else if (req == WR_SUICIDEMESSAGE)
+               w_deathtypestring = "did the impossible";
+       else if (req == WR_KILLMESSAGE)
+       {
+               if(w_deathtype & HITTYPE_SECONDARY)
+                       w_deathtypestring = "was sniped by";
+               else
+                       w_deathtypestring = "was riddled full of holes by";
+       }
        return TRUE;
 }
 #endif
index 2dec76c772bcf12ee1e6e6d2fcbb03bb9f7bae6c..f24b01548edb1ba456d99059d82fb32c05bb0b88 100644 (file)
--- a/quake.rc
+++ b/quake.rc
@@ -9,4 +9,4 @@ exec loadfonts.cfg
 //startdemos
 //play announcer/male/welcome.ogg
 
-//exec font-dejavu.cfg
+exec font-nimbussansl.cfg
index b707d7f583c8975b60a639d0a53be418ff2de2b4..6d719e6bcf91efe4d7d2a8013334d8182ff3a0bf 100644 (file)
Binary files a/textures/campingrifle.tga and b/textures/campingrifle.tga differ
index b319739c930af84fa541b686c6ffbf66a6ece894..28bd453d6d3351d405fd6010033094c11926e7fd 100644 (file)
Binary files a/textures/campingrifle_bump.tga and b/textures/campingrifle_bump.tga differ
index 0e0156ecdae297b4c1fa5687808dbbbf327161e4..7f4b0326dd1399d83b4246ab7c63b0c7c4504f9b 100644 (file)
Binary files a/textures/campingrifle_gloss.tga and b/textures/campingrifle_gloss.tga differ
index d6f1f8b0e024895561fd1bfe065749a252862334..1fe74b161d971d7c2077766f8408139f32be58ef 100644 (file)
Binary files a/textures/electro.tga and b/textures/electro.tga differ
index d5f259281391311595a9c5907502d2b2daa3efa7..d506dcbb0ad164e50b1afa46d1ab82ac5510c5b0 100644 (file)
Binary files a/textures/electro_gloss.tga and b/textures/electro_gloss.tga differ
index 085f0b069d5acabd35f95c06d41997e66eca300c..91736effd5bc035d29967a7d367dd015d55ce784 100644 (file)
Binary files a/textures/electro_glow.tga and b/textures/electro_glow.tga differ
index 54718a6bbda61ffc1e2d8e5d86904889f9d46b90..019abc9ce038b427eda1f71031553806a002b167 100644 (file)
Binary files a/textures/electro_norm.tga and b/textures/electro_norm.tga differ
index 9454d81a532adbc667da3ea1af902bc93cf8eb6c..b8e70848b29e232d91567a59e56ed5f0e6456b77 100644 (file)
Binary files a/textures/electro_pants.tga and b/textures/electro_pants.tga differ
index a68b0fe80c6f362b9f46b2b1e2b897f7b64bcde5..12a331a952ebf5ed2a91430bbda4dc6aa087feba 100644 (file)
Binary files a/textures/glauncher.tga and b/textures/glauncher.tga differ
index 5d9abed0feca9a1df14b2b494fc537c86db360cb..c6add3e6072f7e99e00ccf39f1a3f00d44acafc4 100644 (file)
Binary files a/textures/glauncher_gloss.tga and b/textures/glauncher_gloss.tga differ
index d8131da38accc93b9661593f145857d9a9dcadf3..910eaa1e7210a444e95db474662612e81e922be0 100644 (file)
Binary files a/textures/glauncher_norm.tga and b/textures/glauncher_norm.tga differ
index f750e1d1975f0c6c9717c2271bfa90370de403a9..1f3957e1e2ecc77b4ba4d575d27e0513d7e67ace 100644 (file)
Binary files a/textures/glauncher_pants.tga and b/textures/glauncher_pants.tga differ
index bb8be51b69c5d85895f0b2de9b2a36ffafcd2f49..853e50b69fd29ec75e0c1110324b59d51a3154af 100644 (file)
Binary files a/textures/glauncher_shirt.tga and b/textures/glauncher_shirt.tga differ
index 1a878799d3e8a6d60b8d4993d4a8206ee6b1926a..2b77dd918ec3b9e572f72ff99861a600a79e9f0a 100644 (file)
Binary files a/textures/hagar2.tga and b/textures/hagar2.tga differ
index 7b7d86d6efae3db77af7a864aaad3d51aff6aa29..f4f597a4a004eb04abb677db0e7695048079eb7c 100644 (file)
Binary files a/textures/hagar2_gloss.tga and b/textures/hagar2_gloss.tga differ
index 48f29bf98d86933f061b4a4881ccbae5fc9027ae..9fff206a2252d8dd5b4659f5487a9794384e55bc 100644 (file)
Binary files a/textures/hagar2_glow.tga and b/textures/hagar2_glow.tga differ
index 27178fd4573fb13505881d7bcdd79e3be4337808..145509deb05f62ae567281f98be1f3e55ae36e17 100644 (file)
Binary files a/textures/hagar2_norm.tga and b/textures/hagar2_norm.tga differ
index 44e4bec4fc19a0b15d7917f99b03b4909699cadf..5992dbf962be2b89364f4240b1f6be12857883fc 100644 (file)
Binary files a/textures/hagar2_pants.tga and b/textures/hagar2_pants.tga differ
index b6700dd82639f115ffa0eff132a566087a3669a8..4527f7e31acc1f1fab4ca3dd3f5f61927b114835 100644 (file)
Binary files a/textures/hagar2_shirt.tga and b/textures/hagar2_shirt.tga differ
index 49d17bb4f4c60943f644374cba4989e9f9980f85..c4c6882a20a117012d1f9fd353d361fc01332c1f 100644 (file)
Binary files a/textures/hlac_body.tga and b/textures/hlac_body.tga differ
index b362c1d13c609b011bb386283e976ab2c1581eb5..b1b517bdaeffbcf3b84787b2cd841852d08ed7f8 100644 (file)
Binary files a/textures/hlac_body_gloss.tga and b/textures/hlac_body_gloss.tga differ
index 5387a5d39be149bdd20c7762d33d25d51fe4b600..fb22b9e8363d26a9275756aed2687d79872f1287 100644 (file)
Binary files a/textures/hlac_body_norm.tga and b/textures/hlac_body_norm.tga differ
index b9ff4f1f6718e93da344a2c4b24e32974c5bd68b..32ee034605b015e575aa0cf4e19e796606611e97 100644 (file)
Binary files a/textures/hlac_body_pants.tga and b/textures/hlac_body_pants.tga differ
index 637c977110e5b08ca985d1c6c14c14350d875892..c3bddd150d9ce505f1a8c36003d1e8a6b7b0bc02 100644 (file)
Binary files a/textures/hlac_body_shirt.tga and b/textures/hlac_body_shirt.tga differ
index 5e4f8f291ff2b1d82f6f074baff807fbfcc4477b..aa65f2f555e0e6d97156794ef4941dceb604241c 100644 (file)
Binary files a/textures/hookgun.tga and b/textures/hookgun.tga differ
index ba1b5edcd085c64b098076434d4dde37acc8ba98..484c2c58cb07707c07a077da19129719a98dc306 100644 (file)
Binary files a/textures/hookgun_gloss.tga and b/textures/hookgun_gloss.tga differ
index 33ec9de397625ec5ef35e1ce88ab18a9ae2c365b..625d4771555e829efece1ea15f377370775f1fd5 100644 (file)
Binary files a/textures/hookgun_norm.tga and b/textures/hookgun_norm.tga differ
index 4091e9d6804e88d9c79128dd3d43ae8a1829eac2..327822d4ef625e2b984a4eeafbe187de7cec5b55 100644 (file)
Binary files a/textures/hookgun_pants.tga and b/textures/hookgun_pants.tga differ
index 55e561a10210fcf8ecfff190bfc5ecda746727b0..cdfd47d42719c02312f54dc43b1b672dce1cd2b8 100644 (file)
Binary files a/textures/shotgun2.tga and b/textures/shotgun2.tga differ
index ef85807342a997b9cd34ce7968d666eb26b81e35..78fdd3167b88c5c890947ee51a6823029e689a3a 100644 (file)
Binary files a/textures/shotgun2_gloss.tga and b/textures/shotgun2_gloss.tga differ
index 16f6b002fa361cb51d6ec4c3afa8f991347c4f28..863f3830b5588939a962f1fbccb5c12cb27b74c7 100644 (file)
Binary files a/textures/shotgun2_glow.tga and b/textures/shotgun2_glow.tga differ
index cff6611f339e874526bcc3a3005442d2f0fc132f..100b3a4ac83f53919cd32de9ba134a7d2ab319db 100644 (file)
Binary files a/textures/shotgun2_norm.tga and b/textures/shotgun2_norm.tga differ
index ea9a7d86d7f36da0f807eed5b04567966df3bdee..442ced63a698906dbc6a1590aefc4e1fda8f98d4 100644 (file)
Binary files a/textures/shotgun2_shirt.tga and b/textures/shotgun2_shirt.tga differ
index 801314a6d82121f00f33e0766e0e4dd2ef78d2a8..10bd39d94b738433bf00628933b5185f9d2f7975 100755 (executable)
@@ -1,10 +1,8 @@
 #!/bin/sh
 
-balance_cfgs="balance25.cfg balanceSamual.cfg balanceXPM.cfg"
-
-countw=`awk '/^seta? g_/ { print $2; }' balance.cfg       | sort -u | tr -d '\r' | md5sum | cut -c 1-32`
-for b in $balance_cfgs; do
-       countb=`awk '/^seta? g_/ { print $2; }' "$b"  | sort -u | tr -d '\r' | md5sum | cut -c 1-32`
+countw=`awk '/^seta? g_/ { print $2; }' balance.cfg       | sort -u | tr -d '\r' | git hash-object --stdin | cut -c 1-32`
+for b in balance*.cfg; do
+       countb=`awk '/^seta? g_/ { print $2; }' "$b"  | sort -u | tr -d '\r' | git hash-object --stdin | cut -c 1-32`
        if [ "$countw" != "$countb" ]; then
                echo "Mismatch between balance.cfg and $b. Aborting."
                exit 1