fix some multiple menus

This commit is contained in:
hydrant
2019-05-09 17:52:49 +02:00
parent 539d899ac9
commit e110f6e1f5
3 changed files with 9 additions and 2 deletions

View File

@@ -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();

View File

@@ -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;
});
}
}

View File

@@ -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();