X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qc;h=c22f0d40274e82188c1c3c0451c02d2f3b49dcd2;hp=c0d56c7981326507803b618014c733c557adde09;hb=45d8904a100765555e622598a39967963733df1d;hpb=e3cce38a477f7cb7f6da52a1347c68c1bc55ea49

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index c0d56c798..c22f0d402 100644
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -140,6 +140,9 @@ void CSQC_Init()
 
 	registercvar("cl_spawn_near_teammate", "1");
 
+	registercvar("cl_weapon_switch_reload", "1");
+	registercvar("cl_weapon_switch_fallback_to_impulse", "1");
+
 	if(autocvar_cl_lockview)
 		cvar_set("cl_lockview", "0");
 
@@ -223,6 +226,8 @@ void Shutdown()
 
 	localcmd("\ncl_hook_shutdown\n");
 
+	localcmd("\n-button12\n");
+
 	deactivate_minigame();
 	HUD_MinigameMenu_Close(NULL, NULL, NULL);
 }
@@ -796,7 +801,7 @@ NET_HANDLE(ENT_CLIENT_SPAWNEVENT, bool is_new)
 // The only parameter reflects if the entity is "new" to the client, meaning it just came into the client's PVS.
 void CSQC_Ent_Update(entity this, bool isnew)
 {
-	this.sourceLoc = __FILE__ ":" STR(__LINE__);
+	this.sourceLoc = __FILE__":"STR(__LINE__);
 	int t = ReadByte();
 
 	// set up the "time" global for received entities to be correct for interpolation purposes
@@ -1256,6 +1261,8 @@ string _getcommandkey(string cmd_name, string command, bool forcename)
 				if(!joy_active && substring(key, 0, 3) == "JOY")
 					continue;
 
+				key = translate_key(key);
+
 				if (keys == "")
 					keys = key;
 				else