From fcd8d260f9af94de42fa3daac5cca542efd4051e Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sat, 31 Jan 2015 20:47:23 +0100 Subject: [PATCH] Don't use the name "binds-default.cfg"! Names ending in "default.cfg" are magic to DarkPlaces, and lead to the engine cvar defaults getting locked. Fixes #1444, #1448. --- binds-default.cfg => binds-xonotic.cfg | 0 defaultXonotic.cfg | 2 +- qcsrc/menu/xonotic/keybinder.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename binds-default.cfg => binds-xonotic.cfg (100%) diff --git a/binds-default.cfg b/binds-xonotic.cfg similarity index 100% rename from binds-default.cfg rename to binds-xonotic.cfg diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 7f48414b6..dce01a75a 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -786,7 +786,7 @@ set g_banned_list_idmode "1" "when set, the IP banning system always uses the ID r_labelsprites_scale 0.40625 // labels sprites get displayed at 0.5x from 640x480 to 1280x1024, and at 1x from 1600x1200 onwards -exec binds-default.cfg +exec binds-xonotic.cfg // we must change its default from 1.0 to 1 to be consistent with menuqc set slowmo 1 diff --git a/qcsrc/menu/xonotic/keybinder.c b/qcsrc/menu/xonotic/keybinder.c index 272edd905..40218deaa 100644 --- a/qcsrc/menu/xonotic/keybinder.c +++ b/qcsrc/menu/xonotic/keybinder.c @@ -241,7 +241,7 @@ void KeyBinder_Bind_Clear(entity btn, entity me) void KeyBinder_Bind_Reset_All(entity btn, entity me) { localcmd("unbindall\n"); - localcmd("exec binds-default.cfg\n"); + localcmd("exec binds-xonotic.cfg\n"); localcmd("-zoom\n"); // to make sure we aren't in togglezoom'd state cvar_set("_hud_showbinds_reload", "1"); } -- 2.39.2