More commands.cfg conversions and updates

diff --git a/commands.cfg b/commands.cfg
index d03f68c5380183b6db8b0a8b1cfdd4c3248c2818..f3654833262fc515661795f1acc15581639dfcbf 100644 (file)
--- a/commands.cfg
+++ b/commands.cfg
@@ -57,6 +57,7 @@ alias addvote "qc_cmd addtolist sv_vote_commands ${* ?}"
 // ========================
 alias bsp "ls maps/*.bsp"
 alias chmap "changelevel ${* ?}"
+alias clearmap "disconnect"
 alias rec "record demos/${1 !}"
 alias ply "playdemo $1"
 alias tdem "timedemo $1"
@@ -65,7 +66,7 @@ alias sv_restart "say \"Server will restart at the end of the match, you will al
 
 
 // ===============================================
-//  menu_cmd (menu command) - menu/gamecommand.qc
+//  menu_cmd (menu command) - menu/command/menu_cmd.qc
 // ===============================================
 alias menu_showteamselect "menu_cmd directmenu TeamSelect"
 alias menu_showhudexit "menu_cmd directmenu HUDExit"
@@ -78,12 +79,27 @@ alias _menu_loadmap_prepare_maxpl "maxplayers $_menu_loadmap_maxplayers"
 alias menu_loadmap_prepare "disconnect; wait; g_campaign 0; menu_cmd rpn /_menu_loadmap_maxplayers menu_maxplayers minplayers bot_number 1 add max max def; _menu_loadmap_prepare_maxpl; g_maplist_shufflenow"
 
 
-// ============================================================
-//  cl_cmd (client console command) - client/command/cl_cmd.qc
-// ============================================================
-alias radar "cl_cmd hud radar"
-alias scoreboard_columns_set "cl_cmd hud scoreboard_columns_set ${* ?}"
-alias scoreboard_columns_help "cl_cmd hud scoreboard_columns_help ${* ?}"
+// ==========================================================
+//  cl_cmd (client local command) - client/command/cl_cmd.qc
+// ==========================================================
+// commented out commands are really only intended for internal use
+if_client alias blurtest "cl_cmd blurtest"
+if_client alias debugmodel "cl_cmd debugmodel ${* ?}"
+//if_client alias handlevote "cl_cmd handlevote ${* ?}"
+if_client alias hud "cl_cmd hud ${* ?}"
+//if_client alias mv_download "cl_cmd mv_download ${* ?}"
+if_client alias sendcvar "cl_cmd sendcvar ${* ?}"
+//if_client alias settemp "cl_cmd settemp ${* ?}"
+
+// other aliases for local commands
+if_client alias hud_configure "cl_cmd hud configure"
+if_client alias hud_save "cl_cmd hud save ${* ?}"
+if_client alias radar "cl_cmd hud radar ${* ?}"
+if_client alias scoreboard_columns_help "cl_cmd hud scoreboard_columns_help"
+if_client alias scoreboard_columns_set "cl_cmd hud scoreboard_columns_set ${* ?}"
+
+// changes a cvar and reports it to the server (for the client to notify the server about changes)
+alias setreport "set \"$1\" \"$2\" ; sendcvar \"$1\""
 
 
 // ========================================================

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 9abdd15027a34eb73ff6835bb90438abee8a144d..d07603b6b692e7b7b009e11f8abd75b021976509 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -22,10 +22,6 @@ gameversion_max 65535 // git builds see all versions
 //   gameversion_min = (gameversion / 100) * 100 - 100
 //   gameversion_max = (gameversion / 100) * 100 + 199
 
-// changes a cvar and reports it to the server (for the menu to notify the
-// server about changes)
-alias setreport "set \"$1\" \"$2\" ; sendcvar \"$1\""
-
 seta cl_firststart "" "how many times the client has been run"
 seta cl_startcount 0 "how many times the client has been run"
 
@@ -542,8 +538,6 @@ set g_botclip_collisions 1 "0 = disable collision testing against botclips, migh
 
 set welcome_message_time 8
 
-alias clearmap "disconnect"
-
 set g_grappling_hook 0 "let players spawn with the grappling hook which allows them to pull themselves up"
 
 set g_invincible_projectiles 0 "set to 1 to disable any damage to projectiles in all balance configs, regardless of g_projectiles_damage"
@@ -1651,9 +1645,6 @@ set cl_effects_lightningarc_branchfactor_add 0.1
 set g_hitplots 0 "when set to 1, hitplots are stored by the server to provide a means of proving that a triggerbot was used"
 seta g_hitplots_individuals "" "the individuals, by IP, that should have their hitplots recorded"
 
-alias mute "prvm_edictset server $1 muted 1" // I am lazy and not making an actual command of this
-alias unmute "prvm_edictset server $1 muted 0" // dito
-
 set menu_updatecheck 1
 
 set bot_navigation_ignoreplayers 0 // FIXME remove this once the issue is solved