From 1c458eaae6b3923322f9b4e9e439d6f24cde672a Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Fri, 8 Mar 2019 22:41:17 +0200 Subject: [PATCH] Replace button14 with button12 for minigame state --- qcsrc/client/main.qc | 2 +- qcsrc/client/view.qc | 4 ++-- qcsrc/common/physics/player.qh | 2 +- qcsrc/server/client.qc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 96b3caa75..6cee9dfcb 100644 --- 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 5efd863bd..be4b8f4a9 100644 --- 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 9ecf7eab7..97a422423 100644 --- 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 f8d105645..55d47dbba 100644 --- 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?! -- 2.39.2