Merge branch 'master' into terencehill/translated_keys

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / main.qc

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index e32c0e8f57568bf4f63380368cab0570a2754874..c22f0d40274e82188c1c3c0451c02d2f3b49dcd2 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -226,7 +226,7 @@ void Shutdown()
 
        localcmd("\ncl_hook_shutdown\n");
 
-       localcmd("\n-button14\n");
+       localcmd("\n-button12\n");
 
        deactivate_minigame();
        HUD_MinigameMenu_Close(NULL, NULL, NULL);
@@ -801,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
@@ -1261,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