From e110f6e1f5fe3454d9ab4115aa506741beb4d6b8 Mon Sep 17 00:00:00 2001 From: hydrant Date: Thu, 9 May 2019 17:52:49 +0200 Subject: [PATCH] fix some multiple menus --- ReallifeGamemode.Client/Business/cardealer.ts | 5 ++++- ReallifeGamemode.Client/Business/main.ts | 4 ++++ ReallifeGamemode.Client/index.ts | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ReallifeGamemode.Client/Business/cardealer.ts b/ReallifeGamemode.Client/Business/cardealer.ts index fa08456c..814e1b2e 100644 --- a/ReallifeGamemode.Client/Business/cardealer.ts +++ b/ReallifeGamemode.Client/Business/cardealer.ts @@ -12,7 +12,7 @@ const ListItem = NativeUI.ListItem; import moneyFormat from '../moneyformat'; -export default function carDealer() { +export default function carDealer(globalData: GlobalData) { var shopMenu: NativeUI.Menu; @@ -22,6 +22,8 @@ export default function carDealer() { mp.gui.chat.show(false); shopMenu = new Menu("Fahrzeugkauf", "Kaufe ein neues Auto", new Point(50, 50), null, null); + globalData.InMenu = true; + var carItem = new UIMenuItem("Fahrzeugname"); carItem.SetRightLabel(mp.game.ui.getLabelText(mp.game.vehicle.getDisplayNameFromVehicleModel(veh.model))); shopMenu.AddItem(carItem); @@ -60,6 +62,7 @@ export default function carDealer() { shopMenu.MenuClose.on(() => { mp.gui.chat.show(true); mp.players.local.taskLeaveVehicle(veh.handle, 0); + globalData.InMenu = false; }); shopMenu.Open(); diff --git a/ReallifeGamemode.Client/Business/main.ts b/ReallifeGamemode.Client/Business/main.ts index 6a5fb561..c1864ea9 100644 --- a/ReallifeGamemode.Client/Business/main.ts +++ b/ReallifeGamemode.Client/Business/main.ts @@ -59,6 +59,8 @@ export default function business(globalData: GlobalData) { mp.events.call('business_removeHelp', false); mp.gui.chat.show(false); + if (globalData.InChat || globalData.InInput || globalData.InMenu) return; + if (typeof mainMenu !== "undefined" && mainMenu.Visible) { return; } @@ -66,6 +68,7 @@ export default function business(globalData: GlobalData) { if (typeof bankMenu !== "undefined" && bankMenu.Visible) { return; } + globalData.InMenu = true; mainMenu = new Menu("Businessverwaltung", businessName, new Point(50, 50), null, null); @@ -142,6 +145,7 @@ export default function business(globalData: GlobalData) { mainMenu.MenuClose.on(() => { mp.events.call('business_removeHelp', false); + globalData.InMenu = false; }); } } \ No newline at end of file diff --git a/ReallifeGamemode.Client/index.ts b/ReallifeGamemode.Client/index.ts index b9e55fdf..912e1bcd 100644 --- a/ReallifeGamemode.Client/index.ts +++ b/ReallifeGamemode.Client/index.ts @@ -29,7 +29,7 @@ import business from './Business/main'; business(globalData); import cardealer from './Business/cardealer'; -cardealer(); +cardealer(globalData); import charCreator from './CharCreator/main'; charCreator();