Replace button14 with button12 for minigame state 639/head
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 8 Mar 2019 20:41:17 +0000 (22:41 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 8 Mar 2019 20:43:11 +0000 (22:43 +0200)
qcsrc/client/main.qc
qcsrc/client/view.qc
qcsrc/common/physics/player.qh
qcsrc/server/client.qc

index 96b3caa..6cee9df 100644 (file)
@@ -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);
index 5efd863..be4b8f4 100644 (file)
@@ -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;
        }
 
index 9ecf7ea..97a4224 100644 (file)
@@ -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)
index f8d1056..55d47db 100644 (file)
@@ -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?!