Replace button14 with button12 for minigame state

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 96b3caa75e3b8efbe5585da89e65ff85de0b4399..6cee9dfcbc4112cdea55e728862c72ab8e333741 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);

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 5efd863bd6a54d7ef864b55f4f5ed6c59fbbee09..be4b8f4a9674071b287b0e535b0b157b3a609120 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -2021,13 +2021,13 @@ void CSQC_UpdateView(entity this, float w, float h)
        {
                if(!minigame_wasactive)
                {
-                       localcmd("+button14\n");
+                       localcmd("+button12\n");
                        minigame_wasactive = true;
                }
        }
        else if(minigame_wasactive)
        {
-               localcmd("-button14\n");
+               localcmd("-button12\n");
                minigame_wasactive = false;
        }
 

diff --git a/qcsrc/common/physics/player.qh b/qcsrc/common/physics/player.qh
index 9ecf7eab71ed436c9d5e51be8246b4818474440f..97a4224233e3c4c55f9b0a4d0b80b1b50a2e0d07 100644 (file)
--- a/qcsrc/common/physics/player.qh
+++ b/qcsrc/common/physics/player.qh
@@ -109,7 +109,7 @@ bool IsFlying(entity a);
 #define PHYS_INPUT_BUTTON_ZOOMSCRIPT(s)     PHYS_INPUT_BUTTON_BUTTON9(s)
 #define PHYS_INPUT_BUTTON_JETPACK(s)        PHYS_INPUT_BUTTON_BUTTON10(s)
 #define PHYS_INPUT_BUTTON_DODGE(s)                     PHYS_INPUT_BUTTON_BUTTON11(s)
-#define PHYS_INPUT_BUTTON_MINIGAME(s)          PHYS_INPUT_BUTTON_BUTTON14(s)
+#define PHYS_INPUT_BUTTON_MINIGAME(s)          PHYS_INPUT_BUTTON_BUTTON12(s)
 
 #ifdef CSQC
 STATIC_INIT(PHYS_INPUT_BUTTON)

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index f8d10564591b96aca42b9cb13a2d15595b5986d5..55d47dbba1dfec6e0d2bb6449ba1ef0665572716 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -3027,7 +3027,7 @@ void PM_UpdateButtons(entity this, entity store)
                store.impulse = this.impulse;
        this.impulse = 0;
 
-       bool typing = this.buttonchat || this.button14;
+       bool typing = this.buttonchat || this.button12;
 
        store.button0 = (typing) ? 0 : this.button0;
        //button1?!