From d3a71355c6e2d73d470070f0096db148b8c5b36d Mon Sep 17 00:00:00 2001 From: VegaZ Date: Sat, 6 Jun 2020 17:38:45 +0200 Subject: [PATCH] Revert "Add globalData.InInput to Keys.ts" This reverts commit 953b6ad659416678d84d476f1331f5afadb86e50 --- ReallifeGamemode.Client/Player/keys.ts | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ReallifeGamemode.Client/Player/keys.ts b/ReallifeGamemode.Client/Player/keys.ts index 97f2fc74..2b6b06cb 100644 --- a/ReallifeGamemode.Client/Player/keys.ts +++ b/ReallifeGamemode.Client/Player/keys.ts @@ -24,21 +24,21 @@ export default function keys(globalData: IGlobalData) { //LEFT ARROW (Interaktion mit anderen Spielern) mp.keys.bind(0x25, false, function () { - if (!globalData.InChat && !showInv && !globalData.InMenu && !globalData.InInput) { + if (!globalData.InChat && !showInv && !globalData.InMenu) { mp.events.callRemote("keyPress:LEFT_ARROW"); } }); //UP ARROW (Interaktion mit Spielwelt) mp.keys.bind(0x26, false, function () { - if (!globalData.InChat && !showInv && !globalData.InMenu && !globalData.InInput) { + if (!globalData.InChat && !showInv && !globalData.InMenu) { mp.events.callRemote("keyPress:UP_ARROW"); } }); //RIGHT ARROW (Fraktionsinteraktion) mp.keys.bind(0x27, false, function () { - if (!globalData.InChat && !showInv && !globalData.InMenu && !globalData.InInput) { + if (!globalData.InChat && !showInv && !globalData.InMenu) { mp.events.callRemote("keyPress:RIGHT_ARROW"); } }); @@ -56,7 +56,7 @@ export default function keys(globalData: IGlobalData) { //NUM2 //Save Blips in Edit Mode mp.keys.bind(0x62, false, function () { - if (!globalData.InChat && !globalData.InInput) { + if (!globalData.InChat) { mp.events.callRemote("keyPress:NUM2"); } }); @@ -70,7 +70,7 @@ export default function keys(globalData: IGlobalData) { //E mp.keys.bind(0x45, false, function () { - if (!globalData.InChat && !globalData.InMenu && !globalData.InInput) { + if (!globalData.InChat && !globalData.InMenu) { mp.events.callRemote("keyPress:E"); } }); @@ -78,7 +78,7 @@ export default function keys(globalData: IGlobalData) { //I //Inventar mp.keys.bind(0x49, false, function () { - if (!globalData.InChat && !globalData.InTuning && !globalData.InMenu && !globalData.InInput) { + if (!globalData.InChat && !globalData.InTuning && !globalData.InMenu) { if (showInv === false) { showInv = true; } else { @@ -90,7 +90,7 @@ export default function keys(globalData: IGlobalData) { //O //Spielerliste mp.keys.bind(0x4F, true, function () { - if (!globalData.InChat && !globalData.InMenu && !globalData.InTuning && !showInv && !globalData.InInput) { + if (!globalData.InChat && !globalData.InMenu && !globalData.InTuning && !showInv) { mp.events.callRemote("keyPress:O"); //mp.events.call("showPlayerlist"); } @@ -98,14 +98,14 @@ export default function keys(globalData: IGlobalData) { //K //Dienstkleidung mp.keys.bind(0x4B, false, function () { - if (!globalData.InChat && !globalData.InInput) { + if (!globalData.InChat) { mp.events.callRemote("keyPress:K"); } }); //L //Türen auf / zuschließen mp.keys.bind(0x4C, false, function () { - if (!globalData.InChat && !globalData.InInput) { + if (!globalData.InChat) { mp.events.callRemote("keyPress:L"); } }); @@ -119,7 +119,7 @@ export default function keys(globalData: IGlobalData) { //N //Motor Starten mp.keys.bind(0x4E, false, function () { - if (!globalData.InChat && !globalData.InInput) { + if (!globalData.InChat) { if (!player.vehicle) return; if (player.vehicle.getSpeed() > 5) return; mp.events.callRemote("keyPress:N"); @@ -128,14 +128,14 @@ export default function keys(globalData: IGlobalData) { //T mp.keys.bind(0x54, false, function () { - if (!globalData.InChat && !globalData.InInput) { + if (!globalData.InChat) { globalData.InChat = true; } }); //X // Fahrzeug Verwaltung - Menü mp.keys.bind(0x58, false, function () { - if (!globalData.InChat && !globalData.InInput) { + if (!globalData.InChat) { mp.events.callRemote("keyPress:X"); } });