Merge branch 'master' into terencehill/misc_bugfixes

[xonotic/xonotic-data.pk3dir.git] / defaultXonotic.cfg

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 7a5779c74dc5aef419df6f60c792208567b8fc0b..b42917ba07a7534ed1bacdb84ee0d6316faa7405 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -504,7 +504,6 @@ set g_laserguided_missile 0 "if set to 1 the rockets of the rocket launcher can
 set g_midair 0 "if set to 1 you can only apply damage to your opponent while he is airborne"
 set g_midair_shieldtime 0.3 "number of seconds you are still invincible since you lost contact to the ground"
 set g_spawnsound 1 "set to 0 if you don't want to hear the spawn sound when a player spawns"
-set g_spawnpoints_autodrop 0 "if set to 1, automatically drop spawn point locations if they were placed too high"
 set g_spawnpoints_auto_move_out_of_solid 0 "if set to 1 you will see a warning if a spawn point was placed inside a solid"
 set g_forced_respawn 0 "if set to 1 and a player died, that player gets automatically respawned once <g_respawn_delay> seconds are over"
 set g_fullbrightplayers 0 "brightens up player models (note that the color, skin or model of the players does not change!)"
@@ -916,10 +915,10 @@ alias sv_restart "say \"Server will restart at the end of the match, you will al
 // aliases:
 alias +fire +attack
 alias -fire -attack
-alias +fire2 +attack2
-alias -fire2 -attack2
-alias +attack2 +button3
-alias -attack2 -button3
+alias +fire2 +button3
+alias -fire2 -button3
+alias +attack2 +button3 // old alias from Nexuiz
+alias -attack2 -button3 // old alias name from Nexuiz
 alias +zoom +button4
 alias -zoom -button4
 alias +crouch +button5
@@ -1376,7 +1375,7 @@ set timelimit_increment 5
 set timelimit_decrement 5
 set timelimit_min 5
 set timelimit_max 60
-alias extendmatchtime "sv_cmd rpn /timelimit timelimit timelimit_max timelimit timelimit_increment add bound def"
+alias extendmatchtime "sv_cmd rpn /timelimit timelimit timelimit_max 0 timelimit when timelimit timelimit_increment add bound def"
 alias reducematchtime "sv_cmd rpn /timelimit timelimit timelimit_decrement sub timelimit_min timelimit bound def"
 alias endmatch "timelimit -1"
 
@@ -1501,24 +1500,6 @@ seta cl_weaponpriority8 "" "use impulse 208 for prev gun from this list, 218 for
 seta cl_weaponpriority9 "" "use impulse 209 for prev gun from this list, 219 for best gun, 229 for next gun"
 seta cl_weaponimpulsemode 0 "0: only cycle between currently usable weapons in weapon priority order; 1: cycle between all possible weapons on a key in weapon priority order"
 
-seta cl_swapattacks_tuba 0
-seta cl_swapattacks_laser 0
-seta cl_swapattacks_shotgun 0
-seta cl_swapattacks_uzi 0
-seta cl_swapattacks_campingrifle 0
-seta cl_swapattacks_grenadelauncher 0
-seta cl_swapattacks_electro 0
-seta cl_swapattacks_hlac 0
-seta cl_swapattacks_crylink 0
-seta cl_swapattacks_minstanex 0
-seta cl_swapattacks_nex 0
-seta cl_swapattacks_hagar 0
-seta cl_swapattacks_seeker 0
-seta cl_swapattacks_fireball 0
-seta cl_swapattacks_rocketlauncher 0
-seta cl_swapattacks_hook 0
-seta cl_swapattacks_porto 0
-
 seta sv_status_privacy 1       "hide IP addresses from \"status\" replies shown to clients"
 
 set g_maplist_allow_hidden 0           "allow hidden maps to be, e.g., voted for and in the maplist"
@@ -1538,11 +1519,6 @@ alias _gl_flashblend_update_01 "gl_flashblend 0"
 alias _gl_flashblend_update_11 "gl_flashblend 0"
 alias gl_flashblend_update "_gl_flashblend_update_$r_shadow_realtime_dlight$r_showsurfaces"
 
-alias firing_swap "" // this script is located in its own config file
-
-// this hook activates when we switch weapons, and allows us to script weapon specific properties (like the fire button swapping script)
-alias cl_hook_activeweapon "firing_swap $1"
-
 set sv_clones 0        "number of clones a player may make (reset by the \"kill\" command)"
 
 set cl_handicap 1      "the higher, the more damage you will receive (client setting)"
@@ -1721,7 +1697,7 @@ alias cl_hook_gamestart_rc
 alias cl_hook_gamestart_nexball
 alias cl_hook_gamestart_cts
 alias cl_hook_gameend
-//alias cl_hook_activeweapon
+alias cl_hook_activeweapon
 
 alias _sv_hook_gamestart "set _sv_hook_gametype $1; _sv_hook_gamestart_stage2"
 alias _sv_hook_gamestart_stage2 "sv_hook_gamestart_all; sv_hook_gamestart_${_sv_hook_gametype}"