From 07da461a16b64a1418aa911116c4f3cc3770fdc4 Mon Sep 17 00:00:00 2001 From: Martin Taibr Date: Sat, 17 Feb 2018 18:15:38 +0100 Subject: [PATCH] rename all the configs --- default.cfg | 2 +- mutators.cfg | 2 +- qcsrc/client/teamradar.qc | 2 +- qcsrc/menu/xonotic/dialog_settings_misc_reset.qc | 2 +- defaultXDF.cfg => ruleset-XDF.cfg | 2 +- defaultXPM.cfg => ruleset-XPM.cfg | 2 +- defaultOverkill.cfg => ruleset-overkill.cfg | 2 +- ruleset-xonotic.cfg | 1 + defaultClient.cfg => xonotic-client.cfg | 0 defaultXonotic.cfg => xonotic-common.cfg | 4 ++-- defaultServer.cfg => xonotic-server.cfg | 2 +- 11 files changed, 11 insertions(+), 10 deletions(-) rename defaultXDF.cfg => ruleset-XDF.cfg (97%) rename defaultXPM.cfg => ruleset-XPM.cfg (96%) rename defaultOverkill.cfg => ruleset-overkill.cfg (98%) create mode 100644 ruleset-xonotic.cfg rename defaultClient.cfg => xonotic-client.cfg (100%) rename defaultXonotic.cfg => xonotic-common.cfg (99%) rename defaultServer.cfg => xonotic-server.cfg (99%) diff --git a/default.cfg b/default.cfg index 86b480827..931434697 100644 --- a/default.cfg +++ b/default.cfg @@ -1 +1 @@ -exec defaultXonotic.cfg +exec xonotic-common.cfg diff --git a/mutators.cfg b/mutators.cfg index 2fd56a49c..51ae3f140 100644 --- a/mutators.cfg +++ b/mutators.cfg @@ -54,7 +54,7 @@ set g_instagib_friendlypush 1 "allow pushing teammates with the vaporizer primar // ========== // overkill // ========== -set g_overkill 0 "internal cvar, to enable overkill, use `exec defaultOverkill.cfg`" +set g_overkill 0 "internal cvar, to enable overkill, use `exec ruleset-overkill.cfg`" set g_overkill_powerups_replace 1 set g_overkill_itemwaypoints 1 diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc index 7f1654de0..c6f8b8daa 100644 --- a/qcsrc/client/teamradar.qc +++ b/qcsrc/client/teamradar.qc @@ -187,7 +187,7 @@ void teamradar_loadcvars() hud_panel_radar_maximized_zoommode = autocvar_hud_panel_radar_maximized_zoommode; // others default to 0 - // match this to defaultXonotic.cfg! + // match this to default hud cfg file! if(!hud_panel_radar_scale) hud_panel_radar_scale = 4096; if(!hud_panel_radar_foreground_alpha) hud_panel_radar_foreground_alpha = 0.8 * panel_fg_alpha; if(!hud_panel_radar_size.x) hud_panel_radar_size.x = 128; diff --git a/qcsrc/menu/xonotic/dialog_settings_misc_reset.qc b/qcsrc/menu/xonotic/dialog_settings_misc_reset.qc index d3ba0e420..c0d064a7d 100644 --- a/qcsrc/menu/xonotic/dialog_settings_misc_reset.qc +++ b/qcsrc/menu/xonotic/dialog_settings_misc_reset.qc @@ -13,7 +13,7 @@ void XonoticResetDialog_fill(entity me) me.TD(me, 1, 2, makeXonoticTextLabel(0.5, _("This will create a backup config in your data directory"))); me.TR(me); me.TR(me); - me.TD(me, 1, 1, e = makeXonoticCommandButton(_("Yes"), '1 0 0', "saveconfig backup.cfg\n;\n exec defaultXonotic.cfg\n", 0)); + me.TD(me, 1, 1, e = makeXonoticCommandButton(_("Yes"), '1 0 0', "saveconfig backup.cfg\n;\n exec default.cfg\n", 0)); me.TD(me, 1, 1, e = makeXonoticButton(_("No"), '0 1 0')); e.onClick = Dialog_Close; e.onClickEntity = me; diff --git a/defaultXDF.cfg b/ruleset-XDF.cfg similarity index 97% rename from defaultXDF.cfg rename to ruleset-XDF.cfg index d504b2a61..b37f01dcf 100644 --- a/defaultXDF.cfg +++ b/ruleset-XDF.cfg @@ -2,7 +2,7 @@ // Xonotic Defrag // ================ -exec defaultServer.cfg +exec xonotic-server.cfg exec balance-xdf.cfg exec physicsXDF.cfg diff --git a/defaultXPM.cfg b/ruleset-XPM.cfg similarity index 96% rename from defaultXPM.cfg rename to ruleset-XPM.cfg index fd3449763..f3607bb2f 100644 --- a/defaultXPM.cfg +++ b/ruleset-XPM.cfg @@ -2,7 +2,7 @@ // Xonotic Pro-Mode // ================== -exec defaultServer.cfg +exec xonotic-server.cfg exec balance-xpm.cfg // general gameplay diff --git a/defaultOverkill.cfg b/ruleset-overkill.cfg similarity index 98% rename from defaultOverkill.cfg rename to ruleset-overkill.cfg index f63f689f3..49eb730c9 100644 --- a/defaultOverkill.cfg +++ b/ruleset-overkill.cfg @@ -2,7 +2,7 @@ // Overkill Mod // ============== -exec defaultServer.cfg +exec xonotic-server.cfg exec balance-overkill.cfg exec physicsOverkill.cfg diff --git a/ruleset-xonotic.cfg b/ruleset-xonotic.cfg new file mode 100644 index 000000000..7915766dc --- /dev/null +++ b/ruleset-xonotic.cfg @@ -0,0 +1 @@ +exec xonotic-server.cfg diff --git a/defaultClient.cfg b/xonotic-client.cfg similarity index 100% rename from defaultClient.cfg rename to xonotic-client.cfg diff --git a/defaultXonotic.cfg b/xonotic-common.cfg similarity index 99% rename from defaultXonotic.cfg rename to xonotic-common.cfg index bac826e80..078fbed74 100644 --- a/defaultXonotic.cfg +++ b/xonotic-common.cfg @@ -24,8 +24,8 @@ gameversion_max 65535 // git builds see all versions seta g_configversion 0 "Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1 Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg" -exec defaultClient.cfg -exec defaultServer.cfg +exec xonotic-client.cfg +exec xonotic-server.cfg set ekg 0 "Throw huge amounts of gibs" diff --git a/defaultServer.cfg b/xonotic-server.cfg similarity index 99% rename from defaultServer.cfg rename to xonotic-server.cfg index f9609e346..09f9702da 100644 --- a/defaultServer.cfg +++ b/xonotic-server.cfg @@ -1,6 +1,6 @@ // this should reset most cvars and aliases affecting gameplay to their defaults // note that it doesn't reset all server cvars, -// some are shared with the client and so are left in defaultXonotic.cfg +// some are shared with the client and so are left in xonotic-common.cfg // taunts and voices -- 2.39.2