aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'revert-953b6ad6' into 'develop'

Browse Source 
Revert "Add globalData.InInput to Keys.ts"

See merge request log-gtav/reallife-gamemode!17
This commit is contained in:
VegaZ
2020-06-06 17:39:29 +02:00
parent 953b6ad659 d3a71355c6
commit 1e57de278c
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ReallifeGamemode.Client/Player/keys.ts
View File

@@ -24,21 +24,21 @@ export default function keys(globalData: IGlobalData) {
//LEFT ARROW (Interaktion mit anderen Spielern) //LEFT ARROW (Interaktion mit anderen Spielern)
mp.keys.bind(0x25, false, function () { 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"); mp.events.callRemote("keyPress:LEFT_ARROW");
} }
}); });
//UP ARROW (Interaktion mit Spielwelt) //UP ARROW (Interaktion mit Spielwelt)
mp.keys.bind(0x26, false, function () { 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"); mp.events.callRemote("keyPress:UP_ARROW");
} }
}); });
//RIGHT ARROW (Fraktionsinteraktion) //RIGHT ARROW (Fraktionsinteraktion)
mp.keys.bind(0x27, false, function () { 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"); mp.events.callRemote("keyPress:RIGHT_ARROW");
} }
}); });
@@ -56,7 +56,7 @@ export default function keys(globalData: IGlobalData) {
//NUM2 //Save Blips in Edit Mode //NUM2 //Save Blips in Edit Mode
mp.keys.bind(0x62, false, function () { mp.keys.bind(0x62, false, function () {
if (!globalData.InChat && !globalData.InInput) { if (!globalData.InChat) {
mp.events.callRemote("keyPress:NUM2"); mp.events.callRemote("keyPress:NUM2");
} }
}); });
@@ -70,7 +70,7 @@ export default function keys(globalData: IGlobalData) {
//E //E
mp.keys.bind(0x45, false, function () { mp.keys.bind(0x45, false, function () {
if (!globalData.InChat && !globalData.InMenu && !globalData.InInput) { if (!globalData.InChat && !globalData.InMenu) {
mp.events.callRemote("keyPress:E"); mp.events.callRemote("keyPress:E");
} }
}); });
@@ -78,7 +78,7 @@ export default function keys(globalData: IGlobalData) {
//I //Inventar //I //Inventar
mp.keys.bind(0x49, false, function () { 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) { if (showInv === false) {
showInv = true; showInv = true;
} else { } else {
@@ -90,7 +90,7 @@ export default function keys(globalData: IGlobalData) {
//O //Spielerliste //O //Spielerliste
mp.keys.bind(0x4F, true, function () { 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.callRemote("keyPress:O");
//mp.events.call("showPlayerlist"); //mp.events.call("showPlayerlist");
} }
@@ -98,14 +98,14 @@ export default function keys(globalData: IGlobalData) {
//K //Dienstkleidung //K //Dienstkleidung
mp.keys.bind(0x4B, false, function () { mp.keys.bind(0x4B, false, function () {
if (!globalData.InChat && !globalData.InInput) { if (!globalData.InChat) {
mp.events.callRemote("keyPress:K"); mp.events.callRemote("keyPress:K");
} }
}); });
//L //Türen auf / zuschließen //L //Türen auf / zuschließen
mp.keys.bind(0x4C, false, function () { mp.keys.bind(0x4C, false, function () {
if (!globalData.InChat && !globalData.InInput) { if (!globalData.InChat) {
mp.events.callRemote("keyPress:L"); mp.events.callRemote("keyPress:L");
} }
}); });
@@ -119,7 +119,7 @@ export default function keys(globalData: IGlobalData) {
//N //Motor Starten //N //Motor Starten
mp.keys.bind(0x4E, false, function () { mp.keys.bind(0x4E, false, function () {
if (!globalData.InChat && !globalData.InInput) { if (!globalData.InChat) {
if (!player.vehicle) return; if (!player.vehicle) return;
if (player.vehicle.getSpeed() > 5) return; if (player.vehicle.getSpeed() > 5) return;
mp.events.callRemote("keyPress:N"); mp.events.callRemote("keyPress:N");
@@ -128,14 +128,14 @@ export default function keys(globalData: IGlobalData) {
//T //T
mp.keys.bind(0x54, false, function () { mp.keys.bind(0x54, false, function () {
if (!globalData.InChat && !globalData.InInput) { if (!globalData.InChat) {
globalData.InChat = true; globalData.InChat = true;
} }
}); });
//X // Fahrzeug Verwaltung - Menü //X // Fahrzeug Verwaltung - Menü
mp.keys.bind(0x58, false, function () { mp.keys.bind(0x58, false, function () {
if (!globalData.InChat && !globalData.InInput) { if (!globalData.InChat) {
mp.events.callRemote("keyPress:X"); mp.events.callRemote("keyPress:X");
} }
}); });