Merge branch 'master' into terencehill/weapon_panel_fix
authorterencehill <piuntn@gmail.com>
Mon, 2 Feb 2015 23:37:19 +0000 (00:37 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 2 Feb 2015 23:37:19 +0000 (00:37 +0100)
Conflicts:
qcsrc/client/hud.qc

688 files changed:
defaultXonotic.cfg
qcsrc/Makefile
qcsrc/client/Defs.qc [deleted file]
qcsrc/client/Main.qc [deleted file]
qcsrc/client/View.qc [deleted file]
qcsrc/client/announcer.qc
qcsrc/client/autocvars.qh
qcsrc/client/bgmscript.qc
qcsrc/client/bgmscript.qh
qcsrc/client/casings.qc
qcsrc/client/command/cl_cmd.qc
qcsrc/client/command/cl_cmd.qh
qcsrc/client/credit.txt
qcsrc/client/csqc_constants.qc
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/damage.qc
qcsrc/client/damage.qh
qcsrc/client/defs.qh [new file with mode: 0644]
qcsrc/client/effects.qc
qcsrc/client/gibs.qc
qcsrc/client/gibs.qh [new file with mode: 0644]
qcsrc/client/hook.qc
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/hud_config.qc
qcsrc/client/laser.qc
qcsrc/client/main.qc [new file with mode: 0644]
qcsrc/client/main.qh
qcsrc/client/mapvoting.qc
qcsrc/client/mapvoting.qh [new file with mode: 0644]
qcsrc/client/miscfunctions.qc
qcsrc/client/miscfunctions.qh [new file with mode: 0644]
qcsrc/client/modeleffects.qc
qcsrc/client/modeleffects.qh [new file with mode: 0644]
qcsrc/client/movetypes.qc
qcsrc/client/movetypes.qh
qcsrc/client/noise.qc
qcsrc/client/noise.qh
qcsrc/client/particles.qc
qcsrc/client/particles.qh [new file with mode: 0644]
qcsrc/client/player_skeleton.qc
qcsrc/client/player_skeleton.qh
qcsrc/client/prandom.qc
qcsrc/client/prandom.qh
qcsrc/client/progs.src
qcsrc/client/rubble.qc
qcsrc/client/rubble.qh [new file with mode: 0644]
qcsrc/client/scoreboard.qc
qcsrc/client/scoreboard.qh
qcsrc/client/shownames.qc
qcsrc/client/shownames.qh
qcsrc/client/sortlist.qc
qcsrc/client/sortlist.qh [new file with mode: 0644]
qcsrc/client/sys-post.qh [deleted file]
qcsrc/client/sys-pre.qh [deleted file]
qcsrc/client/target_music.qc
qcsrc/client/target_music.qh [new file with mode: 0644]
qcsrc/client/teamradar.qc
qcsrc/client/teamradar.qh
qcsrc/client/tturrets.qc
qcsrc/client/tturrets.qh
qcsrc/client/tuba.qc
qcsrc/client/tuba.qh [new file with mode: 0644]
qcsrc/client/vehicles/racer.qc [deleted file]
qcsrc/client/vehicles/raptor.qc [deleted file]
qcsrc/client/vehicles/spiderbot.qc [deleted file]
qcsrc/client/vehicles/vehicles.qc
qcsrc/client/vehicles/vehicles.qh
qcsrc/client/view.qc [new file with mode: 0644]
qcsrc/client/wall.qc
qcsrc/client/wall.qh [new file with mode: 0644]
qcsrc/client/waypointsprites.qc
qcsrc/client/waypointsprites.qh
qcsrc/client/weapons/projectile.qc
qcsrc/client/weapons/projectile.qh
qcsrc/common/animdecide.qc
qcsrc/common/animdecide.qh
qcsrc/common/buffs.qc
qcsrc/common/buffs.qh
qcsrc/common/campaign_common.qh
qcsrc/common/campaign_file.qc
qcsrc/common/campaign_setup.qc
qcsrc/common/command/generic.qc
qcsrc/common/command/generic.qh
qcsrc/common/command/markup.qc
qcsrc/common/command/markup.qh
qcsrc/common/command/rpn.qc
qcsrc/common/command/rpn.qh
qcsrc/common/command/shared_defs.qh
qcsrc/common/constants.qh
qcsrc/common/counting.qh
qcsrc/common/csqcmodel_settings.qh
qcsrc/common/deathtypes.qh
qcsrc/common/mapinfo.qc
qcsrc/common/mapinfo.qh
qcsrc/common/monsters/all.qh
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/monster/shambler.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/monster/wyvern.qc
qcsrc/common/monsters/monster/zombie.qc
qcsrc/common/monsters/monsters.qc
qcsrc/common/monsters/monsters.qh
qcsrc/common/monsters/spawn.qc
qcsrc/common/monsters/spawn.qh
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/monsters/sv_monsters.qh
qcsrc/common/nades.qc
qcsrc/common/nades.qh
qcsrc/common/net_notice.qc
qcsrc/common/net_notice.qh
qcsrc/common/notifications.qc
qcsrc/common/notifications.qh
qcsrc/common/playerstats.qc
qcsrc/common/playerstats.qh
qcsrc/common/stats.qh
qcsrc/common/teams.qh
qcsrc/common/test.qc
qcsrc/common/test.qh
qcsrc/common/urllib.qc
qcsrc/common/urllib.qh
qcsrc/common/util-pre.qh
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/common/weapons/all.qh
qcsrc/common/weapons/calculations.qc
qcsrc/common/weapons/calculations.qh
qcsrc/common/weapons/config.qc
qcsrc/common/weapons/config.qh
qcsrc/common/weapons/w_arc.qc
qcsrc/common/weapons/w_blaster.qc
qcsrc/common/weapons/w_crylink.qc
qcsrc/common/weapons/w_devastator.qc
qcsrc/common/weapons/w_electro.qc
qcsrc/common/weapons/w_fireball.qc
qcsrc/common/weapons/w_hagar.qc
qcsrc/common/weapons/w_hlac.qc
qcsrc/common/weapons/w_hmg.qc
qcsrc/common/weapons/w_hook.qc
qcsrc/common/weapons/w_machinegun.qc
qcsrc/common/weapons/w_minelayer.qc
qcsrc/common/weapons/w_mortar.qc
qcsrc/common/weapons/w_porto.qc
qcsrc/common/weapons/w_rifle.qc
qcsrc/common/weapons/w_rpc.qc
qcsrc/common/weapons/w_seeker.qc
qcsrc/common/weapons/w_shockwave.qc
qcsrc/common/weapons/w_shotgun.qc
qcsrc/common/weapons/w_tuba.qc
qcsrc/common/weapons/w_vaporizer.qc
qcsrc/common/weapons/w_vortex.qc
qcsrc/common/weapons/weapons.qc
qcsrc/common/weapons/weapons.qh
qcsrc/csqcmodellib/cl_model.qc
qcsrc/csqcmodellib/cl_model.qh
qcsrc/csqcmodellib/cl_player.qc
qcsrc/csqcmodellib/cl_player.qh
qcsrc/csqcmodellib/common.qh
qcsrc/csqcmodellib/interpolate.qc
qcsrc/csqcmodellib/interpolate.qh
qcsrc/csqcmodellib/settings.qh
qcsrc/csqcmodellib/sv_model.qc
qcsrc/csqcmodellib/sv_model.qh
qcsrc/dpdefs/csprogsdefs.qc [deleted file]
qcsrc/dpdefs/csprogsdefs.qh [new file with mode: 0644]
qcsrc/dpdefs/dpextensions.qc [deleted file]
qcsrc/dpdefs/dpextensions.qh [new file with mode: 0644]
qcsrc/dpdefs/keycodes.qc [deleted file]
qcsrc/dpdefs/keycodes.qh [new file with mode: 0644]
qcsrc/dpdefs/menudefs.qc [deleted file]
qcsrc/dpdefs/menudefs.qh [new file with mode: 0644]
qcsrc/dpdefs/progsdefs.qc [deleted file]
qcsrc/dpdefs/progsdefs.qh [new file with mode: 0644]
qcsrc/menu/anim/animation.c [deleted file]
qcsrc/menu/anim/animation.qc [new file with mode: 0644]
qcsrc/menu/anim/animhost.c [deleted file]
qcsrc/menu/anim/animhost.qc [new file with mode: 0644]
qcsrc/menu/anim/easing.c [deleted file]
qcsrc/menu/anim/easing.qc [new file with mode: 0644]
qcsrc/menu/anim/keyframe.c [deleted file]
qcsrc/menu/anim/keyframe.qc [new file with mode: 0644]
qcsrc/menu/classes.c [deleted file]
qcsrc/menu/classes.qc [new file with mode: 0644]
qcsrc/menu/command/menu_cmd.qc
qcsrc/menu/command/menu_cmd.qh
qcsrc/menu/config.qh [deleted file]
qcsrc/menu/draw.qc
qcsrc/menu/draw.qh
qcsrc/menu/item.c [deleted file]
qcsrc/menu/item.qc [new file with mode: 0644]
qcsrc/menu/item/borderimage.c [deleted file]
qcsrc/menu/item/borderimage.qc [new file with mode: 0644]
qcsrc/menu/item/button.c [deleted file]
qcsrc/menu/item/button.qc [new file with mode: 0644]
qcsrc/menu/item/checkbox.c [deleted file]
qcsrc/menu/item/checkbox.qc [new file with mode: 0644]
qcsrc/menu/item/container.c [deleted file]
qcsrc/menu/item/container.qc [new file with mode: 0644]
qcsrc/menu/item/dialog.c [deleted file]
qcsrc/menu/item/dialog.qc [new file with mode: 0644]
qcsrc/menu/item/image.c [deleted file]
qcsrc/menu/item/image.qc [new file with mode: 0644]
qcsrc/menu/item/inputbox.c [deleted file]
qcsrc/menu/item/inputbox.qc [new file with mode: 0644]
qcsrc/menu/item/inputcontainer.c [deleted file]
qcsrc/menu/item/inputcontainer.qc [new file with mode: 0644]
qcsrc/menu/item/label.c [deleted file]
qcsrc/menu/item/label.qc [new file with mode: 0644]
qcsrc/menu/item/listbox.c [deleted file]
qcsrc/menu/item/listbox.qc [new file with mode: 0644]
qcsrc/menu/item/modalcontroller.c [deleted file]
qcsrc/menu/item/modalcontroller.qc [new file with mode: 0644]
qcsrc/menu/item/nexposee.c [deleted file]
qcsrc/menu/item/nexposee.qc [new file with mode: 0644]
qcsrc/menu/item/radiobutton.c [deleted file]
qcsrc/menu/item/radiobutton.qc [new file with mode: 0644]
qcsrc/menu/item/slider.c [deleted file]
qcsrc/menu/item/slider.qc [new file with mode: 0644]
qcsrc/menu/item/tab.c [deleted file]
qcsrc/menu/item/tab.qc [new file with mode: 0644]
qcsrc/menu/item/textslider.c [deleted file]
qcsrc/menu/item/textslider.qc [new file with mode: 0644]
qcsrc/menu/menu.qc
qcsrc/menu/menu.qh
qcsrc/menu/oo/base.h [deleted file]
qcsrc/menu/oo/base.qh [new file with mode: 0644]
qcsrc/menu/oo/implementation.h [deleted file]
qcsrc/menu/oo/implementation.qh [new file with mode: 0644]
qcsrc/menu/oo/interface.h [deleted file]
qcsrc/menu/oo/interface.qh [new file with mode: 0644]
qcsrc/menu/progs.src
qcsrc/menu/skin.qh
qcsrc/menu/sys-post.qh
qcsrc/menu/sys-pre.qh
qcsrc/menu/xonotic/bigbutton.c [deleted file]
qcsrc/menu/xonotic/bigbutton.qc [new file with mode: 0644]
qcsrc/menu/xonotic/bigcommandbutton.c [deleted file]
qcsrc/menu/xonotic/bigcommandbutton.qc [new file with mode: 0644]
qcsrc/menu/xonotic/button.c [deleted file]
qcsrc/menu/xonotic/button.qc [new file with mode: 0644]
qcsrc/menu/xonotic/campaign.c [deleted file]
qcsrc/menu/xonotic/campaign.qc [new file with mode: 0644]
qcsrc/menu/xonotic/charmap.c [deleted file]
qcsrc/menu/xonotic/charmap.qc [new file with mode: 0644]
qcsrc/menu/xonotic/checkbox.c [deleted file]
qcsrc/menu/xonotic/checkbox.qc [new file with mode: 0644]
qcsrc/menu/xonotic/checkbox_slider_invalid.c [deleted file]
qcsrc/menu/xonotic/checkbox_slider_invalid.qc [new file with mode: 0644]
qcsrc/menu/xonotic/checkbox_string.c [deleted file]
qcsrc/menu/xonotic/checkbox_string.qc [new file with mode: 0644]
qcsrc/menu/xonotic/colorbutton.c [deleted file]
qcsrc/menu/xonotic/colorbutton.qc [new file with mode: 0644]
qcsrc/menu/xonotic/colorpicker.c [deleted file]
qcsrc/menu/xonotic/colorpicker.qc [new file with mode: 0644]
qcsrc/menu/xonotic/colorpicker_string.c [deleted file]
qcsrc/menu/xonotic/colorpicker_string.qc [new file with mode: 0644]
qcsrc/menu/xonotic/commandbutton.c [deleted file]
qcsrc/menu/xonotic/commandbutton.qc [new file with mode: 0644]
qcsrc/menu/xonotic/credits.c [deleted file]
qcsrc/menu/xonotic/credits.qc [new file with mode: 0644]
qcsrc/menu/xonotic/crosshairbutton.c [deleted file]
qcsrc/menu/xonotic/crosshairbutton.qc [new file with mode: 0644]
qcsrc/menu/xonotic/cvarlist.c [deleted file]
qcsrc/menu/xonotic/cvarlist.qc [new file with mode: 0644]
qcsrc/menu/xonotic/demolist.c [deleted file]
qcsrc/menu/xonotic/demolist.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog.c [deleted file]
qcsrc/menu/xonotic/dialog.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_credits.c [deleted file]
qcsrc/menu/xonotic/dialog_credits.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_firstrun.c [deleted file]
qcsrc/menu/xonotic/dialog_firstrun.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_ammo.c [deleted file]
qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_buffs.c [deleted file]
qcsrc/menu/xonotic/dialog_hudpanel_buffs.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_centerprint.c [deleted file]
qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_chat.c [deleted file]
qcsrc/menu/xonotic/dialog_hudpanel_chat.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.c [deleted file]
qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c [deleted file]
qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_infomessages.c [deleted file]
qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_modicons.c [deleted file]
qcsrc/menu/xonotic/dialog_hudpanel_modicons.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_notification.c [deleted file]
qcsrc/menu/xonotic/dialog_hudpanel_notification.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_physics.c [deleted file]
qcsrc/menu/xonotic/dialog_hudpanel_physics.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_powerups.c [deleted file]
qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c [deleted file]
qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_racetimer.c [deleted file]
qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_radar.c [deleted file]
qcsrc/menu/xonotic/dialog_hudpanel_radar.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_score.c [deleted file]
qcsrc/menu/xonotic/dialog_hudpanel_score.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_timer.c [deleted file]
qcsrc/menu/xonotic/dialog_hudpanel_timer.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_vote.c [deleted file]
qcsrc/menu/xonotic/dialog_hudpanel_vote.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_weapons.c [deleted file]
qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudsetup_exit.c [deleted file]
qcsrc/menu/xonotic/dialog_hudsetup_exit.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_monstertools.c [deleted file]
qcsrc/menu/xonotic/dialog_monstertools.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_create.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_create.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_join.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_join.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_media.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_media.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_media_demo.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_profile.c [deleted file]
qcsrc/menu/xonotic/dialog_multiplayer_profile.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_quit.c [deleted file]
qcsrc/menu/xonotic/dialog_quit.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_sandboxtools.c [deleted file]
qcsrc/menu/xonotic/dialog_sandboxtools.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings.c [deleted file]
qcsrc/menu/xonotic/dialog_settings.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_audio.c [deleted file]
qcsrc/menu/xonotic/dialog_settings_audio.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_effects.c [deleted file]
qcsrc/menu/xonotic/dialog_settings_effects.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game.c [deleted file]
qcsrc/menu/xonotic/dialog_settings_game.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game_crosshair.c [deleted file]
qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game_hud.c [deleted file]
qcsrc/menu/xonotic/dialog_settings_game_hud.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.c [deleted file]
qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game_messages.c [deleted file]
qcsrc/menu/xonotic/dialog_settings_game_messages.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game_model.c [deleted file]
qcsrc/menu/xonotic/dialog_settings_game_model.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game_view.c [deleted file]
qcsrc/menu/xonotic/dialog_settings_game_view.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game_weapons.c [deleted file]
qcsrc/menu/xonotic/dialog_settings_game_weapons.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_input.c [deleted file]
qcsrc/menu/xonotic/dialog_settings_input.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_input_userbind.c [deleted file]
qcsrc/menu/xonotic/dialog_settings_input_userbind.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_misc.c [deleted file]
qcsrc/menu/xonotic/dialog_settings_misc.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_misc_cvars.c [deleted file]
qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_misc_reset.c [deleted file]
qcsrc/menu/xonotic/dialog_settings_misc_reset.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_user.c [deleted file]
qcsrc/menu/xonotic/dialog_settings_user.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_user_languagewarning.c [deleted file]
qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_video.c [deleted file]
qcsrc/menu/xonotic/dialog_settings_video.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_singleplayer.c [deleted file]
qcsrc/menu/xonotic/dialog_singleplayer.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_singleplayer_winner.c [deleted file]
qcsrc/menu/xonotic/dialog_singleplayer_winner.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_teamselect.c [deleted file]
qcsrc/menu/xonotic/dialog_teamselect.qc [new file with mode: 0644]
qcsrc/menu/xonotic/gametypebutton.c [deleted file]
qcsrc/menu/xonotic/gametypebutton.qc [new file with mode: 0644]
qcsrc/menu/xonotic/gametypelist.c [deleted file]
qcsrc/menu/xonotic/gametypelist.qc [new file with mode: 0644]
qcsrc/menu/xonotic/image.c [deleted file]
qcsrc/menu/xonotic/image.qc [new file with mode: 0644]
qcsrc/menu/xonotic/inputbox.c [deleted file]
qcsrc/menu/xonotic/inputbox.qc [new file with mode: 0644]
qcsrc/menu/xonotic/keybinder.c [deleted file]
qcsrc/menu/xonotic/keybinder.qc [new file with mode: 0644]
qcsrc/menu/xonotic/languagelist.c [deleted file]
qcsrc/menu/xonotic/languagelist.qc [new file with mode: 0644]
qcsrc/menu/xonotic/listbox.c [deleted file]
qcsrc/menu/xonotic/listbox.qc [new file with mode: 0644]
qcsrc/menu/xonotic/mainwindow.c [deleted file]
qcsrc/menu/xonotic/mainwindow.qc [new file with mode: 0644]
qcsrc/menu/xonotic/maplist.c [deleted file]
qcsrc/menu/xonotic/maplist.qc [new file with mode: 0644]
qcsrc/menu/xonotic/nexposee.c [deleted file]
qcsrc/menu/xonotic/nexposee.qc [new file with mode: 0644]
qcsrc/menu/xonotic/playerlist.c [deleted file]
qcsrc/menu/xonotic/playerlist.qc [new file with mode: 0644]
qcsrc/menu/xonotic/playermodel.c [deleted file]
qcsrc/menu/xonotic/playermodel.qc [new file with mode: 0644]
qcsrc/menu/xonotic/playlist.c [deleted file]
qcsrc/menu/xonotic/playlist.qc [new file with mode: 0644]
qcsrc/menu/xonotic/radiobutton.c [deleted file]
qcsrc/menu/xonotic/radiobutton.qc [new file with mode: 0644]
qcsrc/menu/xonotic/rootdialog.c [deleted file]
qcsrc/menu/xonotic/rootdialog.qc [new file with mode: 0644]
qcsrc/menu/xonotic/screenshotimage.c [deleted file]
qcsrc/menu/xonotic/screenshotimage.qc [new file with mode: 0644]
qcsrc/menu/xonotic/screenshotlist.c [deleted file]
qcsrc/menu/xonotic/screenshotlist.qc [new file with mode: 0644]
qcsrc/menu/xonotic/serverlist.c [deleted file]
qcsrc/menu/xonotic/serverlist.qc [new file with mode: 0644]
qcsrc/menu/xonotic/skinlist.c [deleted file]
qcsrc/menu/xonotic/skinlist.qc [new file with mode: 0644]
qcsrc/menu/xonotic/slider.c [deleted file]
qcsrc/menu/xonotic/slider.qc [new file with mode: 0644]
qcsrc/menu/xonotic/slider_decibels.c [deleted file]
qcsrc/menu/xonotic/slider_decibels.qc [new file with mode: 0644]
qcsrc/menu/xonotic/slider_particles.c [deleted file]
qcsrc/menu/xonotic/slider_particles.qc [new file with mode: 0644]
qcsrc/menu/xonotic/slider_picmip.c [deleted file]
qcsrc/menu/xonotic/slider_picmip.qc [new file with mode: 0644]
qcsrc/menu/xonotic/slider_resolution.c [deleted file]
qcsrc/menu/xonotic/slider_resolution.qc [new file with mode: 0644]
qcsrc/menu/xonotic/slider_sbfadetime.c [deleted file]
qcsrc/menu/xonotic/slider_sbfadetime.qc [new file with mode: 0644]
qcsrc/menu/xonotic/soundlist.c [deleted file]
qcsrc/menu/xonotic/soundlist.qc [new file with mode: 0644]
qcsrc/menu/xonotic/statslist.c [deleted file]
qcsrc/menu/xonotic/statslist.qc [new file with mode: 0644]
qcsrc/menu/xonotic/tab.c [deleted file]
qcsrc/menu/xonotic/tab.qc [new file with mode: 0644]
qcsrc/menu/xonotic/tabcontroller.c [deleted file]
qcsrc/menu/xonotic/tabcontroller.qc [new file with mode: 0644]
qcsrc/menu/xonotic/textlabel.c [deleted file]
qcsrc/menu/xonotic/textlabel.qc [new file with mode: 0644]
qcsrc/menu/xonotic/textslider.c [deleted file]
qcsrc/menu/xonotic/textslider.qc [new file with mode: 0644]
qcsrc/menu/xonotic/util.qc
qcsrc/menu/xonotic/util.qh
qcsrc/menu/xonotic/weaponarenacheckbox.c [deleted file]
qcsrc/menu/xonotic/weaponarenacheckbox.qc [new file with mode: 0644]
qcsrc/menu/xonotic/weaponslist.c [deleted file]
qcsrc/menu/xonotic/weaponslist.qc [new file with mode: 0644]
qcsrc/server/anticheat.qc
qcsrc/server/anticheat.qh
qcsrc/server/antilag.qc
qcsrc/server/antilag.qh
qcsrc/server/autocvars.qh
qcsrc/server/bot/aim.qc
qcsrc/server/bot/aim.qh
qcsrc/server/bot/bot.qc
qcsrc/server/bot/bot.qh
qcsrc/server/bot/havocbot/havocbot.qc
qcsrc/server/bot/havocbot/havocbot.qh
qcsrc/server/bot/havocbot/role_onslaught.qc
qcsrc/server/bot/havocbot/roles.qc
qcsrc/server/bot/navigation.qc
qcsrc/server/bot/navigation.qh
qcsrc/server/bot/scripting.qc
qcsrc/server/bot/waypoints.qc
qcsrc/server/bot/waypoints.qh
qcsrc/server/campaign.qc
qcsrc/server/campaign.qh
qcsrc/server/cheats.qc
qcsrc/server/cheats.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_impulse.qc
qcsrc/server/cl_impulse.qh [new file with mode: 0644]
qcsrc/server/cl_physics.qc
qcsrc/server/cl_player.qc
qcsrc/server/cl_player.qh [new file with mode: 0644]
qcsrc/server/command/banning.qc
qcsrc/server/command/banning.qh
qcsrc/server/command/cmd.qc
qcsrc/server/command/cmd.qh
qcsrc/server/command/common.qc
qcsrc/server/command/common.qh
qcsrc/server/command/getreplies.qc
qcsrc/server/command/getreplies.qh
qcsrc/server/command/radarmap.qc
qcsrc/server/command/radarmap.qh
qcsrc/server/command/sv_cmd.qc
qcsrc/server/command/sv_cmd.qh
qcsrc/server/command/vote.qc
qcsrc/server/command/vote.qh
qcsrc/server/constants.qh
qcsrc/server/csqceffects.qc
qcsrc/server/defs.qh
qcsrc/server/ent_cs.qc
qcsrc/server/ent_cs.qh [new file with mode: 0644]
qcsrc/server/func_breakable.qc
qcsrc/server/g_casings.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_damage.qh [new file with mode: 0644]
qcsrc/server/g_hook.qc
qcsrc/server/g_hook.qh
qcsrc/server/g_lights.qc
qcsrc/server/g_models.qc
qcsrc/server/g_subs.qc
qcsrc/server/g_subs.qh [new file with mode: 0644]
qcsrc/server/g_tetris.qc
qcsrc/server/g_triggers.qc
qcsrc/server/g_triggers.qh [new file with mode: 0644]
qcsrc/server/g_violence.qc
qcsrc/server/g_violence.qh [new file with mode: 0644]
qcsrc/server/g_world.qc
qcsrc/server/g_world.qh [new file with mode: 0644]
qcsrc/server/ipban.qc
qcsrc/server/ipban.qh
qcsrc/server/item_key.qc
qcsrc/server/item_key.qh
qcsrc/server/mapvoting.qc
qcsrc/server/mapvoting.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/miscfunctions.qh [new file with mode: 0644]
qcsrc/server/movelib.qc
qcsrc/server/movelib.qh [new file with mode: 0644]
qcsrc/server/mutators/base.qc
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/gamemode_assault.qc
qcsrc/server/mutators/gamemode_assault.qh
qcsrc/server/mutators/gamemode_ca.qc
qcsrc/server/mutators/gamemode_ca.qh
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/gamemode_ctf.qh
qcsrc/server/mutators/gamemode_cts.qc
qcsrc/server/mutators/gamemode_cts.qh
qcsrc/server/mutators/gamemode_domination.qc
qcsrc/server/mutators/gamemode_domination.qh
qcsrc/server/mutators/gamemode_freezetag.qc
qcsrc/server/mutators/gamemode_invasion.qc
qcsrc/server/mutators/gamemode_invasion.qh
qcsrc/server/mutators/gamemode_keepaway.qc
qcsrc/server/mutators/gamemode_keepaway.qh
qcsrc/server/mutators/gamemode_keyhunt.qc
qcsrc/server/mutators/gamemode_keyhunt.qh
qcsrc/server/mutators/gamemode_lms.qc
qcsrc/server/mutators/gamemode_lms.qh
qcsrc/server/mutators/gamemode_nexball.qc
qcsrc/server/mutators/gamemode_nexball.qh
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/mutators/gamemode_race.qc
qcsrc/server/mutators/gamemode_race.qh
qcsrc/server/mutators/gamemode_tdm.qc
qcsrc/server/mutators/mutator_bloodloss.qc
qcsrc/server/mutators/mutator_buffs.qc
qcsrc/server/mutators/mutator_buffs.qh
qcsrc/server/mutators/mutator_campcheck.qc
qcsrc/server/mutators/mutator_dodging.qc
qcsrc/server/mutators/mutator_dodging.qh
qcsrc/server/mutators/mutator_instagib.qc
qcsrc/server/mutators/mutator_melee_only.qc
qcsrc/server/mutators/mutator_midair.qc
qcsrc/server/mutators/mutator_multijump.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/mutators/mutator_nades.qh
qcsrc/server/mutators/mutator_new_toys.qc
qcsrc/server/mutators/mutator_nix.qc
qcsrc/server/mutators/mutator_overkill.qc
qcsrc/server/mutators/mutator_overkill.qh
qcsrc/server/mutators/mutator_physical_items.qc
qcsrc/server/mutators/mutator_pinata.qc
qcsrc/server/mutators/mutator_random_gravity.qc
qcsrc/server/mutators/mutator_spawn_near_teammate.qc
qcsrc/server/mutators/mutator_superspec.qc
qcsrc/server/mutators/mutator_touchexplode.qc
qcsrc/server/mutators/mutator_vampire.qc
qcsrc/server/mutators/mutators.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/mutators/mutators_include.qc
qcsrc/server/mutators/mutators_include.qh
qcsrc/server/mutators/sandbox.qc
qcsrc/server/pathlib.qc
qcsrc/server/pathlib/costs.qc
qcsrc/server/pathlib/debug.qc
qcsrc/server/pathlib/expandnode.qc
qcsrc/server/pathlib/main.qc
qcsrc/server/pathlib/movenode.qc
qcsrc/server/pathlib/path_waypoint.qc
qcsrc/server/pathlib/pathlib.qh
qcsrc/server/pathlib/utility.qc
qcsrc/server/playerdemo.qc
qcsrc/server/playerdemo.qh
qcsrc/server/portals.qc
qcsrc/server/portals.qh
qcsrc/server/progs.src
qcsrc/server/race.qc
qcsrc/server/race.qh
qcsrc/server/round_handler.qc
qcsrc/server/round_handler.qh
qcsrc/server/scores.qc
qcsrc/server/scores.qh
qcsrc/server/scores_rules.qc
qcsrc/server/secret.qc
qcsrc/server/secret.qh
qcsrc/server/spawnpoints.qc
qcsrc/server/spawnpoints.qh
qcsrc/server/steerlib.qc
qcsrc/server/sv_main.qc
qcsrc/server/sys-post.qh
qcsrc/server/sys-pre.qh
qcsrc/server/t_halflife.qc
qcsrc/server/t_items.qc
qcsrc/server/t_items.qh
qcsrc/server/t_jumppads.qc
qcsrc/server/t_jumppads.qh [new file with mode: 0644]
qcsrc/server/t_plats.qc
qcsrc/server/t_quake.qc
qcsrc/server/t_quake3.qc
qcsrc/server/t_swamp.qc
qcsrc/server/t_teleporters.qc
qcsrc/server/t_teleporters.qh [new file with mode: 0644]
qcsrc/server/target_music.qc
qcsrc/server/target_spawn.qc
qcsrc/server/teamplay.qc
qcsrc/server/teamplay.qh [new file with mode: 0644]
qcsrc/server/tturrets/include/turrets.qh
qcsrc/server/tturrets/include/turrets_early.qh
qcsrc/server/tturrets/system/system_aimprocs.qc
qcsrc/server/tturrets/system/system_damage.qc
qcsrc/server/tturrets/system/system_main.qc
qcsrc/server/tturrets/system/system_misc.qc
qcsrc/server/tturrets/units/unit_ewheel.qc
qcsrc/server/tturrets/units/unit_flac.qc
qcsrc/server/tturrets/units/unit_hellion.qc
qcsrc/server/tturrets/units/unit_hk.qc
qcsrc/server/tturrets/units/unit_mlrs.qc
qcsrc/server/tturrets/units/unit_phaser.qc
qcsrc/server/tturrets/units/unit_plasma.qc
qcsrc/server/tturrets/units/unit_walker.qc
qcsrc/server/vehicles/bumblebee.qc
qcsrc/server/vehicles/bumblebee.qh [new file with mode: 0644]
qcsrc/server/vehicles/racer.qc
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/vehicles/vehicles.qc
qcsrc/server/vehicles/vehicles.qh
qcsrc/server/vehicles/vehicles_def.qh
qcsrc/server/waypointsprites.qc
qcsrc/server/waypointsprites.qh [new file with mode: 0644]
qcsrc/server/weapons/accuracy.qc
qcsrc/server/weapons/accuracy.qh
qcsrc/server/weapons/common.qc
qcsrc/server/weapons/common.qh
qcsrc/server/weapons/csqcprojectile.qc
qcsrc/server/weapons/csqcprojectile.qh
qcsrc/server/weapons/hitplot.qc
qcsrc/server/weapons/hitplot.qh
qcsrc/server/weapons/selection.qc
qcsrc/server/weapons/selection.qh
qcsrc/server/weapons/spawning.qc
qcsrc/server/weapons/spawning.qh
qcsrc/server/weapons/throwing.qc
qcsrc/server/weapons/throwing.qh
qcsrc/server/weapons/tracing.qc
qcsrc/server/weapons/tracing.qh
qcsrc/server/weapons/weaponstats.qc
qcsrc/server/weapons/weaponstats.qh
qcsrc/server/weapons/weaponsystem.qc
qcsrc/server/weapons/weaponsystem.qh
qcsrc/uncrustify.cfg
qcsrc/warpzonelib/anglestransform.qc
qcsrc/warpzonelib/anglestransform.qh
qcsrc/warpzonelib/client.qc
qcsrc/warpzonelib/client.qh
qcsrc/warpzonelib/common.qc
qcsrc/warpzonelib/common.qh
qcsrc/warpzonelib/mathlib.qc
qcsrc/warpzonelib/mathlib.qh
qcsrc/warpzonelib/server.qc
qcsrc/warpzonelib/server.qh
qcsrc/warpzonelib/util_server.qc
qcsrc/warpzonelib/util_server.qh
qcsrc/whitespace.sh [new file with mode: 0755]
serverbench.cfg

index dce01a7..034b3bb 100644 (file)
@@ -52,6 +52,7 @@ mod_q3bsp_lightmapmergepower 4
 // player defaults
 _cl_color "112.211" // same effect as 112, but menuqc can detect this as the default and not intentionally set
 _cl_name ""
+seta _cl_gender 0 "storage cvar for current player gender (0 = undisclosed, 1 = male, 2 = female)"
 _cl_playermodel models/player/erebus.iqm
 _cl_playerskin 0
 
index 9fde71e..abbd25f 100644 (file)
@@ -7,8 +7,7 @@ QCCVERSIONFILE := qccversion.$(shell (cd server && $(QCC) --version) > qccversio
 
 # We eventually need to get rid of these.
 QCCFLAGS_WTFS ?= \
-       -Wno-field-redeclared \
-       -Wno-double-declaration \
+       -Wno-field-redeclared
 
 QCCFLAGS ?= \
        -std=gmqcc \
@@ -38,7 +37,7 @@ $(QCCVERSIONFILE):
 FILES_CSPROGS = $(shell find client common warpzonelib csqcmodellib -type f -not -name fteqcc.log -not -name qc.asm)
 ../csprogs.dat: $(FILES_CSPROGS) $(QCCVERSIONFILE)
        @echo make[1]: Entering directory \`$(PWD)/client\'
-       cd client && $(QCC) $(QCCFLAGS)
+       cd client && $(QCC) $(QCCFLAGS) -DCSQC
 
 server/precache-for-csqc.inc: $(FILES_CSPROGS)
        sh collect-precache.sh
@@ -46,12 +45,12 @@ server/precache-for-csqc.inc: $(FILES_CSPROGS)
 FILES_PROGS = $(shell find server common warpzonelib csqcmodellib -type f -not -name fteqcc.log -not -name qc.asm)
 ../progs.dat: $(FILES_PROGS) $(QCCVERSIONFILE) server/precache-for-csqc.inc
        @echo make[1]: Entering directory \`$(PWD)/server\'
-       cd server && $(QCC) $(QCCFLAGS)
+       cd server && $(QCC) $(QCCFLAGS) -DSVQC
 
 FILES_MENU = $(shell find menu common warpzonelib -type f -not -name fteqcc.log -not -name qc.asm)
 ../menu.dat: $(FILES_MENU) $(QCCVERSIONFILE)
        @echo make[1]: Entering directory \`$(PWD)/menu\'
-       cd menu && $(QCC) $(QCCFLAGS)
+       cd menu && $(QCC) $(QCCFLAGS) -DMENUQC
 
 .PHONY: testcase
 testcase:
diff --git a/qcsrc/client/Defs.qc b/qcsrc/client/Defs.qc
deleted file mode 100644 (file)
index 24a5fbf..0000000
+++ /dev/null
@@ -1,275 +0,0 @@
-//NOTE: THIS IS AN INTERFACE FILE. DO NOT EDIT.
-//MODIFYING THIS FILE CAN RESULT IN CRC ERRORS.
-//YOU HAVE BEEN WARNED.
-
-//feel free to look though. :)
-
-
-
-
-
-/*
-==============================================================================
-
-                       SOURCE FOR GLOBALVARS_T C STRUCTURE
-
-==============================================================================
-*/
-
-//
-// system globals
-//
-entity         self;
-entity         other;
-entity         world;
-float          time;
-float          frametime;
-
-float          player_localentnum;     //the entnum of the VIEW entity
-float          player_localnum;        //the playernum
-float          maxclients;     //a constant filled in by the engine. gah, portability eh?
-
-float          clientcommandframe;     //player movement
-float          servercommandframe;     //clientframe echoed off the server
-
-string         mapname;
-
-//
-// global variables set by built in functions
-//
-vector         v_forward, v_up, v_right;       // set by makevectors()
-
-// set by traceline / tracebox
-float          trace_allsolid;
-float          trace_startsolid;
-float          trace_fraction;
-vector         trace_endpos;
-vector         trace_plane_normal;
-float          trace_plane_dist;
-entity         trace_ent;
-float          trace_inopen;
-float          trace_inwater;
-
-//
-// required prog functions
-//
-void()         CSQC_Init;
-void()         CSQC_Shutdown;
-float(float f, float t, float n)       CSQC_InputEvent;
-void(float w, float h)         CSQC_UpdateView;
-float(string s)        CSQC_ConsoleCommand;
-
-//these fields are read and set by the default player physics
-vector         pmove_org;
-vector         pmove_vel;
-vector         pmove_mins;
-vector         pmove_maxs;
-//retrieved from the current movement commands (read by player physics)
-float          input_timelength;
-vector         input_angles;
-vector         input_movevalues;       //forwards, right, up.
-float          input_buttons;          //attack, use, jump (default physics only uses jump)
-
-float          movevar_gravity;
-float          movevar_stopspeed;
-float          movevar_maxspeed;
-float          movevar_spectatormaxspeed;      //used by NOCLIP movetypes.
-float          movevar_accelerate;
-float          movevar_airaccelerate;
-float          movevar_wateraccelerate;
-float          movevar_friction;
-float          movevar_waterfriction;
-float          movevar_entgravity;     //the local player's gravity field. Is a multiple (1 is the normal value)
-
-//================================================
-void           end_sys_globals;                // flag for structure dumping
-//================================================
-
-/*
-==============================================================================
-
-                       SOURCE FOR ENTVARS_T C STRUCTURE
-
-==============================================================================
-*/
-
-//
-// system fields (*** = do not set in prog code, maintained by C code)
-//
-.float         modelindex;             // *** model index in the precached list
-.vector                absmin, absmax; // *** origin + mins / maxs
-
-.float         entnum; // *** the ent number as on the server
-.float         drawmask;
-.void()                predraw;
-
-.float         movetype;
-.float         solid;
-
-.vector                origin;                 // ***
-.vector                oldorigin;              // ***
-.vector                velocity;
-.vector                angles;
-.vector                avelocity;
-
-.string                classname;              // spawn function
-.string                model;
-.float         frame;
-.float         skin;
-.float         effects;
-
-.vector                mins, maxs;             // bounding box extents reletive to origin
-.vector                size;                   // maxs - mins
-
-.void()                touch;
-.void()                use;
-.void()                think;
-.void()                blocked;                // for doors or plats, called when can't push other
-
-.float         nextthink;
-
-.entity                chain;
-
-.string                netname;
-
-.entity        enemy;
-
-.float         flags;
-
-.float         colormap;
-
-.entity                owner;          // who launched a missile
-
-//================================================
-void           end_sys_fields;                 // flag for structure dumping
-//================================================
-
-// Additional OPTIONAL Fields and Globals
-float          intermission;
-float          scoreboard_showscores;
-float          scoreboard_showaccuracy;
-.string                message;
-.float renderflags;
-// float               coop;
-// float               deathmatch;
-
-float          dmg_take;
-// float               dmg_save;
-// vector              dmg_origin;
-
-// Darkplaces Render Modifications
-#if 0
-.float alpha;
-.float renderflags;
-.vector colormod;
-.float scale;
-#endif
-
-// Basic variables
-.float enttype; // entity type sent from server
-.float sv_entnum; // entity number sent from server
-.float team;
-.float team_size;
-
-float vid_conwidth, vid_conheight;
-float binddb;
-
-// QUALIFYING
-float race_checkpoint;
-float race_time;
-float race_laptime;
-float race_checkpointtime;
-float race_previousbesttime;
-string race_previousbestname;
-float race_nextcheckpoint;
-float race_nextbesttime;
-string race_nextbestname;
-float race_penaltyaccumulator; // qualifying: total penalty time in tenths
-float race_penaltyeventtime; // time when the player got the penalty
-float race_penaltytime; // duration of penalty time, in tenths
-string race_penaltyreason; // reason for penalty
-float race_server_record; // server record
-float race_speedaward;
-string race_speedaward_holder;
-float race_speedaward_alltimebest;
-string race_speedaward_alltimebest_holder;
-
-// RACE
-float race_mycheckpoint;
-float race_mycheckpointtime;
-float race_mycheckpointdelta;
-float race_mycheckpointlapsdelta;
-string race_mycheckpointenemy;
-float race_othercheckpoint;
-float race_othercheckpointtime;
-float race_othercheckpointdelta;
-float race_othercheckpointlapsdelta;
-string race_othercheckpointenemy;
-float scoreboard_showscores_force;
-float race_status;
-string race_status_name;
-float race_myrank;
-
-// Nexball
-float nb_pb_period;
-
-// Spectating
-float spectatee_status;
-
-// short mapname
-string shortmapname;
-
-// database for misc stuff
-float tempdb;
-float ClientProgsDB;
-vector hook_shotorigin[4];
-vector lightning_shotorigin[4];
-
-
-#ifdef BLURTEST
-float blurtest_time0, blurtest_time1, blurtest_radius, blurtest_power;
-#endif
-
-float servertime, serverprevtime, serverdeltatime;
-
-float ticrate;
-
-.float damageforcescale;
-#define MIN_DAMAGEEXTRARADIUS 2
-#define MAX_DAMAGEEXTRARADIUS 16
-.float damageextraradius;
-.void(float thisdmg, float hittype, vector org, vector thisforce) event_damage;
-
-// only for Porto
-float angles_held_status;
-vector angles_held;
-
-// weapons
-.float silent;
-
-float w_deathtype, w_issilent, w_random;
-vector w_org, w_backoff;
-
-float rifle_scope;
-float vortex_scope;
-
-float minelayer_maxmines;
-
-float hagar_maxrockets;
-
-float bgmtime;
-
-string weaponorder_byimpulse;
-string weaponorder_bypriority;
-
-float vortex_charge_movingavg;
-
-float serverflags;
-
-float uid2name_dialog;
-
-.float csqcmodel_isdead; // used by shownames and miscfunctions (float getplayerisdead(float) {}) to know when a player is dead
-
-#define player_currententnum (spectatee_status > 0 ? spectatee_status : player_localnum + 1)
-
-float g_balance_porto_secondary;
diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
deleted file mode 100644 (file)
index d6b00ec..0000000
+++ /dev/null
@@ -1,1303 +0,0 @@
-// --------------------------------------------------------------------------
-// BEGIN REQUIRED CSQC FUNCTIONS
-//include "main.qh"
-
-entity clearentity_ent;
-void clearentity(entity e)
-{
-       if (!clearentity_ent)
-       {
-               clearentity_ent = spawn();
-               clearentity_ent.classname = "clearentity";
-       }
-       float n = e.entnum;
-       copyentity(clearentity_ent, e);
-       e.entnum = n;
-}
-
-#define DP_CSQC_ENTITY_REMOVE_IS_B0RKED
-void menu_show_error()
-{
-       drawstring('0 200 0', _("ERROR - MENU IS VISIBLE BUT NO MENU WAS DEFINED!"), '8 8 0', '1 0 0', 1, 0);
-}
-
-// CSQC_Init : Called every time the CSQC code is initialized (essentially at map load)
-// Useful for precaching things
-
-void menu_sub_null()
-{
-}
-
-string forcefog;
-void WaypointSprite_Load();
-void ConsoleCommand_macro_init();
-void CSQC_Init(void)
-{
-       prvm_language = cvar_string("prvm_language");
-
-#ifdef WATERMARK
-       dprintf("^4CSQC Build information: ^1%s\n", WATERMARK);
-#endif
-
-       float i;
-
-       binddb = db_create();
-       tempdb = db_create();
-       ClientProgsDB = db_load("client.db");
-       compressShortVector_init();
-
-       draw_endBoldFont();
-       menu_visible = FALSE;
-       menu_show = menu_show_error;
-       menu_action = func_null;
-
-       for(i = 0; i < 255; ++i)
-               if(getplayerkeyvalue(i, "viewentity") == "")
-                       break;
-       maxclients = i;
-
-       //registercommand("hud_configure");
-       //registercommand("hud_save");
-       //registercommand("menu_action");
-
-       ConsoleCommand_macro_init();
-
-       registercvar("hud_usecsqc", "1");
-       registercvar("scoreboard_columns", "default");
-
-       registercvar("cl_nade_type", "3");
-       registercvar("cl_pokenade_type", "zombie");
-
-       gametype = 0;
-
-       // hud_fields uses strunzone on the titles!
-       for(i = 0; i < MAX_HUD_FIELDS; ++i)
-               hud_title[i] = strzone("(null)");
-
-       Cmd_HUD_SetFields(0);
-
-       postinit = false;
-
-       calledhooks = 0;
-
-       teams = Sort_Spawn();
-       players = Sort_Spawn();
-
-       GetTeam(NUM_SPECTATOR, true); // add specs first
-
-       // needs to be done so early because of the constants they create
-       CALL_ACCUMULATED_FUNCTION(RegisterWeapons);
-       CALL_ACCUMULATED_FUNCTION(RegisterMonsters);
-       CALL_ACCUMULATED_FUNCTION(RegisterGametypes);
-       CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
-       CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
-       CALL_ACCUMULATED_FUNCTION(RegisterHUD_Panels);
-       CALL_ACCUMULATED_FUNCTION(RegisterBuffs);
-
-       WaypointSprite_Load();
-
-       // precaches
-       precache_model("null");
-       precache_sound("misc/hit.wav");
-       precache_sound("misc/typehit.wav");
-
-       Projectile_Precache();
-       Hook_Precache();
-       GibSplash_Precache();
-       Casings_Precache();
-       Vehicles_Precache();
-       turrets_precache();
-       Tuba_Precache();
-       CSQCPlayer_Precache();
-
-       if(autocvar_cl_reticle)
-       {
-               precache_pic("gfx/reticle_normal");
-               // weapon reticles are precached in weapon files
-       }
-
-       get_mi_min_max_texcoords(1); // try the CLEVER way first
-       minimapname = strcat("gfx/", mi_shortname, "_radar.tga");
-       shortmapname = mi_shortname;
-
-       if(precache_pic(minimapname) == "")
-       {
-               // but maybe we have a non-clever minimap
-               minimapname = strcat("gfx/", mi_shortname, "_mini.tga");
-               if(precache_pic(minimapname) == "")
-                       minimapname = ""; // FAIL
-               else
-                       get_mi_min_max_texcoords(0); // load new texcoords
-       }
-
-       mi_center = (mi_min + mi_max) * 0.5;
-       mi_scale = mi_max - mi_min;
-       minimapname = strzone(minimapname);
-
-       WarpZone_Init();
-
-       hud_skin_path = strzone(strcat("gfx/hud/", autocvar_hud_skin));
-       hud_configure_prev = -1;
-
-       draw_currentSkin = strzone(strcat("gfx/menu/", cvar_string("menu_skin")));
-}
-
-// CSQC_Shutdown : Called every time the CSQC code is shutdown (changing maps, quitting, etc)
-void Shutdown(void)
-{
-       WarpZone_Shutdown();
-
-       remove(teams);
-       remove(players);
-       db_close(binddb);
-       db_close(tempdb);
-       if(autocvar_cl_db_saveasdump)
-               db_dump(ClientProgsDB, "client.db");
-       else
-               db_save(ClientProgsDB, "client.db");
-       db_close(ClientProgsDB);
-
-       if(camera_active)
-               cvar_set("chase_active",ftos(chase_active_backup));
-
-       // unset the event chasecam's chase_active
-       if(autocvar_chase_active < 0)
-               cvar_set("chase_active", "0");
-
-       if (!isdemo())
-       {
-               if (!(calledhooks & HOOK_START))
-                       localcmd("\n_cl_hook_gamestart nop\n");
-               if (!(calledhooks & HOOK_END))
-                       localcmd("\ncl_hook_gameend\n");
-       }
-}
-
-.float has_team;
-float SetTeam(entity o, float Team)
-{
-       entity tm;
-       if(teamplay)
-       {
-               switch(Team)
-               {
-                       case -1:
-                       case NUM_TEAM_1:
-                       case NUM_TEAM_2:
-                       case NUM_TEAM_3:
-                       case NUM_TEAM_4:
-                               break;
-                       default:
-                               if(GetTeam(Team, false) == world)
-                               {
-                                       dprintf("trying to switch to unsupported team %d\n", Team);
-                                       Team = NUM_SPECTATOR;
-                               }
-                               break;
-               }
-       }
-       else
-       {
-               switch(Team)
-               {
-                       case -1:
-                       case 0:
-                               break;
-                       default:
-                               if(GetTeam(Team, false) == world)
-                               {
-                                       dprintf("trying to switch to unsupported team %d\n", Team);
-                                       Team = NUM_SPECTATOR;
-                               }
-                               break;
-               }
-       }
-       if(Team == -1) // leave
-       {
-               if(o.has_team)
-               {
-                       tm = GetTeam(o.team, false);
-                       tm.team_size -= 1;
-                       o.has_team = 0;
-                       return TRUE;
-               }
-       }
-       else
-       {
-               if (!o.has_team)
-               {
-                       o.team = Team;
-                       tm = GetTeam(Team, true);
-                       tm.team_size += 1;
-                       o.has_team = 1;
-                       return TRUE;
-               }
-               else if(Team != o.team)
-               {
-                       tm = GetTeam(o.team, false);
-                       tm.team_size -= 1;
-                       o.team = Team;
-                       tm = GetTeam(Team, true);
-                       tm.team_size += 1;
-                       return TRUE;
-               }
-       }
-       return FALSE;
-}
-
-void Playerchecker_Think()
-{
-       float i;
-       entity e;
-       for(i = 0; i < maxclients; ++i)
-       {
-               e = playerslots[i];
-               if(GetPlayerName(i) == "")
-               {
-                       if(e.sort_prev)
-                       {
-                               // player disconnected
-                               SetTeam(e, -1);
-                               RemovePlayer(e);
-                               e.sort_prev = world;
-                               //e.gotscores = 0;
-                       }
-               }
-               else
-               {
-                       if (!e.sort_prev)
-                       {
-                               // player connected
-                               if (!e)
-                                       playerslots[i] = e = spawn();
-                               e.sv_entnum = i;
-                               e.ping = 0;
-                               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 HUD_UpdatePlayerTeams
-                               RegisterPlayer(e);
-                               HUD_UpdatePlayerPos(e);
-                       }
-               }
-       }
-       self.nextthink = time + 0.2;
-}
-
-void Porto_Init();
-void TrueAim_Init();
-void PostInit(void)
-{
-       entity playerchecker;
-       playerchecker = spawn();
-       playerchecker.think = Playerchecker_Think;
-       playerchecker.nextthink = time + 0.2;
-
-       Porto_Init();
-       TrueAim_Init();
-
-       postinit = true;
-}
-
-float button_zoom;
-
-// CSQC_InputEvent : Used to perform actions based on any key pressed, key released and mouse on the client.
-// Return value should be 1 if CSQC handled the input, otherwise return 0 to have the input passed to the engine.
-// All keys are in ascii.
-// bInputType = 0 is key pressed, 1 is key released, 2 and 3 are mouse input.
-// In the case of keyboard input, nPrimary is the ascii code, and nSecondary is 0.
-// In the case of mouse input, nPrimary is xdelta, nSecondary is ydelta.
-// In the case of mouse input after a setcursormode(1) call, nPrimary is xpos, nSecondary is ypos.
-float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary)
-{
-       float bSkipKey;
-       bSkipKey = false;
-
-       if (HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary))
-               return true;
-
-       if (MapVote_InputEvent(bInputType, nPrimary, nSecondary))
-               return true;
-
-       if(menu_visible && menu_action)
-               if(menu_action(bInputType, nPrimary, nSecondary))
-                       return TRUE;
-
-       return bSkipKey;
-}
-
-// END REQUIRED CSQC FUNCTIONS
-// --------------------------------------------------------------------------
-
-// --------------------------------------------------------------------------
-// BEGIN OPTIONAL CSQC FUNCTIONS
-void Ent_RemoveEntCS()
-{
-       entcs_receiver[self.sv_entnum] = world;
-}
-void Ent_ReadEntCS()
-{
-       float sf;
-       InterpolateOrigin_Undo();
-
-       self.classname = "entcs_receiver";
-       sf = ReadByte();
-
-       if(sf & 1)
-               self.sv_entnum = ReadByte();
-       if(sf & 2)
-       {
-               self.origin_x = ReadShort();
-               self.origin_y = ReadShort();
-               self.origin_z = ReadShort();
-               setorigin(self, self.origin);
-       }
-       if(sf & 4)
-       {
-               self.angles_y = ReadByte() * 360.0 / 256;
-               self.angles_x = self.angles_z = 0;
-       }
-       if(sf & 8)
-               self.healthvalue = ReadByte() * 10;
-       if(sf & 16)
-               self.armorvalue = ReadByte() * 10;
-
-       entcs_receiver[self.sv_entnum] = self;
-       self.entremove = Ent_RemoveEntCS;
-       self.iflags |= IFLAG_ORIGIN;
-
-       InterpolateOrigin_Note();
-}
-
-void Ent_Remove();
-
-void Ent_RemovePlayerScore()
-{
-       float i;
-
-       if(self.owner)
-       {
-               SetTeam(self.owner, -1);
-               self.owner.gotscores = 0;
-               for(i = 0; i < MAX_SCORE; ++i)
-                       self.owner.(scores[i]) = 0; // clear all scores
-       }
-}
-
-void Ent_ReadPlayerScore()
-{
-       float i, n;
-       float isNew;
-       entity o;
-
-       // 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;
-
-#ifdef DP_CSQC_ENTITY_REMOVE_IS_B0RKED
-       if(!isNew && n != self.sv_entnum)
-       {
-               //print("A CSQC entity changed its owner!\n");
-               printf("A CSQC entity changed its owner! (edict: %d, classname: %s)\n", num_for_edict(self), self.classname);
-               isNew = true;
-               Ent_Remove();
-               self.enttype = ENT_CLIENT_SCORES;
-       }
-#endif
-
-       self.sv_entnum = n;
-
-       if (!(playerslots[self.sv_entnum]))
-               playerslots[self.sv_entnum] = spawn();
-       o = self.owner = playerslots[self.sv_entnum];
-       o.sv_entnum = self.sv_entnum;
-       o.gotscores = 1;
-
-       //if (!o.sort_prev)
-       //      RegisterPlayer(o);
-       //playerchecker will do this for us later, if it has not already done so
-
-       float sf, lf;
-#if MAX_SCORE <= 8
-       sf = ReadByte();
-       lf = ReadByte();
-#else
-       sf = ReadShort();
-       lf = ReadShort();
-#endif
-       float p;
-       for(i = 0, p = 1; i < MAX_SCORE; ++i, p *= 2)
-               if(sf & p)
-               {
-                       if(lf & p)
-                               o.(scores[i]) = ReadInt24_t();
-                       else
-                               o.(scores[i]) = ReadChar();
-               }
-
-       if(o.sort_prev)
-               HUD_UpdatePlayerPos(o); // if not registered, we cannot do this yet!
-
-       self.entremove = Ent_RemovePlayerScore;
-}
-
-void Ent_ReadTeamScore()
-{
-       float i;
-       entity o;
-
-       self.team = ReadByte();
-       o = self.owner = GetTeam(self.team, true); // these team numbers can always be trusted
-
-       float sf, lf;
-#if MAX_TEAMSCORE <= 8
-       sf = ReadByte();
-       lf = ReadByte();
-#else
-       sf = ReadShort();
-       lf = ReadShort();
-#endif
-       float p;
-       for(i = 0, p = 1; i < MAX_TEAMSCORE; ++i, p *= 2)
-               if(sf & p)
-               {
-                       if(lf & p)
-                               o.(teamscores[i]) = ReadInt24_t();
-                       else
-                               o.(teamscores[i]) = ReadChar();
-               }
-
-       HUD_UpdateTeamPos(o);
-}
-
-void Ent_ClientData()
-{
-       float f;
-       float newspectatee_status;
-
-       f = ReadByte();
-
-       scoreboard_showscores_force = (f & 1);
-
-       if(f & 2)
-       {
-               newspectatee_status = ReadByte();
-               if(newspectatee_status == player_localnum + 1)
-                       newspectatee_status = -1; // observing
-       }
-       else
-               newspectatee_status = 0;
-
-       spectatorbutton_zoom = (f & 4);
-
-       if(f & 8)
-       {
-               angles_held_status = 1;
-               angles_held_x = ReadAngle();
-               angles_held_y = ReadAngle();
-               angles_held_z = 0;
-       }
-       else
-               angles_held_status = 0;
-
-       if(newspectatee_status != spectatee_status)
-       {
-               // clear race stuff
-               race_laptime = 0;
-               race_checkpointtime = 0;
-       }
-       if (autocvar_hud_panel_healtharmor_progressbar_gfx)
-       {
-               if ( (spectatee_status == -1 && newspectatee_status > 0) //before observing, now spectating
-                 || (spectatee_status > 0 && newspectatee_status > 0 && spectatee_status != newspectatee_status) //changed spectated player
-               )
-                       prev_p_health = -1;
-               else if(spectatee_status && !newspectatee_status) //before observing/spectating, now playing
-                       prev_health = -1;
-       }
-       spectatee_status = newspectatee_status;
-
-       // we could get rid of spectatee_status, and derive it from player_localentnum and player_localnum
-}
-
-void Ent_Nagger()
-{
-       float nags, i, j, b, f;
-
-       nags = ReadByte(); // NAGS NAGS NAGS NAGS NAGS NAGS NADZ NAGS NAGS NAGS
-
-       if(!(nags & 4))
-       {
-               if(vote_called_vote)
-                       strunzone(vote_called_vote);
-               vote_called_vote = string_null;
-               vote_active = 0;
-       }
-       else
-       {
-               vote_active = 1;
-       }
-
-       if(nags & 64)
-       {
-               vote_yescount = ReadByte();
-               vote_nocount = ReadByte();
-               vote_needed = ReadByte();
-               vote_highlighted = ReadChar();
-       }
-
-       if(nags & 128)
-       {
-               if(vote_called_vote)
-                       strunzone(vote_called_vote);
-               vote_called_vote = strzone(ColorTranslateRGB(ReadString()));
-       }
-
-       if(nags & 1)
-       {
-               for(j = 0; j < maxclients; ++j)
-                       if(playerslots[j])
-                               playerslots[j].ready = 1;
-               for(i = 1; i <= maxclients; i += 8)
-               {
-                       f = ReadByte();
-                       for(j = i-1, b = 1; b < 256; b *= 2, ++j)
-                               if (!(f & b))
-                                       if(playerslots[j])
-                                               playerslots[j].ready = 0;
-               }
-       }
-
-       ready_waiting = (nags & 1);
-       ready_waiting_for_me = (nags & 2);
-       vote_waiting = (nags & 4);
-       vote_waiting_for_me = (nags & 8);
-       warmup_stage = (nags & 16);
-}
-
-void Ent_EliminatedPlayers()
-{
-       float sf, i, j, b, f;
-
-       sf = ReadByte();
-       if(sf & 1)
-       {
-               for(j = 0; j < maxclients; ++j)
-                       if(playerslots[j])
-                               playerslots[j].eliminated = 1;
-               for(i = 1; i <= maxclients; i += 8)
-               {
-                       f = ReadByte();
-                       for(j = i-1, b = 1; b < 256; b *= 2, ++j)
-                               if (!(f & b))
-                                       if(playerslots[j])
-                                               playerslots[j].eliminated = 0;
-               }
-       }
-}
-
-void Ent_RandomSeed()
-{
-       float s;
-       prandom_debug();
-       s = ReadShort();
-       psrandom(s);
-}
-
-void Ent_ReadAccuracy(void)
-{
-       float sf, f, w, b;
-       sf = ReadInt24_t();
-       if(sf == 0)
-       {
-               for(w = 0; w <= WEP_LAST - WEP_FIRST; ++w)
-                       weapon_accuracy[w] = -1;
-               return;
-       }
-
-       for(w = 0, f = 1; w <= WEP_LAST - WEP_FIRST; ++w)
-       {
-               if(sf & f)
-               {
-                       b = ReadByte();
-                       if(b == 0)
-                               weapon_accuracy[w] = -1;
-                       else if(b == 255)
-                               weapon_accuracy[w] = 1.0; // no better error handling yet, sorry
-                       else
-                               weapon_accuracy[w] = (b - 1.0) / 100.0;
-               }
-               if(f == 0x800000)
-                       f = 1;
-               else
-                       f *= 2;
-       }
-}
-
-void Spawn_Draw(void)
-{
-       pointparticles(self.cnt, self.origin + '0 0 28', '0 0 2', bound(0, frametime, 0.1));
-}
-
-void Ent_ReadSpawnPoint(float is_new) // entity for spawnpoint
-{
-       float teamnum = (ReadByte() - 1);
-       vector spn_origin;
-       spn_origin_x = ReadShort();
-       spn_origin_y = ReadShort();
-       spn_origin_z = ReadShort();
-
-       if(is_new)
-       {
-               self.origin = spn_origin;
-               setsize(self, PL_MIN, PL_MAX);
-               droptofloor();
-
-               /*if(autocvar_cl_spawn_point_model) // needs a model first
-               {
-                       self.mdl = "models/spawnpoint.md3";
-                       self.colormod = Team_ColorRGB(teamnum);
-                       precache_model(self.mdl);
-                       setmodel(self, self.mdl);
-                       self.drawmask = MASK_NORMAL;
-                       //self.movetype = MOVETYPE_NOCLIP;
-                       //self.draw = Spawn_Draw;
-               }*/
-               if(autocvar_cl_spawn_point_particles)
-               {
-                       if((serverflags & SERVERFLAG_TEAMPLAY))
-                       {
-                               switch(teamnum)
-                               {
-                                       case NUM_TEAM_1: self.cnt = particleeffectnum("spawn_point_red"); break;
-                                       case NUM_TEAM_2: self.cnt = particleeffectnum("spawn_point_blue"); break;
-                                       case NUM_TEAM_3: self.cnt = particleeffectnum("spawn_point_yellow"); break;
-                                       case NUM_TEAM_4: self.cnt = particleeffectnum("spawn_point_pink"); break;
-                                       default: self.cnt = particleeffectnum("spawn_point_neutral"); break;
-                               }
-                       }
-                       else { self.cnt = particleeffectnum("spawn_point_neutral"); }
-
-                       self.draw = Spawn_Draw;
-               }
-       }
-
-       //printf("Ent_ReadSpawnPoint(is_new = %d); origin = %s, team = %d, effect = %d\n", is_new, vtos(self.origin), teamnum, self.cnt);
-}
-
-void Ent_ReadSpawnEvent(float is_new)
-{
-       // If entnum is 0, ONLY do the local spawn actions
-       // this way the server can disable the sending of
-       // spawn origin or such to clients if wanted.
-       float entnum = ReadByte();
-
-       if(entnum)
-       {
-               self.origin_x = ReadShort();
-               self.origin_y = ReadShort();
-               self.origin_z = ReadShort();
-
-               if(is_new)
-               {
-                       float teamnum = GetPlayerColor(entnum - 1);
-
-                       if(autocvar_cl_spawn_event_particles)
-                       {
-                               switch(teamnum)
-                               {
-                                       case NUM_TEAM_1: pointparticles(particleeffectnum("spawn_event_red"), self.origin, '0 0 0', 1); break;
-                                       case NUM_TEAM_2: pointparticles(particleeffectnum("spawn_event_blue"), self.origin, '0 0 0', 1); break;
-                                       case NUM_TEAM_3: pointparticles(particleeffectnum("spawn_event_yellow"), self.origin, '0 0 0', 1); break;
-                                       case NUM_TEAM_4: pointparticles(particleeffectnum("spawn_event_pink"), self.origin, '0 0 0', 1); break;
-                                       default: pointparticles(particleeffectnum("spawn_event_neutral"), self.origin, '0 0 0', 1); break;
-                               }
-                       }
-                       if(autocvar_cl_spawn_event_sound)
-                       {
-                               sound(self, CH_TRIGGER, "misc/spawn.wav", VOL_BASE, ATTEN_NORM);
-                       }
-               }
-       }
-
-       // local spawn actions
-       if(is_new && (!entnum || (entnum == player_localentnum)))
-       {
-               zoomin_effect = 1;
-               current_viewzoom = (1 / bound(1, autocvar_cl_spawnzoom_factor, 16));
-
-               if(autocvar_cl_unpress_zoom_on_spawn)
-               {
-                       localcmd("-zoom\n");
-                       button_zoom = FALSE;
-               }
-       }
-
-       //printf("Ent_ReadSpawnEvent(is_new = %d); origin = %s, entnum = %d, localentnum = %d\n", is_new, vtos(self.origin), entnum, player_localentnum);
-}
-
-// CSQC_Ent_Update : Called every frame that the server has indicated an update to the SSQC / CSQC entity has occured.
-// The only parameter reflects if the entity is "new" to the client, meaning it just came into the client's PVS.
-void Ent_RadarLink();
-void Ent_Init();
-void Ent_ScoresInfo();
-void CSQC_Ent_Update(float bIsNewEntity)
-{
-       float t;
-       float savetime;
-       t = ReadByte();
-
-       if(autocvar_developer_csqcentities)
-               printf("CSQC_Ent_Update(%d) with self=%i self.entnum=%d self.enttype=%d t=%d\n", bIsNewEntity, self, self.entnum, self.enttype, t);
-
-       // set up the "time" global for received entities to be correct for interpolation purposes
-       savetime = time;
-       if(servertime)
-       {
-               time = servertime;
-       }
-       else
-       {
-               serverprevtime = time;
-               serverdeltatime = getstatf(STAT_MOVEVARS_TICRATE) * getstatf(STAT_MOVEVARS_TIMESCALE);
-               time = serverprevtime + serverdeltatime;
-       }
-
-#ifdef DP_CSQC_ENTITY_REMOVE_IS_B0RKED
-       if(self.enttype)
-       {
-               if(t != self.enttype || bIsNewEntity)
-               {
-                       //print("A CSQC entity changed its type!\n");
-                       printf("A CSQC entity changed its type! (edict: %d, server: %d, type: %d -> %d)\n", num_for_edict(self), self.entnum, self.enttype, t);
-                       Ent_Remove();
-                       clearentity(self);
-                       bIsNewEntity = 1;
-               }
-       }
-       else
-       {
-               if(!bIsNewEntity)
-               {
-                       printf("A CSQC entity appeared out of nowhere! (edict: %d, server: %d, type: %d)\n", num_for_edict(self), self.entnum, t);
-                       bIsNewEntity = 1;
-               }
-       }
-#endif
-       self.enttype = t;
-       switch(t)
-       {
-               case ENT_CLIENT_ENTCS: Ent_ReadEntCS(); break;
-               case ENT_CLIENT_SCORES: Ent_ReadPlayerScore(); break;
-               case ENT_CLIENT_TEAMSCORES: Ent_ReadTeamScore(); break;
-               case ENT_CLIENT_POINTPARTICLES: Ent_PointParticles(); break;
-               case ENT_CLIENT_RAINSNOW: Ent_RainOrSnow(); break;
-               case ENT_CLIENT_LASER: Ent_Laser(); break;
-               case ENT_CLIENT_NAGGER: Ent_Nagger(); break;
-               case ENT_CLIENT_ELIMINATEDPLAYERS: Ent_EliminatedPlayers(); break;
-               case ENT_CLIENT_WAYPOINT: Ent_WaypointSprite(); break;
-               case ENT_CLIENT_RADARLINK: Ent_RadarLink(); break;
-               case ENT_CLIENT_PROJECTILE: Ent_Projectile(); break;
-               case ENT_CLIENT_GIBSPLASH: Ent_GibSplash(bIsNewEntity); break;
-               case ENT_CLIENT_DAMAGEINFO: Ent_DamageInfo(bIsNewEntity); break;
-               case ENT_CLIENT_CASING: Ent_Casing(bIsNewEntity); break;
-               case ENT_CLIENT_INIT: Ent_Init(); break;
-               case ENT_CLIENT_SCORES_INFO: Ent_ScoresInfo(); break;
-               case ENT_CLIENT_MAPVOTE: Ent_MapVote(); break;
-               case ENT_CLIENT_CLIENTDATA: Ent_ClientData(); break;
-               case ENT_CLIENT_RANDOMSEED: Ent_RandomSeed(); break;
-               case ENT_CLIENT_WALL: Ent_Wall(); break;
-               case ENT_CLIENT_MODELEFFECT: Ent_ModelEffect(bIsNewEntity); break;
-               case ENT_CLIENT_TUBANOTE: Ent_TubaNote(bIsNewEntity); break;
-               case ENT_CLIENT_WARPZONE: WarpZone_Read(bIsNewEntity); break;
-               case ENT_CLIENT_WARPZONE_CAMERA: WarpZone_Camera_Read(bIsNewEntity); break;
-               case ENT_CLIENT_WARPZONE_TELEPORTED: WarpZone_Teleported_Read(bIsNewEntity); break;
-               case ENT_CLIENT_TRIGGER_MUSIC: Ent_ReadTriggerMusic(); break;
-               case ENT_CLIENT_HOOK: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_HOOK); break;
-               case ENT_CLIENT_ARC_BEAM: Ent_ReadArcBeam(bIsNewEntity); break;
-               case ENT_CLIENT_ACCURACY: Ent_ReadAccuracy(); break;
-               case ENT_CLIENT_AUXILIARYXHAIR: Net_AuXair2(bIsNewEntity); break;
-               case ENT_CLIENT_TURRET: ent_turret(); break;
-               case ENT_CLIENT_MODEL: CSQCModel_Read(bIsNewEntity); break;
-               case ENT_CLIENT_ITEM: ItemRead(bIsNewEntity); break;
-               case ENT_CLIENT_BUMBLE_RAYGUN: bumble_raygun_read(bIsNewEntity); break;
-               case ENT_CLIENT_SPAWNPOINT: Ent_ReadSpawnPoint(bIsNewEntity); break;
-               case ENT_CLIENT_SPAWNEVENT: Ent_ReadSpawnEvent(bIsNewEntity); break;
-               case ENT_CLIENT_NOTIFICATION: Read_Notification(bIsNewEntity); break;
-               case ENT_CLIENT_HEALING_ORB: ent_healer(); break;
-
-               default:
-                       //error(strcat(_("unknown entity type in CSQC_Ent_Update: %d\n"), self.enttype));
-                       error(sprintf("Unknown entity type in CSQC_Ent_Update (enttype: %d, edict: %d, classname: %s)\n", self.enttype, num_for_edict(self), self.classname));
-                       break;
-       }
-
-       time = savetime;
-}
-// Destructor, but does NOT deallocate the entity by calling remove(). Also
-// used when an entity changes its type. For an entity that someone interacts
-// with others, make sure it can no longer do so.
-void Ent_Remove()
-{
-       if(self.entremove)
-               self.entremove();
-
-       if(self.skeletonindex)
-       {
-               skel_delete(self.skeletonindex);
-               self.skeletonindex = 0;
-       }
-
-       if(self.snd_looping > 0)
-       {
-               sound(self, self.snd_looping, "misc/null.wav", VOL_BASE, autocvar_g_jetpack_attenuation);
-               self.snd_looping = 0;
-       }
-
-       self.enttype = 0;
-       self.classname = "";
-       self.draw = menu_sub_null;
-       self.entremove = menu_sub_null;
-       // TODO possibly set more stuff to defaults
-}
-// CSQC_Ent_Remove : Called when the server requests a SSQC / CSQC entity to be removed.  Essentially call remove(self) as well.
-void CSQC_Ent_Remove()
-{
-       if(autocvar_developer_csqcentities)
-               printf("CSQC_Ent_Remove() with self=%i self.entnum=%d self.enttype=%d\n", self, self.entnum, self.enttype);
-
-       if(wasfreed(self))
-       {
-               print("WARNING: CSQC_Ent_Remove called for already removed entity. Packet loss?\n");
-               return;
-       }
-       if(self.enttype)
-               Ent_Remove();
-       remove(self);
-}
-
-void Gamemode_Init()
-{
-       if (!isdemo())
-       {
-               if(!(calledhooks & HOOK_START))
-                       localcmd("\n_cl_hook_gamestart ", MapInfo_Type_ToString(gametype), "\n");
-               calledhooks |= HOOK_START;
-       }
-}
-// CSQC_Parse_StuffCmd : Provides the stuffcmd string in the first parameter that the server provided.  To execute standard behavior, simply execute localcmd with the string.
-void CSQC_Parse_StuffCmd(string strMessage)
-{
-       if(autocvar_developer_csqcentities)
-               printf("CSQC_Parse_StuffCmd(\"%s\")\n", strMessage);
-
-       localcmd(strMessage);
-}
-// CSQC_Parse_Print : Provides the print string in the first parameter that the server provided.  To execute standard behavior, simply execute print with the string.
-void CSQC_Parse_Print(string strMessage)
-{
-       if(autocvar_developer_csqcentities)
-               printf("CSQC_Parse_Print(\"%s\")\n", strMessage);
-
-       print(ColorTranslateRGB(strMessage));
-}
-
-// CSQC_Parse_CenterPrint : Provides the centerprint_hud string in the first parameter that the server provided.
-void CSQC_Parse_CenterPrint(string strMessage)
-{
-       if(autocvar_developer_csqcentities)
-               printf("CSQC_Parse_CenterPrint(\"%s\")\n", strMessage);
-
-       centerprint_hud(strMessage);
-}
-
-string notranslate_fogcmd1 = "\nfog ";
-string notranslate_fogcmd2 = "\nr_fog_exp2 0\nr_drawfog 1\n";
-void Fog_Force()
-{
-       // TODO somehow thwart prvm_globalset client ...
-
-       if(autocvar_cl_orthoview && autocvar_cl_orthoview_nofog)
-               { localcmd("\nr_drawfog 0\n"); }
-       else if(forcefog != "")
-               { localcmd(strcat(notranslate_fogcmd1, forcefog, notranslate_fogcmd2)); }
-}
-
-void Gamemode_Init();
-void Ent_ScoresInfo()
-{
-       float i;
-       self.classname = "ent_client_scores_info";
-       gametype = ReadInt24_t();
-       HUD_ModIcons_SetFunc();
-       for(i = 0; i < MAX_SCORE; ++i)
-       {
-               if(scores_label[i])
-                       strunzone(scores_label[i]);
-               scores_label[i] = strzone(ReadString());
-               scores_flags[i] = ReadByte();
-       }
-       for(i = 0; i < MAX_TEAMSCORE; ++i)
-       {
-               if(teamscores_label[i])
-                       strunzone(teamscores_label[i]);
-               teamscores_label[i] = strzone(ReadString());
-               teamscores_flags[i] = ReadByte();
-       }
-       HUD_InitScores();
-       Gamemode_Init();
-}
-
-void Ent_Init()
-{
-       self.classname = "ent_client_init";
-
-       nb_pb_period = ReadByte() / 32; //Accuracy of 1/32th
-
-       hook_shotorigin[0] = decompressShotOrigin(ReadInt24_t());
-       hook_shotorigin[1] = decompressShotOrigin(ReadInt24_t());
-       hook_shotorigin[2] = decompressShotOrigin(ReadInt24_t());
-       hook_shotorigin[3] = decompressShotOrigin(ReadInt24_t());
-       arc_shotorigin[0] = decompressShotOrigin(ReadInt24_t());
-       arc_shotorigin[1] = decompressShotOrigin(ReadInt24_t());
-       arc_shotorigin[2] = decompressShotOrigin(ReadInt24_t());
-       arc_shotorigin[3] = decompressShotOrigin(ReadInt24_t());
-
-       if(forcefog)
-               strunzone(forcefog);
-       forcefog = strzone(ReadString());
-
-       armorblockpercent = ReadByte() / 255.0;
-
-       g_balance_mortar_bouncefactor = ReadCoord();
-       g_balance_mortar_bouncestop = ReadCoord();
-       g_balance_electro_secondary_bouncefactor = ReadCoord();
-       g_balance_electro_secondary_bouncestop = ReadCoord();
-
-       vortex_scope = !ReadByte();
-       rifle_scope = !ReadByte();
-
-       serverflags = ReadByte();
-
-       minelayer_maxmines = ReadByte();
-
-       hagar_maxrockets = ReadByte();
-
-       g_trueaim_minrange = ReadCoord();
-       g_balance_porto_secondary = ReadByte();
-
-       if(!postinit)
-               PostInit();
-}
-
-void Net_ReadRace()
-{
-       float b;
-
-       b = ReadByte();
-
-       switch(b)
-       {
-               case RACE_NET_CHECKPOINT_HIT_QUALIFYING:
-                       race_checkpoint = ReadByte();
-                       race_time = ReadInt24_t();
-                       race_previousbesttime = ReadInt24_t();
-                       if(race_previousbestname)
-                               strunzone(race_previousbestname);
-                       race_previousbestname = strzone(ColorTranslateRGB(ReadString()));
-
-                       race_checkpointtime = time;
-
-                       if(race_checkpoint == 0 || race_checkpoint == 254)
-                       {
-                               race_penaltyaccumulator = 0;
-                               race_laptime = time; // valid
-                       }
-
-                       break;
-
-               case RACE_NET_CHECKPOINT_CLEAR:
-                       race_laptime = 0;
-                       race_checkpointtime = 0;
-                       break;
-
-               case RACE_NET_CHECKPOINT_NEXT_SPEC_QUALIFYING:
-                       race_laptime = ReadCoord();
-                       race_checkpointtime = -99999;
-                       // fall through
-               case RACE_NET_CHECKPOINT_NEXT_QUALIFYING:
-                       race_nextcheckpoint = ReadByte();
-
-                       race_nextbesttime = ReadInt24_t();
-                       if(race_nextbestname)
-                               strunzone(race_nextbestname);
-                       race_nextbestname = strzone(ColorTranslateRGB(ReadString()));
-                       break;
-
-               case RACE_NET_CHECKPOINT_HIT_RACE:
-                       race_mycheckpoint = ReadByte();
-                       race_mycheckpointtime = time;
-                       race_mycheckpointdelta = ReadInt24_t();
-                       race_mycheckpointlapsdelta = ReadByte();
-                       if(race_mycheckpointlapsdelta >= 128)
-                               race_mycheckpointlapsdelta -= 256;
-                       if(race_mycheckpointenemy)
-                               strunzone(race_mycheckpointenemy);
-                       race_mycheckpointenemy = strzone(ColorTranslateRGB(ReadString()));
-                       break;
-
-               case RACE_NET_CHECKPOINT_HIT_RACE_BY_OPPONENT:
-                       race_othercheckpoint = ReadByte();
-                       race_othercheckpointtime = time;
-                       race_othercheckpointdelta = ReadInt24_t();
-                       race_othercheckpointlapsdelta = ReadByte();
-                       if(race_othercheckpointlapsdelta >= 128)
-                               race_othercheckpointlapsdelta -= 256;
-                       if(race_othercheckpointenemy)
-                               strunzone(race_othercheckpointenemy);
-                       race_othercheckpointenemy = strzone(ColorTranslateRGB(ReadString()));
-                       break;
-
-               case RACE_NET_PENALTY_RACE:
-                       race_penaltyeventtime = time;
-                       race_penaltytime = ReadShort();
-                       //race_penaltyaccumulator += race_penaltytime;
-                       if(race_penaltyreason)
-                               strunzone(race_penaltyreason);
-                       race_penaltyreason = strzone(ReadString());
-                       break;
-
-               case RACE_NET_PENALTY_QUALIFYING:
-                       race_penaltyeventtime = time;
-                       race_penaltytime = ReadShort();
-                       race_penaltyaccumulator += race_penaltytime;
-                       if(race_penaltyreason)
-                               strunzone(race_penaltyreason);
-                       race_penaltyreason = strzone(ReadString());
-                       break;
-
-               case RACE_NET_SERVER_RECORD:
-                       race_server_record = ReadInt24_t();
-                       break;
-               case RACE_NET_SPEED_AWARD:
-                       race_speedaward = ReadInt24_t();
-                       if(race_speedaward_holder)
-                               strunzone(race_speedaward_holder);
-                       race_speedaward_holder = strzone(ReadString());
-                       break;
-               case RACE_NET_SPEED_AWARD_BEST:
-                       race_speedaward_alltimebest = ReadInt24_t();
-                       if(race_speedaward_alltimebest_holder)
-                               strunzone(race_speedaward_alltimebest_holder);
-                       race_speedaward_alltimebest_holder = strzone(ReadString());
-                       break;
-               case RACE_NET_SERVER_RANKINGS:
-                       float pos, prevpos, del;
-                       pos = ReadShort();
-                       prevpos = ReadShort();
-                       del = ReadShort();
-
-                       // move other rankings out of the way
-                       float i;
-                       if (prevpos) {
-                               for (i=prevpos-1;i>pos-1;--i) {
-                                       grecordtime[i] = grecordtime[i-1];
-                                       if(grecordholder[i])
-                                               strunzone(grecordholder[i]);
-                                       grecordholder[i] = strzone(grecordholder[i-1]);
-                               }
-                       } else if (del) { // a record has been deleted by the admin
-                               for (i=pos-1; i<= RANKINGS_CNT-1; ++i) {
-                                       if (i == RANKINGS_CNT-1) { // clear out last record
-                                               grecordtime[i] = 0;
-                                               if (grecordholder[i])
-                                                       strunzone(grecordholder[i]);
-                                               grecordholder[i] = string_null;
-                                       }
-                                       else {
-                                               grecordtime[i] = grecordtime[i+1];
-                                               if (grecordholder[i])
-                                                       strunzone(grecordholder[i]);
-                                               grecordholder[i] = strzone(grecordholder[i+1]);
-                                       }
-                               }
-                       } else { // player has no ranked record yet
-                               for (i=RANKINGS_CNT-1;i>pos-1;--i) {
-                                       grecordtime[i] = grecordtime[i-1];
-                                       if(grecordholder[i])
-                                               strunzone(grecordholder[i]);
-                                       grecordholder[i] = strzone(grecordholder[i-1]);
-                               }
-                       }
-
-                       // store new ranking
-                       if(grecordholder[pos-1] != "")
-                               strunzone(grecordholder[pos-1]);
-                       grecordholder[pos-1] = strzone(ReadString());
-                       grecordtime[pos-1] = ReadInt24_t();
-                       if(grecordholder[pos-1] == GetPlayerName(player_localnum))
-                               race_myrank = pos;
-                       break;
-               case RACE_NET_SERVER_STATUS:
-                       race_status = ReadShort();
-                       if(race_status_name)
-                               strunzone(race_status_name);
-                       race_status_name = strzone(ReadString());
-       }
-}
-
-void Net_TeamNagger()
-{
-       teamnagger = 1;
-}
-
-void Net_ReadPingPLReport()
-{
-       float e, pi, pl, ml;
-       e = ReadByte();
-       pi = ReadShort();
-       pl = ReadByte();
-       ml = ReadByte();
-       if (!(playerslots[e]))
-               return;
-       playerslots[e].ping = pi;
-       playerslots[e].ping_packetloss = pl / 255.0;
-       playerslots[e].ping_movementloss = ml / 255.0;
-}
-
-void Net_WeaponComplain()
-{
-       complain_weapon = ReadByte();
-
-       if(complain_weapon_name)
-               strunzone(complain_weapon_name);
-       complain_weapon_name = strzone(WEP_NAME(complain_weapon));
-
-       complain_weapon_type = ReadByte();
-
-       complain_weapon_time = time;
-       weapontime = time; // ping the weapon panel
-
-       switch(complain_weapon_type)
-       {
-               case 0: Local_Notification(MSG_MULTI, ITEM_WEAPON_NOAMMO, complain_weapon); break;
-               case 1: Local_Notification(MSG_MULTI, ITEM_WEAPON_DONTHAVE, complain_weapon); break;
-               default: Local_Notification(MSG_MULTI, ITEM_WEAPON_UNAVAILABLE, complain_weapon); break;
-       }
-}
-
-// 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.
-float CSQC_Parse_TempEntity()
-{
-       float bHandled;
-               bHandled  = true;
-       // Acquire TE ID
-       float nTEID;
-               nTEID = ReadByte();
-
-       if(autocvar_developer_csqcentities)
-               printf("CSQC_Parse_TempEntity() with nTEID=%d\n", nTEID);
-
-               // NOTE: Could just do return instead of break...
-       switch(nTEID)
-       {
-               case TE_CSQC_TARGET_MUSIC:
-                       Net_TargetMusic();
-                       bHandled = true;
-                       break;
-               case TE_CSQC_PICTURE:
-                       Net_MapVote_Picture();
-                       bHandled = true;
-                       break;
-               case TE_CSQC_RACE:
-                       Net_ReadRace();
-                       bHandled = true;
-                       break;
-               case TE_CSQC_VORTEXBEAMPARTICLE:
-                       Net_ReadVortexBeamParticle();
-                       bHandled = true;
-                       break;
-               case TE_CSQC_TEAMNAGGER:
-                       Net_TeamNagger();
-                       bHandled = true;
-                       break;
-               case TE_CSQC_ARC:
-                       Net_ReadArc();
-                       bHandled = true;
-                       break;
-               case TE_CSQC_PINGPLREPORT:
-                       Net_ReadPingPLReport();
-                       bHandled = true;
-                       break;
-               case TE_CSQC_WEAPONCOMPLAIN:
-                       Net_WeaponComplain();
-                       bHandled = true;
-                       break;
-               case TE_CSQC_VEHICLESETUP:
-                       Net_VehicleSetup();
-                       bHandled = true;
-                       break;
-               case TE_CSQC_SVNOTICE:
-                       cl_notice_read();
-                       bHandled = true;
-                       break;
-               case TE_CSQC_SHOCKWAVEPARTICLE:
-                       Net_ReadShockwaveParticle();
-                       bHandled = true;
-                       break;
-               default:
-                       // No special logic for this temporary entity; return 0 so the engine can handle it
-                       bHandled = false;
-                       break;
-       }
-
-       return bHandled;
-}
-
-string getcommandkey(string text, string command)
-{
-       string keys;
-       float n, j, k, l = 0;
-
-       if (!autocvar_hud_showbinds)
-               return text;
-
-       keys = db_get(binddb, command);
-       if (keys == "")
-       {
-               n = tokenize(findkeysforcommand(command, 0)); // uses '...' strings
-               for(j = 0; j < n; ++j)
-               {
-                       k = stof(argv(j));
-                       if(k != -1)
-                       {
-                               if ("" == keys)
-                                       keys = keynumtostring(k);
-                               else
-                                       keys = strcat(keys, ", ", keynumtostring(k));
-
-                               ++l;
-                               if (autocvar_hud_showbinds_limit > 0 && autocvar_hud_showbinds_limit <= l)
-                                       break;
-                       }
-
-               }
-               if (keys == "")
-                       keys = "NO_KEY";
-               db_put(binddb, command, keys);
-       }
-
-       if (keys == "NO_KEY") {
-               if (autocvar_hud_showbinds > 1)
-                       return sprintf(_("%s (not bound)"), text);
-               else
-                       return text;
-       }
-       else if (autocvar_hud_showbinds > 1)
-               return sprintf("%s (%s)", text, keys);
-       else
-               return keys;
-}
diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
deleted file mode 100644 (file)
index 310b47d..0000000
+++ /dev/null
@@ -1,1928 +0,0 @@
-entity porto;
-vector polyline[16];
-void Porto_Draw()
-{
-       vector p, dir, ang, q, nextdir;
-       float idx, portal_number, portal1_idx;
-
-       if(activeweapon != WEP_PORTO || spectatee_status || gametype == MAPINFO_TYPE_NEXBALL)
-               return;
-       if(g_balance_porto_secondary)
-               return;
-       if(intermission == 1)
-               return;
-       if(intermission == 2)
-               return;
-       if (getstati(STAT_HEALTH) <= 0)
-               return;
-
-       dir = view_forward;
-
-       if(angles_held_status)
-       {
-               makevectors(angles_held);
-               dir = v_forward;
-       }
-
-       p = view_origin;
-
-       polyline[0] = p;
-       idx = 1;
-       portal_number = 0;
-       nextdir = dir;
-
-       for(;;)
-       {
-               dir = nextdir;
-               traceline(p, p + 65536 * dir, TRUE, porto);
-               if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)
-                       return;
-               nextdir = dir - 2 * (dir * trace_plane_normal) * trace_plane_normal; // mirror dir at trace_plane_normal
-               p = trace_endpos;
-               polyline[idx] = p;
-               ++idx;
-               if(idx >= 16)
-                       return;
-               if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_SLICK || trace_dphitcontents & DPCONTENTS_PLAYERCLIP)
-                       continue;
-               ++portal_number;
-               ang = vectoangles2(trace_plane_normal, dir);
-               ang_x = -ang_x;
-               makevectors(ang);
-               if(!CheckWireframeBox(porto, p - 48 * v_right - 48 * v_up + 16 * v_forward, 96 * v_right, 96 * v_up, 96 * v_forward))
-                       return;
-               if(portal_number == 1)
-               {
-                       portal1_idx = idx;
-                       if(portal_number >= 2)
-                               break;
-               }
-       }
-
-       while(idx >= 2)
-       {
-               p = polyline[idx-2];
-               q = polyline[idx-1];
-               if(idx == 2)
-                       p = p - view_up * 16;
-               if(idx-1 >= portal1_idx)
-               {
-                       Draw_CylindricLine(p, q, 4, "", 1, 0, '0 0 1', 0.5, DRAWFLAG_NORMAL, view_origin);
-               }
-               else
-               {
-                       Draw_CylindricLine(p, q, 4, "", 1, 0, '1 0 0', 0.5, DRAWFLAG_NORMAL, view_origin);
-               }
-               --idx;
-       }
-}
-
-void Porto_Init()
-{
-       porto = spawn();
-       porto.classname = "porto";
-       porto.draw = Porto_Draw;
-       porto.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_PLAYERCLIP;
-}
-
-float drawtime;
-float avgspeed;
-vector GetCurrentFov(float fov)
-{
-       float zoomsensitivity, zoomspeed, zoomfactor, zoomdir;
-       float velocityzoom, curspeed;
-       vector v;
-
-       zoomsensitivity = autocvar_cl_zoomsensitivity;
-       zoomfactor = autocvar_cl_zoomfactor;
-       if(zoomfactor < 1 || zoomfactor > 16)
-               zoomfactor = 2.5;
-       zoomspeed = autocvar_cl_zoomspeed;
-       if(zoomspeed >= 0)
-       if(zoomspeed < 0.5 || zoomspeed > 16)
-                       zoomspeed = 3.5;
-
-       zoomdir = button_zoom;
-       if(hud == HUD_NORMAL)
-       if((activeweapon == WEP_VORTEX && vortex_scope) || (activeweapon == WEP_RIFLE && rifle_scope)) // do NOT use switchweapon here
-               zoomdir += button_attack2;
-       if(spectatee_status > 0 || isdemo())
-       {
-               if(spectatorbutton_zoom)
-               {
-                       if(zoomdir)
-                               zoomdir = 0;
-                       else
-                               zoomdir = 1;
-               }
-               // fteqcc failed twice here already, don't optimize this
-       }
-
-       if(zoomdir) { zoomin_effect = 0; }
-
-       if(camera_active)
-       {
-               current_viewzoom = min(1, current_viewzoom + drawframetime);
-       }
-       else if(autocvar_cl_spawnzoom && zoomin_effect)
-       {
-               float spawnzoomfactor = bound(1, autocvar_cl_spawnzoom_factor, 16);
-
-               current_viewzoom += (autocvar_cl_spawnzoom_speed * (spawnzoomfactor - current_viewzoom) * drawframetime);
-               current_viewzoom = bound(1 / spawnzoomfactor, current_viewzoom, 1);
-               if(current_viewzoom == 1) { zoomin_effect = 0; }
-       }
-       else
-       {
-               if(zoomspeed < 0) // instant zoom
-               {
-                       if(zoomdir)
-                               current_viewzoom = 1 / zoomfactor;
-                       else
-                               current_viewzoom = 1;
-               }
-               else
-               {
-                       if(zoomdir)
-                               current_viewzoom = 1 / bound(1, 1 / current_viewzoom + drawframetime * zoomspeed * (zoomfactor - 1), zoomfactor);
-                       else
-                               current_viewzoom = bound(1 / zoomfactor, current_viewzoom + drawframetime * zoomspeed * (1 - 1 / zoomfactor), 1);
-               }
-       }
-
-       if(almost_equals(current_viewzoom, 1))
-               current_zoomfraction = 0;
-       else if(almost_equals(current_viewzoom, 1/zoomfactor))
-               current_zoomfraction = 1;
-       else
-               current_zoomfraction = (current_viewzoom - 1) / (1/zoomfactor - 1);
-
-       if(zoomsensitivity < 1)
-               setsensitivityscale(pow(current_viewzoom, 1 - zoomsensitivity));
-       else
-               setsensitivityscale(1);
-
-       if(autocvar_cl_velocityzoom_enabled && autocvar_cl_velocityzoom_type) // _type = 0 disables velocity zoom too
-       {
-               if(intermission) { curspeed = 0; }
-               else
-               {
-
-                       makevectors(view_angles);
-                       v = pmove_vel;
-                       if(csqcplayer)
-                               v = csqcplayer.velocity;
-
-                       switch(autocvar_cl_velocityzoom_type)
-                       {
-                               case 3: curspeed = max(0, v_forward * v); break;
-                               case 2: curspeed = (v_forward * v); break;
-                               case 1: default: curspeed = vlen(v); break;
-                       }
-               }
-
-               velocityzoom = bound(0, drawframetime / max(0.000000001, autocvar_cl_velocityzoom_time), 1); // speed at which the zoom adapts to player velocity
-               avgspeed = avgspeed * (1 - velocityzoom) + (curspeed / autocvar_cl_velocityzoom_speed) * velocityzoom;
-               velocityzoom = exp(float2range11(avgspeed * -autocvar_cl_velocityzoom_factor / 1) * 1);
-
-               //print(ftos(avgspeed), " avgspeed, ", ftos(curspeed), " curspeed, ", ftos(velocityzoom), " return\n"); // for debugging
-       }
-       else
-               velocityzoom = 1;
-
-       float frustumx, frustumy, fovx, fovy;
-       frustumy = tan(fov * M_PI / 360.0) * 0.75 * current_viewzoom * velocityzoom;
-       frustumx = frustumy * vid_width / vid_height / vid_pixelheight;
-       fovx = atan2(frustumx, 1) / M_PI * 360.0;
-       fovy = atan2(frustumy, 1) / M_PI * 360.0;
-
-       return '1 0 0' * fovx + '0 1 0' * fovy;
-}
-
-vector GetOrthoviewFOV(vector ov_worldmin, vector ov_worldmax, vector ov_mid, vector ov_org)
-{
-       float fovx, fovy;
-       float width = (ov_worldmax_x - ov_worldmin_x);
-       float height = (ov_worldmax_y - ov_worldmin_y);
-       float distance_to_middle_of_world = vlen(ov_mid - ov_org);
-       fovx = atan2(width/2, distance_to_middle_of_world) / M_PI * 360.0;
-       fovy = atan2(height/2, distance_to_middle_of_world) / M_PI * 360.0;
-       return '1 0 0' * fovx + '0 1 0' * fovy;
-}
-
-// this function must match W_SetupShot!
-float zoomscript_caught;
-
-vector wcross_origin;
-float wcross_scale_prev, wcross_alpha_prev;
-vector wcross_color_prev;
-float wcross_scale_goal_prev, wcross_alpha_goal_prev;
-vector wcross_color_goal_prev;
-float wcross_changedonetime;
-
-string wcross_name_goal_prev, wcross_name_goal_prev_prev;
-float wcross_resolution_goal_prev, wcross_resolution_goal_prev_prev;
-float wcross_name_changestarttime, wcross_name_changedonetime;
-float wcross_name_alpha_goal_prev, wcross_name_alpha_goal_prev_prev;
-
-float wcross_ring_prev;
-
-entity trueaim;
-entity trueaim_rifle;
-
-#define SHOTTYPE_HITTEAM 1
-#define SHOTTYPE_HITOBSTRUCTION 2
-#define SHOTTYPE_HITWORLD 3
-#define SHOTTYPE_HITENEMY 4
-
-void TrueAim_Init()
-{
-       trueaim = spawn();
-       trueaim.classname = "trueaim";
-       trueaim.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE;
-       trueaim_rifle = spawn();
-       trueaim_rifle.classname = "trueaim_rifle";
-       trueaim_rifle.dphitcontentsmask = DPCONTENTS_BODY | DPCONTENTS_CORPSE;
-}
-
-float EnemyHitCheck()
-{
-       float t, n;
-       wcross_origin = project_3d_to_2d(trace_endpos);
-       wcross_origin_z = 0;
-       if(trace_ent)
-               n = trace_ent.entnum;
-       else
-               n = trace_networkentity;
-       if(n < 1)
-               return SHOTTYPE_HITWORLD;
-       if(n > maxclients)
-               return SHOTTYPE_HITWORLD;
-       t = GetPlayerColor(n - 1);
-       if(teamplay)
-               if(t == myteam)
-                       return SHOTTYPE_HITTEAM;
-       if(t == NUM_SPECTATOR)
-               return SHOTTYPE_HITWORLD;
-       return SHOTTYPE_HITENEMY;
-}
-
-float TrueAimCheck()
-{
-       float nudge = 1; // added to traceline target and subtracted from result TOOD(divVerent): do we still need this? Doesn't the engine do this now for us?
-       vector vecs, trueaimpoint, w_shotorg;
-       vector mi, ma, dv;
-       float shottype;
-       entity ta;
-       float mv;
-
-       mi = ma = '0 0 0';
-       ta = trueaim;
-       mv = MOVE_NOMONSTERS;
-
-       switch(activeweapon) // WEAPONTODO
-       {
-               case WEP_TUBA: // no aim
-               case WEP_PORTO: // shoots from eye
-               case WEP_HOOK: // no trueaim
-               case WEP_MORTAR: // toss curve
-                       return SHOTTYPE_HITWORLD;
-               case WEP_VORTEX:
-               case WEP_VAPORIZER:
-                       mv = MOVE_NORMAL;
-                       break;
-               case WEP_RIFLE:
-                       ta = trueaim_rifle;
-                       mv = MOVE_NORMAL;
-                       if(zoomscript_caught)
-                       {
-                               tracebox(view_origin, '0 0 0', '0 0 0', view_origin + view_forward * MAX_SHOT_DISTANCE, mv, ta);
-                               return EnemyHitCheck();
-                       }
-                       break;
-               case WEP_DEVASTATOR: // projectile has a size!
-                       mi = '-3 -3 -3';
-                       ma = '3 3 3';
-                       break;
-               case WEP_FIREBALL: // projectile has a size!
-                       mi = '-16 -16 -16';
-                       ma = '16 16 16';
-                       break;
-               case WEP_SEEKER: // projectile has a size!
-                       mi = '-2 -2 -2';
-                       ma = '2 2 2';
-                       break;
-               case WEP_ELECTRO: // projectile has a size!
-                       mi = '0 0 -3';
-                       ma = '0 0 -3';
-                       break;
-       }
-
-       vector traceorigin = getplayerorigin(player_localentnum-1) + (eZ * getstati(STAT_VIEWHEIGHT));
-
-       vecs = decompressShotOrigin(getstati(STAT_SHOTORG));
-
-       traceline(traceorigin, traceorigin + view_forward * MAX_SHOT_DISTANCE, mv, ta);
-       trueaimpoint = trace_endpos;
-
-       if(vlen(trueaimpoint - traceorigin) < g_trueaim_minrange)
-               trueaimpoint = traceorigin + view_forward * g_trueaim_minrange;
-
-       if(vecs_x > 0)
-               vecs_y = -vecs_y;
-       else
-               vecs = '0 0 0';
-
-       dv = view_right * vecs_y + view_up * vecs_z;
-       w_shotorg = traceorigin + dv;
-
-       // now move the vecs forward as much as requested if possible
-       tracebox(w_shotorg, mi, ma, w_shotorg + view_forward * (vecs_x + nudge), MOVE_NORMAL, ta); // FIXME this MOVE_NORMAL part will misbehave a little in csqc
-       w_shotorg = trace_endpos - view_forward * nudge;
-
-       tracebox(w_shotorg, mi, ma, trueaimpoint, MOVE_NORMAL, ta);
-       shottype = EnemyHitCheck();
-       if(shottype != SHOTTYPE_HITWORLD)
-               return shottype;
-
-#if 0
-       // FIXME WHY DOES THIS NOT WORK FOR THE ROCKET LAUNCHER?
-       // or rather, I know why, but see no fix
-       if(vlen(trace_endpos - trueaimpoint) > vlen(ma) + vlen(mi) + 1)
-               // yes, this is an ugly hack... but it seems good enough to find out whether the test hits the same place as the initial trace
-               return SHOTTYPE_HITOBSTRUCTION;
-#endif
-
-       return SHOTTYPE_HITWORLD;
-}
-
-void CSQC_common_hud(void);
-
-void PostInit(void);
-void CSQC_Demo_Camera();
-float HUD_WouldDrawScoreboard();
-float camera_mode;
-const float CAMERA_FREE = 1;
-const float CAMERA_CHASE = 2;
-float reticle_type;
-string reticle_image;
-string NextFrameCommand;
-void CSQC_SPIDER_HUD();
-void CSQC_RAPTOR_HUD();
-
-vector freeze_org, freeze_ang;
-entity nightvision_noise, nightvision_noise2;
-
-#define MAX_TIME_DIFF 5
-float pickup_crosshair_time, pickup_crosshair_size;
-float hitindication_crosshair_size;
-float use_vortex_chargepool;
-
-float myhealth, myhealth_prev;
-float myhealth_flash;
-
-float old_blurradius, old_bluralpha;
-float old_sharpen_intensity;
-
-vector myhealth_gentlergb;
-
-float contentavgalpha, liquidalpha_prev;
-vector liquidcolor_prev;
-
-float eventchase_current_distance;
-float eventchase_running;
-float WantEventchase()
-{
-       if(autocvar_cl_orthoview)
-               return FALSE;
-       if(intermission)
-               return TRUE;
-       if(spectatee_status >= 0)
-       {
-               if(autocvar_cl_eventchase_nexball && gametype == MAPINFO_TYPE_NEXBALL && !(WepSet_GetFromStat() & WepSet_FromWeapon(WEP_PORTO)))
-                       return TRUE;
-               if(autocvar_cl_eventchase_death && (getstati(STAT_HEALTH) <= 0))
-               {
-                       if(autocvar_cl_eventchase_death == 2)
-                       {
-                               // don't stop eventchase once it's started (even if velocity changes afterwards)
-                               if(self.velocity == '0 0 0' || eventchase_running)
-                                       return TRUE;
-                       }
-                       else return TRUE;
-               }
-       }
-       return FALSE;
-}
-
-vector damage_blurpostprocess, content_blurpostprocess;
-
-float checkfail[16];
-
-float unaccounted_damage = 0;
-void UpdateDamage()
-{
-       // accumulate damage with each stat update
-       static float damage_total_prev = 0;
-       float damage_total = getstati(STAT_DAMAGE_DEALT_TOTAL);
-       float unaccounted_damage_new = COMPARE_INCREASING(damage_total, damage_total_prev);
-       damage_total_prev = damage_total;
-
-       static float damage_dealt_time_prev = 0;
-       float damage_dealt_time = getstatf(STAT_HIT_TIME);
-       if (damage_dealt_time != damage_dealt_time_prev)
-       {
-               unaccounted_damage += unaccounted_damage_new;
-               dprint("dmg total: ", ftos(unaccounted_damage), " (+", ftos(unaccounted_damage_new), ")", "\n");
-       }
-       damage_dealt_time_prev = damage_dealt_time;
-
-       // prevent hitsound when switching spectatee
-       static float spectatee_status_prev = 0;
-       if (spectatee_status != spectatee_status_prev)
-               unaccounted_damage = 0;
-       spectatee_status_prev = spectatee_status;
-}
-
-void UpdateHitsound()
-{
-       // varying sound pitch
-
-       static float hitsound_time_prev = 0;
-       // HACK: the only way to get the arc to sound consistent with pitch shift is to ignore cl_hitsound_antispam_time
-       float arc_hack = activeweapon == WEP_ARC && autocvar_cl_hitsound >= 2;
-       if (arc_hack || COMPARE_INCREASING(time, hitsound_time_prev) > autocvar_cl_hitsound_antispam_time)
-       {
-               if (autocvar_cl_hitsound && unaccounted_damage)
-               {
-                       // customizable gradient function that crosses (0,a), (c,1) and asymptotically approaches b
-                       float a = autocvar_cl_hitsound_max_pitch;
-                       float b = autocvar_cl_hitsound_min_pitch;
-                       float c = autocvar_cl_hitsound_nom_damage;
-                       float x = unaccounted_damage;
-                       float pitch_shift = (b*x*(a-1) + a*c*(1-b)) / (x*(a-1) + c*(1-b));
-
-                       // if sound variation is disabled, set pitch_shift to 1
-                       if (autocvar_cl_hitsound == 1)
-                               pitch_shift = 1;
-
-                       // if pitch shift is reversed, mirror in (max-min)/2 + min
-                       if (autocvar_cl_hitsound == 3)
-                       {
-                               float mirror_value = (a-b)/2 + b;
-                               pitch_shift = mirror_value + (mirror_value - pitch_shift);
-                       }
-
-                       dprint("dmg total (dmg): ", ftos(unaccounted_damage), " , pitch shift: ", ftos(pitch_shift), "\n");
-
-                       // todo: avoid very long and very short sounds from wave stretching using different sound files? seems unnecessary
-                       // todo: normalize sound pressure levels? seems unnecessary
-
-                       sound7(world, CH_INFO, "misc/hit.wav", VOL_BASE, ATTN_NONE, pitch_shift * 100, 0);
-               }
-               unaccounted_damage = 0;
-               hitsound_time_prev = time;
-       }
-
-       static float typehit_time_prev = 0;
-       float typehit_time = getstatf(STAT_TYPEHIT_TIME);
-       if (COMPARE_INCREASING(typehit_time, typehit_time_prev) > autocvar_cl_hitsound_antispam_time)
-       {
-               sound(world, CH_INFO, "misc/typehit.wav", VOL_BASE, ATTN_NONE);
-               typehit_time_prev = typehit_time;
-       }
-}
-
-void UpdateCrosshair()
-{
-       static float rainbow_last_flicker;
-    static vector rainbow_prev_color;
-       entity e = self;
-       float f, i, j;
-       vector v;
-       if(getstati(STAT_FROZEN))
-               drawfill('0 0 0', eX * vid_conwidth + eY * vid_conheight, ((getstatf(STAT_REVIVE_PROGRESS)) ? ('0.25 0.90 1' + ('1 0 0' * getstatf(STAT_REVIVE_PROGRESS)) + ('0 1 1' * getstatf(STAT_REVIVE_PROGRESS) * -1)) : '0.25 0.90 1'), autocvar_hud_colorflash_alpha, DRAWFLAG_ADDITIVE);
-       else if (getstatf(STAT_HEALING_ORB)>time)
-               drawfill('0 0 0', eX * vid_conwidth + eY * vid_conheight, Nade_Color(NADE_TYPE_HEAL), autocvar_hud_colorflash_alpha*getstatf(STAT_HEALING_ORB_ALPHA), DRAWFLAG_ADDITIVE);
-       if(!intermission)
-       if(getstatf(STAT_NADE_TIMER) && autocvar_cl_nade_timer) // give nade top priority, as it's a matter of life and death
-       {
-               DrawCircleClippedPic(eX * 0.5 * vid_conwidth + eY * 0.6 * vid_conheight, 0.1 * vid_conheight, "gfx/crosshair_ring.tga", getstatf(STAT_NADE_TIMER), '0.25 0.90 1' + ('1 0 0' * getstatf(STAT_NADE_TIMER)) - ('0 1 1' * getstatf(STAT_NADE_TIMER)), autocvar_hud_colorflash_alpha, DRAWFLAG_ADDITIVE);
-               drawstring_aspect(eY * 0.64 * vid_conheight, ((autocvar_cl_nade_timer == 2) ? _("Nade timer") : ""), eX * vid_conwidth + eY * 0.025 * vid_conheight, '1 1 1', 1, DRAWFLAG_NORMAL);
-       }
-       else if(getstatf(STAT_REVIVE_PROGRESS))
-       {
-               DrawCircleClippedPic(eX * 0.5 * vid_conwidth + eY * 0.6 * vid_conheight, 0.1 * vid_conheight, "gfx/crosshair_ring.tga", getstatf(STAT_REVIVE_PROGRESS), '0.25 0.90 1', autocvar_hud_colorflash_alpha, DRAWFLAG_ADDITIVE);
-               drawstring_aspect(eY * 0.64 * vid_conheight, _("Revival progress"), eX * vid_conwidth + eY * 0.025 * vid_conheight, '1 1 1', 1, DRAWFLAG_NORMAL);
-       }
-
-       if(autocvar_r_letterbox == 0)
-               if(autocvar_viewsize < 120)
-                       CSQC_common_hud();
-
-       // crosshair goes VERY LAST
-       if(!scoreboard_active && !camera_active && intermission != 2 && spectatee_status != -1 && hud == HUD_NORMAL)
-       {
-               if (!autocvar_crosshair_enabled) // main toggle for crosshair rendering
-                       return;
-
-               string wcross_style;
-               float wcross_alpha, wcross_resolution;
-               wcross_style = autocvar_crosshair;
-               if (wcross_style == "0")
-                       return;
-               wcross_resolution = autocvar_crosshair_size;
-               if (wcross_resolution == 0)
-                       return;
-               wcross_alpha = autocvar_crosshair_alpha;
-               if (wcross_alpha == 0)
-                       return;
-
-               // TrueAim check
-               float shottype;
-
-               // wcross_origin = '0.5 0 0' * vid_conwidth + '0 0.5 0' * vid_conheight;
-               wcross_origin = project_3d_to_2d(view_origin + MAX_SHOT_DISTANCE * view_forward);
-               wcross_origin_z = 0;
-               if(autocvar_crosshair_hittest)
-               {
-                       vector wcross_oldorigin;
-                       wcross_oldorigin = wcross_origin;
-                       shottype = TrueAimCheck();
-                       if(shottype == SHOTTYPE_HITWORLD)
-                       {
-                               v = wcross_origin - wcross_oldorigin;
-                               v_x /= vid_conwidth;
-                               v_y /= vid_conheight;
-                               if(vlen(v) > 0.01)
-                                       shottype = SHOTTYPE_HITOBSTRUCTION;
-                       }
-                       if(!autocvar_crosshair_hittest_showimpact)
-                               wcross_origin = wcross_oldorigin;
-               }
-               else
-                       shottype = SHOTTYPE_HITWORLD;
-
-               vector wcross_color = '0 0 0', wcross_size = '0 0 0';
-               string wcross_name = "";
-               float wcross_scale, wcross_blur;
-
-               if(autocvar_crosshair_per_weapon || (autocvar_crosshair_color_special == 1))
-               {
-                       e = get_weaponinfo(switchingweapon);
-                       if(e)
-                       {
-                               if(autocvar_crosshair_per_weapon)
-                               {
-                                       // WEAPONTODO: access these through some general settings (with non-balance config settings)
-                                       //wcross_resolution *= cvar(strcat("crosshair_", wcross_wep, "_size"));
-                                       //if (wcross_resolution == 0)
-                                               //return;
-
-                                       //wcross_style = cvar_string(strcat("crosshair_", wcross_wep));
-                                       wcross_resolution *= e.w_crosshair_size;
-                                       wcross_name = e.w_crosshair;
-                               }
-                       }
-               }
-
-               if(wcross_name == "")
-                       wcross_name = strcat("gfx/crosshair", wcross_style);
-
-               // MAIN CROSSHAIR COLOR DECISION
-               switch(autocvar_crosshair_color_special)
-               {
-                       case 1: // crosshair_color_per_weapon
-                       {
-                               if(e)
-                               {
-                                       wcross_color = e.wpcolor;
-                                       break;
-                               }
-                               else { goto normalcolor; }
-                       }
-
-                       case 2: // crosshair_color_by_health
-                       {
-                               float x = getstati(STAT_HEALTH);
-
-                               //x = red
-                               //y = green
-                               //z = blue
-
-                               wcross_color_z = 0;
-
-                               if(x > 200)
-                               {
-                                       wcross_color_x = 0;
-                                       wcross_color_y = 1;
-                               }
-                               else if(x > 150)
-                               {
-                                       wcross_color_x = 0.4 - (x-150)*0.02 * 0.4;
-                                       wcross_color_y = 0.9 + (x-150)*0.02 * 0.1;
-                               }
-                               else if(x > 100)
-                               {
-                                       wcross_color_x = 1 - (x-100)*0.02 * 0.6;
-                                       wcross_color_y = 1 - (x-100)*0.02 * 0.1;
-                                       wcross_color_z = 1 - (x-100)*0.02;
-                               }
-                               else if(x > 50)
-                               {
-                                       wcross_color_x = 1;
-                                       wcross_color_y = 1;
-                                       wcross_color_z = 0.2 + (x-50)*0.02 * 0.8;
-                               }
-                               else if(x > 20)
-                               {
-                                       wcross_color_x = 1;
-                                       wcross_color_y = (x-20)*90/27/100;
-                                       wcross_color_z = (x-20)*90/27/100 * 0.2;
-                               }
-                               else
-                               {
-                                       wcross_color_x = 1;
-                                       wcross_color_y = 0;
-                               }
-                               break;
-                       }
-
-                       case 3: // crosshair_color_rainbow
-                       {
-                               if(time >= rainbow_last_flicker)
-                               {
-                                       rainbow_prev_color = randomvec() * autocvar_crosshair_color_special_rainbow_brightness;
-                                       rainbow_last_flicker = time + autocvar_crosshair_color_special_rainbow_delay;
-                               }
-                               wcross_color = rainbow_prev_color;
-                               break;
-                       }
-                       :normalcolor
-                       default: { wcross_color = stov(autocvar_crosshair_color); break; }
-               }
-
-               if(autocvar_crosshair_effect_scalefade)
-               {
-                       wcross_scale = wcross_resolution;
-                       wcross_resolution = 1;
-               }
-               else
-               {
-                       wcross_scale = 1;
-               }
-
-               if(autocvar_crosshair_pickup)
-               {
-                       float stat_pickup_time = getstatf(STAT_LAST_PICKUP);
-
-                       if(pickup_crosshair_time < stat_pickup_time)
-                       {
-                               if(time - stat_pickup_time < MAX_TIME_DIFF) // don't trigger the animation if it's too old
-                                       pickup_crosshair_size = 1;
-
-                               pickup_crosshair_time = stat_pickup_time;
-                       }
-
-                       if(pickup_crosshair_size > 0)
-                               pickup_crosshair_size -= autocvar_crosshair_pickup_speed * frametime;
-                       else
-                               pickup_crosshair_size = 0;
-
-                       wcross_scale += sin(pickup_crosshair_size) * autocvar_crosshair_pickup;
-               }
-
-               // todo: make crosshair hit indication dependent on damage dealt
-               if(autocvar_crosshair_hitindication)
-               {
-                       vector hitindication_color = ((autocvar_crosshair_color_special == 1) ? stov(autocvar_crosshair_hitindication_per_weapon_color) : stov(autocvar_crosshair_hitindication_color));
-
-                       if(unaccounted_damage)
-                       {
-                               hitindication_crosshair_size = 1;
-                       }
-
-                       if(hitindication_crosshair_size > 0)
-                               hitindication_crosshair_size -= autocvar_crosshair_hitindication_speed * frametime;
-                       else
-                               hitindication_crosshair_size = 0;
-
-                       wcross_scale += sin(hitindication_crosshair_size) * autocvar_crosshair_hitindication;
-                       wcross_color_x += sin(hitindication_crosshair_size) * hitindication_color_x;
-                       wcross_color_y += sin(hitindication_crosshair_size) * hitindication_color_y;
-                       wcross_color_z += sin(hitindication_crosshair_size) * hitindication_color_z;
-               }
-
-               if(shottype == SHOTTYPE_HITENEMY)
-                       wcross_scale *= autocvar_crosshair_hittest; // is not queried if hittest is 0
-               if(shottype == SHOTTYPE_HITTEAM)
-                       wcross_scale /= autocvar_crosshair_hittest; // is not queried if hittest is 0
-
-               f = fabs(autocvar_crosshair_effect_time);
-               if(wcross_scale != wcross_scale_goal_prev || wcross_alpha != wcross_alpha_goal_prev || wcross_color != wcross_color_goal_prev)
-               {
-                       wcross_changedonetime = time + f;
-               }
-               if(wcross_name != wcross_name_goal_prev || wcross_resolution != wcross_resolution_goal_prev)
-               {
-                       wcross_name_changestarttime = time;
-                       wcross_name_changedonetime = time + f;
-                       if(wcross_name_goal_prev_prev)
-                               strunzone(wcross_name_goal_prev_prev);
-                       wcross_name_goal_prev_prev = wcross_name_goal_prev;
-                       wcross_name_goal_prev = strzone(wcross_name);
-                       wcross_name_alpha_goal_prev_prev = wcross_name_alpha_goal_prev;
-                       wcross_resolution_goal_prev_prev = wcross_resolution_goal_prev;
-                       wcross_resolution_goal_prev = wcross_resolution;
-               }
-
-               wcross_scale_goal_prev = wcross_scale;
-               wcross_alpha_goal_prev = wcross_alpha;
-               wcross_color_goal_prev = wcross_color;
-
-               if(shottype == SHOTTYPE_HITTEAM || (shottype == SHOTTYPE_HITOBSTRUCTION && autocvar_crosshair_hittest_blur && !autocvar_chase_active))
-               {
-                       wcross_blur = 1;
-                       wcross_alpha *= 0.75;
-               }
-               else
-                       wcross_blur = 0;
-               // *_prev is at time-frametime
-               // * is at wcross_changedonetime+f
-               // what do we have at time?
-               if(time < wcross_changedonetime)
-               {
-                       f = frametime / (wcross_changedonetime - time + frametime);
-                       wcross_scale = f * wcross_scale + (1 - f) * wcross_scale_prev;
-                       wcross_alpha = f * wcross_alpha + (1 - f) * wcross_alpha_prev;
-                       wcross_color = f * wcross_color + (1 - f) * wcross_color_prev;
-               }
-
-               wcross_scale_prev = wcross_scale;
-               wcross_alpha_prev = wcross_alpha;
-               wcross_color_prev = wcross_color;
-
-               wcross_scale *= 1 - autocvar__menu_alpha;
-               wcross_alpha *= 1 - autocvar__menu_alpha;
-               wcross_size = draw_getimagesize(wcross_name) * wcross_scale;
-
-               if(wcross_scale >= 0.001 && wcross_alpha >= 0.001)
-               {
-                       // crosshair rings for weapon stats
-                       if (autocvar_crosshair_ring || autocvar_crosshair_ring_reload)
-                       {
-                               // declarations and stats
-                               float ring_value = 0, ring_scale = 0, ring_alpha = 0, ring_inner_value = 0, ring_inner_alpha = 0;
-                               string ring_image = string_null, ring_inner_image = string_null;
-                               vector ring_rgb = '0 0 0', ring_inner_rgb = '0 0 0';
-
-                               ring_scale = autocvar_crosshair_ring_size;
-
-                               float weapon_clipload, weapon_clipsize;
-                               weapon_clipload = getstati(STAT_WEAPON_CLIPLOAD);
-                               weapon_clipsize = getstati(STAT_WEAPON_CLIPSIZE);
-
-                               float ok_ammo_charge, ok_ammo_chargepool;
-                               ok_ammo_charge = getstatf(STAT_OK_AMMO_CHARGE);
-                               ok_ammo_chargepool = getstatf(STAT_OK_AMMO_CHARGEPOOL);
-
-                               float vortex_charge, vortex_chargepool;
-                               vortex_charge = getstatf(STAT_VORTEX_CHARGE);
-                               vortex_chargepool = getstatf(STAT_VORTEX_CHARGEPOOL);
-
-                               float arc_heat = getstatf(STAT_ARC_HEAT);
-
-                               if(vortex_charge_movingavg == 0) // this should only happen if we have just loaded up the game
-                                       vortex_charge_movingavg = vortex_charge;
-
-
-                               // handle the values
-                               if (autocvar_crosshair_ring && activeweapon == WEP_VORTEX && vortex_charge && autocvar_crosshair_ring_vortex) // ring around crosshair representing velocity-dependent damage for the vortex
-                               {
-                                       if (vortex_chargepool || use_vortex_chargepool) {
-                                               use_vortex_chargepool = 1;
-                                               ring_inner_value = vortex_chargepool;
-                                       } else {
-                                               vortex_charge_movingavg = (1 - autocvar_crosshair_ring_vortex_currentcharge_movingavg_rate) * vortex_charge_movingavg + autocvar_crosshair_ring_vortex_currentcharge_movingavg_rate * vortex_charge;
-                                               ring_inner_value = bound(0, autocvar_crosshair_ring_vortex_currentcharge_scale * (vortex_charge - vortex_charge_movingavg), 1);
-                                       }
-
-                                       ring_inner_alpha = autocvar_crosshair_ring_vortex_inner_alpha;
-                                       ring_inner_rgb = eX * autocvar_crosshair_ring_vortex_inner_color_red + eY * autocvar_crosshair_ring_vortex_inner_color_green + eZ * autocvar_crosshair_ring_vortex_inner_color_blue;
-                                       ring_inner_image = "gfx/crosshair_ring_inner.tga";
-
-                                       // draw the outer ring to show the current charge of the weapon
-                                       ring_value = vortex_charge;
-                                       ring_alpha = autocvar_crosshair_ring_vortex_alpha;
-                                       ring_rgb = wcross_color;
-                                       ring_image = "gfx/crosshair_ring_nexgun.tga";
-                               }
-                               else if (autocvar_crosshair_ring && activeweapon == WEP_MINE_LAYER && minelayer_maxmines && autocvar_crosshair_ring_minelayer)
-                               {
-                                       ring_value = bound(0, getstati(STAT_LAYED_MINES) / minelayer_maxmines, 1); // if you later need to use the count of bullets in another place, then add a float for it. For now, no need to.
-                                       ring_alpha = autocvar_crosshair_ring_minelayer_alpha;
-                                       ring_rgb = wcross_color;
-                                       ring_image = "gfx/crosshair_ring.tga";
-                               }
-                               else if (activeweapon == WEP_HAGAR && getstati(STAT_HAGAR_LOAD) && autocvar_crosshair_ring_hagar)
-                               {
-                                       ring_value = bound(0, getstati(STAT_HAGAR_LOAD) / hagar_maxrockets, 1);
-                                       ring_alpha = autocvar_crosshair_ring_hagar_alpha;
-                                       ring_rgb = wcross_color;
-                                       ring_image = "gfx/crosshair_ring.tga";
-                               }
-                               else if (ok_ammo_charge)
-                               {
-                                       ring_value = ok_ammo_chargepool;
-                                       ring_alpha = autocvar_crosshair_ring_reload_alpha;
-                                       ring_rgb = wcross_color;
-                                       ring_image = "gfx/crosshair_ring.tga";
-                               }
-                               else if(autocvar_crosshair_ring_reload && weapon_clipsize) // forces there to be only an ammo ring
-                               {
-                                       ring_value = bound(0, weapon_clipload / weapon_clipsize, 1);
-                                       ring_scale = autocvar_crosshair_ring_reload_size;
-                                       ring_alpha = autocvar_crosshair_ring_reload_alpha;
-                                       ring_rgb = wcross_color;
-
-                                       // Note: This is to stop Taoki from complaining that the image doesn't match all potential balances.
-                                       // if a new image for another weapon is added, add the code (and its respective file/value) here
-                                       if ((activeweapon == WEP_RIFLE) && (weapon_clipsize == 80))
-                                               ring_image = "gfx/crosshair_ring_rifle.tga";
-                                       else
-                                               ring_image = "gfx/crosshair_ring.tga";
-                               }
-                               else if ( autocvar_crosshair_ring && autocvar_crosshair_ring_arc && arc_heat && activeweapon == WEP_ARC )
-                               {
-                                       ring_value = arc_heat;
-                                       ring_alpha = (1-arc_heat)*autocvar_crosshair_ring_arc_cold_alpha +
-                                               arc_heat*autocvar_crosshair_ring_arc_hot_alpha;
-                                       ring_rgb = (1-arc_heat)*wcross_color + arc_heat*autocvar_crosshair_ring_arc_hot_color;
-                                       ring_image = "gfx/crosshair_ring.tga";
-                               }
-
-                               // if in weapon switch animation, fade ring out/in
-                               if(autocvar_crosshair_effect_time > 0)
-                               {
-                                       f = (time - wcross_name_changestarttime) / autocvar_crosshair_effect_time;
-                                       if (!(f < 1))
-                                       {
-                                               wcross_ring_prev = ((ring_image) ? TRUE : FALSE);
-                                       }
-
-                                       if(wcross_ring_prev)
-                                       {
-                                               if(f < 1)
-                                                       ring_alpha *= fabs(1 - bound(0, f, 1));
-                                       }
-                                       else
-                                       {
-                                               if(f < 1)
-                                                       ring_alpha *= bound(0, f, 1);
-                                       }
-                               }
-
-                               if (autocvar_crosshair_ring_inner && ring_inner_value) // lets draw a ring inside a ring so you can ring while you ring
-                                       DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, ring_inner_image, ring_inner_value, ring_inner_rgb, wcross_alpha * ring_inner_alpha, DRAWFLAG_ADDITIVE);
-
-                               if (ring_value)
-                                       DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, ring_image, ring_value, ring_rgb, wcross_alpha * ring_alpha, DRAWFLAG_ADDITIVE);
-                       }
-
-#define CROSSHAIR_DO_BLUR(M,sz,wcross_name,wcross_alpha) \
-                       do \
-                       { \
-                               if(wcross_blur > 0) \
-                               { \
-                                       for(i = -2; i <= 2; ++i) \
-                                       for(j = -2; j <= 2; ++j) \
-                                       M(i,j,sz,wcross_name,wcross_alpha*0.04); \
-                               } \
-                               else \
-                               { \
-                                       M(0,0,sz,wcross_name,wcross_alpha); \
-                               } \
-                       } \
-                       while(0)
-
-#define CROSSHAIR_DRAW_SINGLE(i,j,sz,wcross_name,wcross_alpha) \
-                       drawpic(wcross_origin - ('0.5 0 0' * (sz * wcross_size_x + i * wcross_blur) + '0 0.5 0' * (sz * wcross_size_y + j * wcross_blur)), wcross_name, sz * wcross_size, wcross_color, wcross_alpha, DRAWFLAG_NORMAL)
-
-#define CROSSHAIR_DRAW(sz,wcross_name,wcross_alpha) \
-                       CROSSHAIR_DO_BLUR(CROSSHAIR_DRAW_SINGLE,sz,wcross_name,wcross_alpha)
-
-                       if(time < wcross_name_changedonetime && wcross_name != wcross_name_goal_prev_prev && wcross_name_goal_prev_prev)
-                       {
-                               f = (wcross_name_changedonetime - time) / (wcross_name_changedonetime - wcross_name_changestarttime);
-                               wcross_size = draw_getimagesize(wcross_name_goal_prev_prev) * wcross_scale;
-                               CROSSHAIR_DRAW(wcross_resolution_goal_prev_prev, wcross_name_goal_prev_prev, wcross_alpha * f * wcross_name_alpha_goal_prev_prev);
-                               f = 1 - f;
-                       }
-                       else
-                       {
-                               f = 1;
-                       }
-                       wcross_name_alpha_goal_prev = f;
-
-                       wcross_size = draw_getimagesize(wcross_name) * wcross_scale;
-                       CROSSHAIR_DRAW(wcross_resolution, wcross_name, wcross_alpha * f);
-
-                       if(autocvar_crosshair_dot)
-                       {
-                               vector wcross_color_old;
-                               wcross_color_old = wcross_color;
-
-                               if((autocvar_crosshair_dot_color_custom) && (autocvar_crosshair_dot_color != "0"))
-                                       wcross_color = stov(autocvar_crosshair_dot_color);
-
-                               CROSSHAIR_DRAW(wcross_resolution * autocvar_crosshair_dot_size, "gfx/crosshairdot.tga", f * autocvar_crosshair_dot_alpha);
-                               // FIXME why don't we use wcross_alpha here?cl_notice_run();
-                               wcross_color = wcross_color_old;
-                       }
-               }
-       }
-       else
-       {
-               wcross_scale_prev = 0;
-               wcross_alpha_prev = 0;
-               wcross_scale_goal_prev = 0;
-               wcross_alpha_goal_prev = 0;
-               wcross_changedonetime = 0;
-               if(wcross_name_goal_prev)
-                       strunzone(wcross_name_goal_prev);
-               wcross_name_goal_prev = string_null;
-               if(wcross_name_goal_prev_prev)
-                       strunzone(wcross_name_goal_prev_prev);
-               wcross_name_goal_prev_prev = string_null;
-               wcross_name_changestarttime = 0;
-               wcross_name_changedonetime = 0;
-               wcross_name_alpha_goal_prev = 0;
-               wcross_name_alpha_goal_prev_prev = 0;
-               wcross_resolution_goal_prev = 0;
-               wcross_resolution_goal_prev_prev = 0;
-       }
-}
-
-#define BUTTON_3 4
-#define BUTTON_4 8
-float cl_notice_run();
-float prev_myteam;
-void CSQC_UpdateView(float w, float h)
-{
-       entity e;
-       float fov;
-       float f, i;
-       vector vf_size, vf_min;
-       float a;
-
-       execute_next_frame();
-
-       ++framecount;
-
-       hud = getstati(STAT_HUD);
-
-       if(autocvar__hud_showbinds_reload) // menu can set this one
-       {
-               db_close(binddb);
-               binddb = db_create();
-               cvar_set("_hud_showbinds_reload", "0");
-       }
-
-       if(checkextension("DP_CSQC_MINFPS_QUALITY"))
-               view_quality = getproperty(VF_MINFPS_QUALITY);
-       else
-               view_quality = 1;
-
-       button_attack2 = (input_buttons & BUTTON_3);
-       button_zoom = (input_buttons & BUTTON_4);
-
-#define CHECKFAIL_ASSERT(flag,func,parm,val) { float checkfailv; checkfailv = (func)(parm); if(checkfailv != (val)) { if(!checkfail[(flag)]) localcmd(sprintf("\ncmd checkfail %s %s %d %d\n", #func, parm, val, checkfailv)); checkfail[(flag)] = 1; } } ENDS_WITH_CURLY_BRACE
-       CHECKFAIL_ASSERT(0, cvar_type, "\{100}\{105}\{118}\{48}\{95}\{101}\{118}\{97}\{100}\{101}", 0);
-       CHECKFAIL_ASSERT(1, cvar_type, "\{97}\{97}\{95}\{101}\{110}\{97}\{98}\{108}\{101}", 0);
-       CHECKFAIL_ASSERT(2, cvar, "\{114}\{95}\{115}\{104}\{111}\{119}\{100}\{105}\{115}\{97}\{98}\{108}\{101}\{100}\{101}\{112}\{116}\{104}\{116}\{101}\{115}\{116}", 0);
-       CHECKFAIL_ASSERT(3, cvar, "\{114}\{95}\{115}\{104}\{111}\{119}\{111}\{118}\{101}\{114}\{100}\{114}\{97}\{119}", 0);
-       CHECKFAIL_ASSERT(4, cvar, "\{114}\{95}\{115}\{104}\{111}\{119}\{108}\{105}\{103}\{104}\{116}", 0);
-       CHECKFAIL_ASSERT(5, cvar, "\{114}\{95}\{115}\{104}\{111}\{119}\{115}\{104}\{97}\{100}\{111}\{119}\{118}\{111}\{108}\{117}\{109}\{101}\{115}", 0);
-       CHECKFAIL_ASSERT(6, cvar, "\{114}\{95}\{115}\{104}\{111}\{119}\{111}\{118}\{101}\{114}\{100}\{114}\{97}\{119}", 0);
-
-       vf_size = getpropertyvec(VF_SIZE);
-       vf_min = getpropertyvec(VF_MIN);
-       vid_width = vf_size_x;
-       vid_height = vf_size_y;
-
-       vector reticle_pos = '0 0 0', reticle_size = '0 0 0';
-       vector splash_pos = '0 0 0', splash_size = '0 0 0';
-
-       WaypointSprite_Load();
-
-       CSQCPlayer_SetCamera();
-
-       myteam = GetPlayerColor(player_localentnum - 1);
-
-       if(myteam != prev_myteam)
-       {
-               myteamcolors = colormapPaletteColor(myteam, 1);
-               for(i = 0; i < HUD_PANEL_NUM; ++i)
-                       hud_panel[i].update_time = time;
-               prev_myteam = myteam;
-       }
-
-       ticrate = getstatf(STAT_MOVEVARS_TICRATE) * getstatf(STAT_MOVEVARS_TIMESCALE);
-
-       float is_dead = (getstati(STAT_HEALTH) <= 0);
-
-       // FIXME do we need this hack?
-       if(isdemo())
-       {
-               // in demos, input_buttons do not work
-               button_zoom = (autocvar__togglezoom == "-");
-       }
-       else if(button_zoom
-               && autocvar_cl_unpress_zoom_on_death
-               && (spectatee_status >= 0)
-               && (is_dead || intermission))
-       {
-               // no zoom while dead or in intermission please
-               localcmd("-zoom\n");
-               button_zoom = FALSE;
-       }
-
-       // event chase camera
-       if(autocvar_chase_active <= 0) // greater than 0 means it's enabled manually, and this code is skipped
-       {
-               if(WantEventchase())
-               {
-                       eventchase_running = TRUE;
-
-                       // make special vector since we can't use view_origin (It is one frame old as of this code, it gets set later with the results this code makes.)
-                       vector current_view_origin = (csqcplayer ? csqcplayer.origin : pmove_org);
-
-                       // detect maximum viewoffset and use it
-                       if(autocvar_cl_eventchase_viewoffset)
-                       {
-                               WarpZone_TraceLine(current_view_origin, current_view_origin + autocvar_cl_eventchase_viewoffset + ('0 0 1' * autocvar_cl_eventchase_maxs_z), MOVE_WORLDONLY, self);
-                               if(trace_fraction == 1) { current_view_origin += autocvar_cl_eventchase_viewoffset; }
-                               else { current_view_origin_z += max(0, (trace_endpos_z - current_view_origin_z) - autocvar_cl_eventchase_maxs_z); }
-                       }
-
-                       // We must enable chase_active to get a third person view (weapon viewmodel hidden and own player model showing).
-                       // Ideally, there should be another way to enable third person cameras, such as through setproperty()
-                       // -1 enables chase_active while marking it as set by this code, and not by the user (which would be 1)
-                       if(!autocvar_chase_active) { cvar_set("chase_active", "-1"); }
-
-                       // make the camera smooth back
-                       if(autocvar_cl_eventchase_speed && eventchase_current_distance < autocvar_cl_eventchase_distance)
-                               eventchase_current_distance += autocvar_cl_eventchase_speed * (autocvar_cl_eventchase_distance - eventchase_current_distance) * frametime; // slow down the further we get
-                       else if(eventchase_current_distance != autocvar_cl_eventchase_distance)
-                               eventchase_current_distance = autocvar_cl_eventchase_distance;
-
-                       makevectors(view_angles);
-
-                       vector eventchase_target_origin = (current_view_origin - (v_forward * eventchase_current_distance));
-                       WarpZone_TraceBox(current_view_origin, autocvar_cl_eventchase_mins, autocvar_cl_eventchase_maxs, eventchase_target_origin, MOVE_WORLDONLY, self);
-
-                       // If the boxtrace fails, revert back to line tracing.
-                       if(trace_startsolid)
-                       {
-                               eventchase_target_origin = (current_view_origin - (v_forward * eventchase_current_distance));
-                               WarpZone_TraceLine(current_view_origin, eventchase_target_origin, MOVE_WORLDONLY, self);
-                               setproperty(VF_ORIGIN, (trace_endpos - (v_forward * autocvar_cl_eventchase_mins_z)));
-                       }
-                       else { setproperty(VF_ORIGIN, trace_endpos); }
-
-                       setproperty(VF_ANGLES, WarpZone_TransformVAngles(WarpZone_trace_transform, view_angles));
-               }
-               else if(autocvar_chase_active < 0) // time to disable chase_active if it was set by this code
-               {
-                       eventchase_running = FALSE;
-                       cvar_set("chase_active", "0");
-                       eventchase_current_distance = 0; // start from 0 next time
-               }
-       }
-       // workaround for camera stuck between player's legs when using chase_active 1
-       // because the engine stops updating the chase_active camera when the game ends
-       else if(intermission)
-       {
-               cvar_settemp("chase_active", "-1");
-               eventchase_current_distance = 0;
-       }
-
-       // do lockview after event chase camera so that it still applies whenever necessary.
-       if(autocvar_cl_lockview || (!autocvar_hud_cursormode && (autocvar__hud_configure && spectatee_status <= 0 || intermission > 1)))
-       {
-               setproperty(VF_ORIGIN, freeze_org);
-               setproperty(VF_ANGLES, freeze_ang);
-       }
-       else
-       {
-               freeze_org = getpropertyvec(VF_ORIGIN);
-               freeze_ang = getpropertyvec(VF_ANGLES);
-       }
-
-       WarpZone_FixView();
-       //WarpZone_FixPMove();
-
-       vector ov_org = '0 0 0';
-       vector ov_mid = '0 0 0';
-       vector ov_worldmin = '0 0 0';
-       vector ov_worldmax = '0 0 0';
-       if(autocvar_cl_orthoview)
-       {
-               ov_worldmin = mi_picmin;
-               ov_worldmax = mi_picmax;
-
-               float ov_width = (ov_worldmax_x - ov_worldmin_x);
-               float ov_height = (ov_worldmax_y - ov_worldmin_y);
-               float ov_distance = (max(vid_width, vid_height) * max(ov_width, ov_height));
-
-               ov_mid = ((ov_worldmax + ov_worldmin) * 0.5);
-               ov_org = vec3(ov_mid_x, ov_mid_y, (ov_mid_z + ov_distance));
-
-               float ov_nearest = vlen(ov_org - vec3(
-                       bound(ov_worldmin_x, ov_org_x, ov_worldmax_x),
-                       bound(ov_worldmin_y, ov_org_y, ov_worldmax_y),
-                       bound(ov_worldmin_z, ov_org_z, ov_worldmax_z)
-               ));
-
-               float ov_furthest = 0;
-               float dist = 0;
-
-               if((dist = vlen(vec3(ov_worldmin_x, ov_worldmin_y, ov_worldmin_z) - ov_org)) > ov_furthest) { ov_furthest = dist; }
-               if((dist = vlen(vec3(ov_worldmax_x, ov_worldmin_y, ov_worldmin_z) - ov_org)) > ov_furthest) { ov_furthest = dist; }
-               if((dist = vlen(vec3(ov_worldmin_x, ov_worldmax_y, ov_worldmin_z) - ov_org)) > ov_furthest) { ov_furthest = dist; }
-               if((dist = vlen(vec3(ov_worldmin_x, ov_worldmin_y, ov_worldmax_z) - ov_org)) > ov_furthest) { ov_furthest = dist; }
-               if((dist = vlen(vec3(ov_worldmax_x, ov_worldmax_y, ov_worldmin_z) - ov_org)) > ov_furthest) { ov_furthest = dist; }
-               if((dist = vlen(vec3(ov_worldmin_x, ov_worldmax_y, ov_worldmax_z) - ov_org)) > ov_furthest) { ov_furthest = dist; }
-               if((dist = vlen(vec3(ov_worldmax_x, ov_worldmin_y, ov_worldmax_z) - ov_org)) > ov_furthest) { ov_furthest = dist; }
-               if((dist = vlen(vec3(ov_worldmax_x, ov_worldmax_y, ov_worldmax_z) - ov_org)) > ov_furthest) { ov_furthest = dist; }
-
-               cvar_settemp("r_nearclip", ftos(ov_nearest));
-               cvar_settemp("r_farclip_base", ftos(ov_furthest));
-               cvar_settemp("r_farclip_world", "0");
-               cvar_settemp("r_novis", "1");
-               cvar_settemp("r_useportalculling", "0");
-               cvar_settemp("r_useinfinitefarclip", "0");
-
-               setproperty(VF_ORIGIN, ov_org);
-               setproperty(VF_ANGLES, '90 0 0');
-
-               #if 0
-               printf("OrthoView: org = %s, angles = %s, distance = %f, nearest = %f, furthest = %f\n",
-                       vtos(ov_org),
-                       vtos(getpropertyvec(VF_ANGLES)),
-                       ov_distance,
-                       ov_nearest,
-                       ov_furthest);
-               #endif
-       }
-
-       // Render the Scene
-       view_origin = getpropertyvec(VF_ORIGIN);
-       view_angles = getpropertyvec(VF_ANGLES);
-       makevectors(view_angles);
-       view_forward = v_forward;
-       view_right = v_right;
-       view_up = v_up;
-
-#ifdef BLURTEST
-       if(time > blurtest_time0 && time < blurtest_time1)
-       {
-               float r, t;
-
-               t = (time - blurtest_time0) / (blurtest_time1 - blurtest_time0);
-               r = t * blurtest_radius;
-               f = 1 / pow(t, blurtest_power) - 1;
-
-               cvar_set("r_glsl_postprocess", "1");
-               cvar_set("r_glsl_postprocess_uservec1", strcat(ftos(r), " ", ftos(f), " 0 0"));
-       }
-       else
-       {
-               cvar_set("r_glsl_postprocess", "0");
-               cvar_set("r_glsl_postprocess_uservec1", "0 0 0 0");
-       }
-#endif
-
-       TargetMusic_Advance();
-       Fog_Force();
-
-       if(drawtime == 0)
-               drawframetime = 0.01666667; // when we don't know fps yet, we assume 60fps
-       else
-               drawframetime = bound(0.000001, time - drawtime, 1);
-       drawtime = time;
-
-       // watch for gametype changes here...
-       // in ParseStuffCMD the cmd isn't executed yet :/
-       // might even be better to add the gametype to TE_CSQC_INIT...?
-       if(!postinit)
-               PostInit();
-
-       if(intermission && !isdemo() && !(calledhooks & HOOK_END))
-       {
-               if(calledhooks & HOOK_START)
-               {
-                       localcmd("\ncl_hook_gameend\n");
-                       calledhooks |= HOOK_END;
-               }
-       }
-
-       Announcer();
-
-       fov = autocvar_fov;
-       if(fov <= 59.5)
-       {
-               if(!zoomscript_caught)
-               {
-                       localcmd("+button9\n");
-                       zoomscript_caught = 1;
-               }
-       }
-       else
-       {
-               if(zoomscript_caught)
-               {
-                       localcmd("-button9\n");
-                       zoomscript_caught = 0;
-               }
-       }
-
-       ColorTranslateMode = autocvar_cl_stripcolorcodes;
-
-       // next WANTED weapon (for HUD)
-       switchweapon = getstati(STAT_SWITCHWEAPON);
-
-       // currently switching-to weapon (for crosshair)
-       switchingweapon = getstati(STAT_SWITCHINGWEAPON);
-
-       // actually active weapon (for zoom)
-       activeweapon = getstati(STAT_ACTIVEWEAPON);
-
-       f = (serverflags & SERVERFLAG_TEAMPLAY);
-       if(f != teamplay)
-       {
-               teamplay = f;
-               HUD_InitScores();
-       }
-
-       if(last_switchweapon != switchweapon)
-       {
-               weapontime = time;
-               last_switchweapon = switchweapon;
-               if(button_zoom && autocvar_cl_unpress_zoom_on_weapon_switch)
-               {
-                       localcmd("-zoom\n");
-                       button_zoom = FALSE;
-               }
-               if(autocvar_cl_unpress_attack_on_weapon_switch)
-               {
-                       localcmd("-fire\n");
-                       localcmd("-fire2\n");
-                       button_attack2 = FALSE;
-               }
-       }
-       if(last_activeweapon != activeweapon)
-       {
-               last_activeweapon = activeweapon;
-
-               e = get_weaponinfo(activeweapon);
-               if(e.netname != "")
-                       localcmd(strcat("\ncl_hook_activeweapon ", e.netname), "\n");
-               else
-                       localcmd("\ncl_hook_activeweapon none\n");
-       }
-
-       // ALWAYS Clear Current Scene First
-       clearscene();
-
-       setproperty(VF_ORIGIN, view_origin);
-       setproperty(VF_ANGLES, view_angles);
-
-       // FIXME engine bug? VF_SIZE and VF_MIN are not restored to sensible values by this
-       setproperty(VF_SIZE, vf_size);
-       setproperty(VF_MIN, vf_min);
-
-       // Assign Standard Viewflags
-       // Draw the World (and sky)
-       setproperty(VF_DRAWWORLD, 1);
-
-       // Set the console size vars
-       vid_conwidth = autocvar_vid_conwidth;
-       vid_conheight = autocvar_vid_conheight;
-       vid_pixelheight = autocvar_vid_pixelheight;
-
-       if(autocvar_cl_orthoview) { setproperty(VF_FOV, GetOrthoviewFOV(ov_worldmin, ov_worldmax, ov_mid, ov_org)); }
-       else { setproperty(VF_FOV, GetCurrentFov(fov)); }
-
-       // Camera for demo playback
-       if(camera_active)
-       {
-               if(autocvar_camera_enable)
-                       CSQC_Demo_Camera();
-               else
-               {
-                       cvar_set("chase_active", ftos(chase_active_backup));
-                       cvar_set("cl_demo_mousegrab", "0");
-                       camera_active = FALSE;
-               }
-       }
-#ifdef CAMERATEST
-       else if(autocvar_camera_enable)
-#else
-       else if(autocvar_camera_enable && isdemo())
-#endif
-       {
-               // Enable required Darkplaces cvars
-               chase_active_backup = autocvar_chase_active;
-               cvar_set("chase_active", "2");
-               cvar_set("cl_demo_mousegrab", "1");
-               camera_active = TRUE;
-               camera_mode = FALSE;
-       }
-
-       // Draw the Crosshair
-       setproperty(VF_DRAWCROSSHAIR, 0); //Make sure engine crosshairs are always hidden
-
-       // Draw the Engine Status Bar (the default Quake HUD)
-       setproperty(VF_DRAWENGINESBAR, 0);
-
-       // Update the mouse position
-       /*
-          mousepos_x = vid_conwidth;
-          mousepos_y = vid_conheight;
-          mousepos = mousepos*0.5 + getmousepos();
-        */
-
-       e = self;
-       for(self = world; (self = nextent(self)); )
-               if(self.draw)
-                       self.draw();
-       self = e;
-
-       addentities(MASK_NORMAL | MASK_ENGINE | MASK_ENGINEVIEWMODELS);
-       renderscene();
-
-       // now switch to 2D drawing mode by calling a 2D drawing function
-       // then polygon drawing will draw as 2D stuff, and NOT get queued until the
-       // next R_RenderScene call
-       drawstring('0 0 0', "", '1 1 0', '1 1 1', 0, 0);
-
-       if(autocvar_r_fakelight >= 2 || autocvar_r_fullbright)
-       if (!(serverflags & SERVERFLAG_ALLOW_FULLBRIGHT))
-       {
-               // apply night vision effect
-               vector tc_00, tc_01, tc_10, tc_11;
-               vector rgb = '0 0 0';
-
-               if(!nightvision_noise)
-               {
-                       nightvision_noise = spawn();
-                       nightvision_noise.classname = "nightvision_noise";
-               }
-               if(!nightvision_noise2)
-               {
-                       nightvision_noise2 = spawn();
-                       nightvision_noise2.classname = "nightvision_noise2";
-               }
-
-               // color tint in yellow
-               drawfill('0 0 0', autocvar_vid_conwidth * '1 0 0' + autocvar_vid_conheight * '0 1 0', '0.5 1 0.3', 1, DRAWFLAG_MODULATE);
-
-               // draw BG
-               a = Noise_Pink(nightvision_noise, frametime * 1.5) * 0.05 + 0.15;
-               rgb = '1 1 1';
-               tc_00 = '0 0 0' + '0.2 0 0' * sin(time * 0.3) + '0 0.3 0' * cos(time * 0.7);
-               tc_01 = '0 2.25 0' + '0.6 0 0' * cos(time * 1.2) - '0 0.3 0' * sin(time * 2.2);
-               tc_10 = '1.5 0 0' - '0.2 0 0' * sin(time * 0.5) + '0 0.5 0' * cos(time * 1.7);
-               //tc_11 = '1 1 0' + '0.6 0 0' * sin(time * 0.6) + '0 0.3 0' * cos(time * 0.1);
-               tc_11 = tc_01 + tc_10 - tc_00;
-               R_BeginPolygon("gfx/nightvision-bg.tga", DRAWFLAG_ADDITIVE);
-               R_PolygonVertex('0 0 0', tc_00, rgb, a);
-               R_PolygonVertex(autocvar_vid_conwidth * '1 0 0', tc_10, rgb, a);
-               R_PolygonVertex(autocvar_vid_conwidth * '1 0 0' + autocvar_vid_conheight * '0 1 0', tc_11, rgb, a);
-               R_PolygonVertex(autocvar_vid_conheight * '0 1 0', tc_01, rgb, a);
-               R_EndPolygon();
-
-               // draw FG
-               a = Noise_Pink(nightvision_noise2, frametime * 0.1) * 0.05 + 0.12;
-               rgb = '0.3 0.6 0.4' + '0.1 0.4 0.2' * Noise_White(nightvision_noise2, frametime);
-               tc_00 = '0 0 0' + '1 0 0' * Noise_White(nightvision_noise2, frametime) + '0 1 0' * Noise_White(nightvision_noise2, frametime);
-               tc_01 = tc_00 + '0 3 0' * (1 + Noise_White(nightvision_noise2, frametime) * 0.2);
-               tc_10 = tc_00 + '2 0 0' * (1 + Noise_White(nightvision_noise2, frametime) * 0.3);
-               tc_11 = tc_01 + tc_10 - tc_00;
-               R_BeginPolygon("gfx/nightvision-fg.tga", DRAWFLAG_ADDITIVE);
-               R_PolygonVertex('0 0 0', tc_00, rgb, a);
-               R_PolygonVertex(autocvar_vid_conwidth * '1 0 0', tc_10, rgb, a);
-               R_PolygonVertex(autocvar_vid_conwidth * '1 0 0' + autocvar_vid_conheight * '0 1 0', tc_11, rgb, a);
-               R_PolygonVertex(autocvar_vid_conheight * '0 1 0', tc_01, rgb, a);
-               R_EndPolygon();
-       }
-
-       if(autocvar_cl_reticle)
-       {
-               // Draw the aiming reticle for weapons that use it
-               // reticle_type is changed to the item we are zooming / aiming with, to decide which reticle to use
-               // It must be a persisted float for fading out to work properly (you let go of the zoom button for
-               // the view to go back to normal, so reticle_type would become 0 as we fade out)
-               if(spectatee_status || is_dead || hud != HUD_NORMAL)
-               {
-                       // no zoom reticle while dead
-                       reticle_type = 0;
-               }
-               else if(WEP_ACTION(activeweapon, WR_ZOOMRETICLE) && autocvar_cl_reticle_weapon)
-               {
-                       if(reticle_image != "") { reticle_type = 2; }
-                       else { reticle_type = 0; }
-               }
-               else if(button_zoom || zoomscript_caught)
-               {
-                       // normal zoom
-                       reticle_type = 1;
-               }
-
-               if(reticle_type)
-               {
-                       if(autocvar_cl_reticle_stretch)
-                       {
-                               reticle_size_x = vid_conwidth;
-                               reticle_size_y = vid_conheight;
-                               reticle_pos_x = 0;
-                               reticle_pos_y = 0;
-                       }
-                       else
-                       {
-                               reticle_size_x = max(vid_conwidth, vid_conheight);
-                               reticle_size_y = max(vid_conwidth, vid_conheight);
-                               reticle_pos_x = (vid_conwidth - reticle_size_x) / 2;
-                               reticle_pos_y = (vid_conheight - reticle_size_y) / 2;
-                       }
-
-                       if(zoomscript_caught)
-                               f = 1;
-                       else 
-                               f = current_zoomfraction;
-
-                       if(f)
-                       {
-                               switch(reticle_type)
-                               {
-                                       case 1: drawpic(reticle_pos, "gfx/reticle_normal", reticle_size, '1 1 1', f * autocvar_cl_reticle_normal_alpha, DRAWFLAG_NORMAL); break;
-                                       case 2: drawpic(reticle_pos, reticle_image, reticle_size, '1 1 1', f * autocvar_cl_reticle_weapon_alpha, DRAWFLAG_NORMAL); break;
-                               }
-                       }
-               }
-       }
-       else
-       {
-               if(reticle_type != 0) { reticle_type = 0; }
-       }
-
-
-       // improved polyblend
-       if(autocvar_hud_contents)
-       {
-               float contentalpha_temp, incontent, liquidalpha, contentfadetime;
-               vector liquidcolor;
-
-               switch(pointcontents(view_origin))
-               {
-                       case CONTENT_WATER:
-                               liquidalpha = autocvar_hud_contents_water_alpha;
-                               liquidcolor = stov(autocvar_hud_contents_water_color);
-                               incontent = 1;
-                               break;
-
-                       case CONTENT_LAVA:
-                               liquidalpha = autocvar_hud_contents_lava_alpha;
-                               liquidcolor = stov(autocvar_hud_contents_lava_color);
-                               incontent = 1;
-                               break;
-
-                       case CONTENT_SLIME:
-                               liquidalpha = autocvar_hud_contents_slime_alpha;
-                               liquidcolor = stov(autocvar_hud_contents_slime_color);
-                               incontent = 1;
-                               break;
-
-                       default:
-                               liquidalpha = 0;
-                               liquidcolor = '0 0 0';
-                               incontent = 0;
-                               break;
-               }
-
-               if(incontent) // fade in/out at different speeds so you can do e.g. instant fade when entering water and slow when leaving it.
-               { // also lets delcare previous values for blending properties, this way it isn't reset until after you have entered a different content
-                       contentfadetime = autocvar_hud_contents_fadeintime;
-                       liquidalpha_prev = liquidalpha;
-                       liquidcolor_prev = liquidcolor;
-               }
-               else
-                       contentfadetime = autocvar_hud_contents_fadeouttime;
-
-               contentalpha_temp = bound(0, drawframetime / max(0.0001, contentfadetime), 1);
-               contentavgalpha = contentavgalpha * (1 - contentalpha_temp) + incontent * contentalpha_temp;
-
-               if(contentavgalpha)
-                       drawfill('0 0 0', eX * vid_conwidth + eY * vid_conheight, liquidcolor_prev, contentavgalpha * liquidalpha_prev, DRAWFLAG_NORMAL);
-
-               if(autocvar_hud_postprocessing)
-               {
-                       if(autocvar_hud_contents_blur && contentavgalpha)
-                       {
-                               content_blurpostprocess_x = 1;
-                               content_blurpostprocess_y = contentavgalpha * autocvar_hud_contents_blur;
-                               content_blurpostprocess_z = contentavgalpha * autocvar_hud_contents_blur_alpha;
-                       }
-                       else
-                       {
-                               content_blurpostprocess_x = 0;
-                               content_blurpostprocess_y = 0;
-                               content_blurpostprocess_z = 0;
-                       }
-               }
-       }
-
-       if(autocvar_hud_damage && !getstati(STAT_FROZEN))
-       {
-               splash_size_x = max(vid_conwidth, vid_conheight);
-               splash_size_y = max(vid_conwidth, vid_conheight);
-               splash_pos_x = (vid_conwidth - splash_size_x) / 2;
-               splash_pos_y = (vid_conheight - splash_size_y) / 2;
-
-               float myhealth_flash_temp;
-               myhealth = getstati(STAT_HEALTH);
-
-               // fade out
-               myhealth_flash = max(0, myhealth_flash - autocvar_hud_damage_fade_rate * frametime);
-               // add new damage
-               myhealth_flash = bound(0, myhealth_flash + dmg_take * autocvar_hud_damage_factor, autocvar_hud_damage_maxalpha);
-
-               float pain_threshold, pain_threshold_lower, pain_threshold_lower_health;
-               pain_threshold = autocvar_hud_damage_pain_threshold;
-               pain_threshold_lower = autocvar_hud_damage_pain_threshold_lower;
-               pain_threshold_lower_health = autocvar_hud_damage_pain_threshold_lower_health;
-
-               if(pain_threshold_lower && myhealth < pain_threshold_lower_health)
-               {
-                       pain_threshold = pain_threshold - max(autocvar_hud_damage_pain_threshold_pulsating_min, fabs(sin(M_PI * time / autocvar_hud_damage_pain_threshold_pulsating_period))) * pain_threshold_lower * (1 - max(0, myhealth)/pain_threshold_lower_health);
-               }
-
-               myhealth_flash_temp = bound(0, myhealth_flash - pain_threshold, 1);
-
-               if(myhealth_prev < 1)
-               {
-                       if(myhealth >= 1)
-                       {
-                               myhealth_flash = 0; // just spawned, clear the flash immediately
-                               myhealth_flash_temp = 0;
-                       }
-                       else
-                       {
-                               myhealth_flash += autocvar_hud_damage_fade_rate * frametime; // dead
-                       }
-               }
-
-               if(spectatee_status == -1 || intermission)
-               {
-                       myhealth_flash = 0; // observing, or match ended
-                       myhealth_flash_temp = 0;
-               }
-
-               myhealth_prev = myhealth;
-
-               // IDEA: change damage color/picture based on player model for robot/alien species?
-               // pro: matches model better
-               // contra: it's not red because blood is red, but because red is an alarming color, so red should stay
-               // maybe different reddish pics?
-               if(autocvar_cl_gentle_damage || autocvar_cl_gentle)
-               {
-                       if(autocvar_cl_gentle_damage == 2)
-                       {
-                               if(myhealth_flash < pain_threshold) // only randomize when the flash is gone
-                               {
-                                       myhealth_gentlergb = eX * random() + eY * random() + eZ * random();
-                               }
-                       }
-                       else
-                               myhealth_gentlergb = stov(autocvar_hud_damage_gentle_color);
-
-                       drawfill('0 0 0', eX * vid_conwidth + eY * vid_conheight, myhealth_gentlergb, autocvar_hud_damage_gentle_alpha_multiplier * bound(0, myhealth_flash_temp, 1) * autocvar_hud_damage, DRAWFLAG_NORMAL);
-               }
-               else
-                       drawpic(splash_pos, "gfx/blood", splash_size, stov(autocvar_hud_damage_color), bound(0, myhealth_flash_temp, 1) * autocvar_hud_damage, DRAWFLAG_NORMAL);
-
-               if(autocvar_hud_postprocessing) // we still need to set this anyway even when chase_active is set, this way it doesn't get stuck on.
-               {
-                       if(autocvar_hud_damage_blur && myhealth_flash_temp)
-                       {
-                               damage_blurpostprocess_x = 1;
-                               damage_blurpostprocess_y = bound(0, myhealth_flash_temp, 1) * autocvar_hud_damage_blur;
-                               damage_blurpostprocess_z = bound(0, myhealth_flash_temp, 1) * autocvar_hud_damage_blur_alpha;
-                       }
-                       else
-                       {
-                               damage_blurpostprocess_x = 0;
-                               damage_blurpostprocess_y = 0;
-                               damage_blurpostprocess_z = 0;
-                       }
-               }
-       }
-
-       float e1 = (autocvar_hud_postprocessing_maxbluralpha != 0);
-       float e2 = (autocvar_hud_powerup != 0);
-       if(autocvar_hud_postprocessing && (e1 || e2)) // TODO: Remove this code and re-do the postprocess handling in the engine, where it properly belongs.
-       {
-               // enable or disable rendering types if they are used or not
-               if(cvar("r_glsl_postprocess_uservec1_enable") != e1) { cvar_set("r_glsl_postprocess_uservec1_enable", ftos(e1)); }
-               if(cvar("r_glsl_postprocess_uservec2_enable") != e2) { cvar_set("r_glsl_postprocess_uservec2_enable", ftos(e2)); }
-
-               // blur postprocess handling done first (used by hud_damage and hud_contents)
-               if((damage_blurpostprocess_x || content_blurpostprocess_x))
-               {
-                       float blurradius = bound(0, damage_blurpostprocess_y + content_blurpostprocess_y, autocvar_hud_postprocessing_maxblurradius);
-                       float bluralpha = bound(0, damage_blurpostprocess_z + content_blurpostprocess_z, autocvar_hud_postprocessing_maxbluralpha);
-                       if(blurradius != old_blurradius || bluralpha != old_bluralpha) // reduce cvar_set spam as much as possible
-                       {
-                               cvar_set("r_glsl_postprocess_uservec1", strcat(ftos(blurradius), " ", ftos(bluralpha), " 0 0"));
-                               old_blurradius = blurradius;
-                               old_bluralpha = bluralpha;
-                       }
-               }
-               else if(cvar_string("r_glsl_postprocess_uservec1") != "0 0 0 0") // reduce cvar_set spam as much as possible
-               {
-                       cvar_set("r_glsl_postprocess_uservec1", "0 0 0 0");
-                       old_blurradius = 0;
-                       old_bluralpha = 0;
-               }
-
-               // edge detection postprocess handling done second (used by hud_powerup)
-               float sharpen_intensity = 0, strength_finished = getstatf(STAT_STRENGTH_FINISHED), invincible_finished = getstatf(STAT_INVINCIBLE_FINISHED);
-               if (strength_finished - time > 0) { sharpen_intensity += (strength_finished - time); }
-               if (invincible_finished - time > 0) { sharpen_intensity += (invincible_finished - time); }
-
-               sharpen_intensity = bound(0, ((getstati(STAT_HEALTH) > 0) ? sharpen_intensity : 0), 5); // Check to see if player is alive (if not, set 0) - also bound to fade out starting at 5 seconds.
-
-               if(autocvar_hud_powerup && sharpen_intensity > 0)
-               {
-                       if(sharpen_intensity != old_sharpen_intensity) // reduce cvar_set spam as much as possible
-                       {
-                               cvar_set("r_glsl_postprocess_uservec2", strcat(ftos((sharpen_intensity / 5) * autocvar_hud_powerup), " ", ftos(-sharpen_intensity * autocvar_hud_powerup), " 0 0"));
-                               old_sharpen_intensity = sharpen_intensity;
-                       }
-               }
-               else if(cvar_string("r_glsl_postprocess_uservec2") != "0 0 0 0") // reduce cvar_set spam as much as possible
-               {
-                       cvar_set("r_glsl_postprocess_uservec2", "0 0 0 0");
-                       old_sharpen_intensity = 0;
-               }
-
-               if(cvar("r_glsl_postprocess") == 0)
-                       cvar_set("r_glsl_postprocess", "2");
-       }
-       else if(cvar("r_glsl_postprocess") == 2)
-               cvar_set("r_glsl_postprocess", "0");
-
-       if(menu_visible)
-               menu_show();
-
-       /*if(gametype == MAPINFO_TYPE_CTF)
-         {
-         ctf_view();
-         } else */
-
-       // draw 2D entities
-       e = self;
-       for(self = world; (self = nextent(self)); )
-               if(self.draw2d)
-                       self.draw2d();
-       self = e;
-       Draw_ShowNames_All();
-
-       scoreboard_active = HUD_WouldDrawScoreboard();
-
-       UpdateDamage();
-       UpdateCrosshair();
-       UpdateHitsound();
-
-       if(NextFrameCommand)
-       {
-               localcmd("\n", NextFrameCommand, "\n");
-               NextFrameCommand = string_null;
-       }
-
-       // we must do this check AFTER a frame was rendered, or it won't work
-       if(cs_project_is_b0rked == 0)
-       {
-               string w0, h0;
-               w0 = ftos(autocvar_vid_conwidth);
-               h0 = ftos(autocvar_vid_conheight);
-               //setproperty(VF_VIEWPORT, '0 0 0', '640 480 0');
-               //setproperty(VF_FOV, '90 90 0');
-               setproperty(VF_ORIGIN, '0 0 0');
-               setproperty(VF_ANGLES, '0 0 0');
-               setproperty(VF_PERSPECTIVE, 1);
-               makevectors('0 0 0');
-               vector v1, v2;
-               cvar_set("vid_conwidth", "800");
-               cvar_set("vid_conheight", "600");
-               v1 = cs_project(v_forward);
-               cvar_set("vid_conwidth", "640");
-               cvar_set("vid_conheight", "480");
-               v2 = cs_project(v_forward);
-               if(v1 == v2)
-                       cs_project_is_b0rked = 1;
-               else
-                       cs_project_is_b0rked = -1;
-               cvar_set("vid_conwidth", w0);
-               cvar_set("vid_conheight", h0);
-       }
-
-       if(autocvar__hud_configure)
-               HUD_Panel_Mouse();
-
-    if(hud && !intermission)
-    {
-        if(hud == HUD_SPIDERBOT)
-            CSQC_SPIDER_HUD();
-        else if(hud == HUD_WAKIZASHI)
-            CSQC_WAKIZASHI_HUD();
-        else if(hud == HUD_RAPTOR)
-            CSQC_RAPTOR_HUD();
-        else if(hud == HUD_BUMBLEBEE)
-            CSQC_BUMBLE_HUD();
-        else if(hud == HUD_BUMBLEBEE_GUN)
-            CSQC_BUMBLE_GUN_HUD();
-    }
-
-       cl_notice_run();
-
-       // let's reset the view back to normal for the end
-       setproperty(VF_MIN, '0 0 0');
-       setproperty(VF_SIZE, '1 0 0' * w + '0 1 0' * h);
-}
-
-
-void CSQC_common_hud(void)
-{
-       if(!(gametype == MAPINFO_TYPE_RACE || gametype == MAPINFO_TYPE_CTS))
-               Accuracy_LoadLevels();
-
-       HUD_Main(); // always run these functions for alpha checks
-       HUD_DrawScoreboard();
-
-       if (scoreboard_active) // scoreboard/accuracy
-               HUD_Reset();
-       else if (intermission == 2) // map voting screen
-       {
-               MapVote_Draw();
-               HUD_Reset();
-       }
-}
-
-
-// following vectors must be global to allow seamless switching between camera modes
-vector camera_offset, current_camera_offset, mouse_angles, current_angles, current_origin, current_position;
-void CSQC_Demo_Camera()
-{
-       float speed, attenuation, dimensions;
-       vector tmp, delta;
-
-       if( autocvar_camera_reset || !camera_mode )
-       {
-               camera_offset = '0 0 0';
-               current_angles = '0 0 0';
-               camera_direction = '0 0 0';
-               camera_offset_z += 30;
-               camera_offset_x += 30 * -cos(current_angles_y * DEG2RAD);
-               camera_offset_y += 30 * -sin(current_angles_y * DEG2RAD);
-               current_origin = view_origin;
-               current_camera_offset  = camera_offset;
-               cvar_set("camera_reset", "0");
-               camera_mode = CAMERA_CHASE;
-       }
-
-       // Camera angles
-       if( camera_roll )
-               mouse_angles_z += camera_roll * autocvar_camera_speed_roll;
-
-       if(autocvar_camera_look_player)
-       {
-               vector dir;
-               float n;
-
-               dir = normalize(view_origin - current_position);
-               n = mouse_angles_z;
-               mouse_angles = vectoangles(dir);
-               mouse_angles_x = mouse_angles_x * -1;
-               mouse_angles_z = n;
-       }
-       else
-       {
-               tmp = getmousepos() * 0.1;
-               if(vlen(tmp)>autocvar_camera_mouse_threshold)
-               {
-                       mouse_angles_x += tmp_y * cos(mouse_angles_z * DEG2RAD) + (tmp_x * sin(mouse_angles_z * DEG2RAD));
-                       mouse_angles_y -= tmp_x * cos(mouse_angles_z * DEG2RAD) + (tmp_y * -sin(mouse_angles_z * DEG2RAD));
-               }
-       }
-
-       while (mouse_angles_x < -180) mouse_angles_x = mouse_angles_x + 360;
-       while (mouse_angles_x > 180) mouse_angles_x = mouse_angles_x - 360;
-       while (mouse_angles_y < -180) mouse_angles_y = mouse_angles_y + 360;
-       while (mouse_angles_y > 180) mouse_angles_y = mouse_angles_y - 360;
-
-       // Fix difference when angles don't have the same sign
-       delta = '0 0 0';
-       if(mouse_angles_y < -60 && current_angles_y > 60)
-               delta = '0 360 0';
-       if(mouse_angles_y > 60 && current_angles_y < -60)
-               delta = '0 -360 0';
-
-       if(autocvar_camera_look_player)
-               attenuation = autocvar_camera_look_attenuation;
-       else
-               attenuation = autocvar_camera_speed_attenuation;
-
-       attenuation = 1 / max(1, attenuation);
-       current_angles += (mouse_angles - current_angles + delta) * attenuation;
-
-       while (current_angles_x < -180) current_angles_x = current_angles_x + 360;
-       while (current_angles_x > 180) current_angles_x = current_angles_x - 360;
-       while (current_angles_y < -180) current_angles_y = current_an