From ececdcfdba90f0e1673ede368978da888126b256 Mon Sep 17 00:00:00 2001 From: hydrant Date: Sat, 11 May 2019 23:02:04 +0200 Subject: [PATCH] fix double nativeui menu on vehicle menu door manager --- ReallifeGamemode.Client/Gui/vehiclemenu/main.ts | 12 +++++++----- ReallifeGamemode.Client/index.ts | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ReallifeGamemode.Client/Gui/vehiclemenu/main.ts b/ReallifeGamemode.Client/Gui/vehiclemenu/main.ts index ed30ef45..9a7a9e57 100644 --- a/ReallifeGamemode.Client/Gui/vehiclemenu/main.ts +++ b/ReallifeGamemode.Client/Gui/vehiclemenu/main.ts @@ -6,10 +6,8 @@ const UIMenuListItem = NativeUI.UIMenuListItem; const Point = NativeUI.Point; const ItemsCollection = NativeUI.ItemsCollection; -export default function vehicleMenu() { - - - let menuBrowser = null; +export default function vehicleMenu(globalData: GlobalData) { + let menuBrowser: BrowserMp = null; mp.events.add('ToggleVehicleMenu', () => { if (menuBrowser !== null) { @@ -30,7 +28,6 @@ export default function vehicleMenu() { }); mp.events.add('doAction', (action) => { - mp.events.call('ToggleVehicleMenu'); switch (action) { case 8: // Motor mp.events.callRemote("VehicleMenu_ToggleEngine"); @@ -43,11 +40,15 @@ export default function vehicleMenu() { break; case 7: // Parken mp.events.callRemote("CLIENT:VehicleMenu_ParkCar"); + break; } + + mp.events.call('ToggleVehicleMenu'); }); function showDoorsMenu() { mp.gui.chat.show(false); + globalData.InMenu = true; var doorMenu = new Menu("Türen", "Türen verwalten", new Point(50, 50), null, null); @@ -98,6 +99,7 @@ export default function vehicleMenu() { doorMenu.MenuClose.on(() => { mp.gui.chat.show(true); + globalData.InMenu = false; }); doorMenu.Open(); diff --git a/ReallifeGamemode.Client/index.ts b/ReallifeGamemode.Client/index.ts index c6fb7920..f8f3aef3 100644 --- a/ReallifeGamemode.Client/index.ts +++ b/ReallifeGamemode.Client/index.ts @@ -59,7 +59,7 @@ import inventory from './Gui/Inventory/inventory'; inventory(globalData); import vehicleMenu from './Gui/vehiclemenu/main'; -vehicleMenu(); +vehicleMenu(globalData); import interiors from './Gui/interiors'; interiors(globalData);