fix double nativeui menu on vehicle menu door manager

This commit is contained in:
hydrant
2019-05-11 23:02:04 +02:00
parent 486af89f29
commit ececdcfdba
2 changed files with 8 additions and 6 deletions

View File

@@ -6,10 +6,8 @@ const UIMenuListItem = NativeUI.UIMenuListItem;
const Point = NativeUI.Point; const Point = NativeUI.Point;
const ItemsCollection = NativeUI.ItemsCollection; const ItemsCollection = NativeUI.ItemsCollection;
export default function vehicleMenu() { export default function vehicleMenu(globalData: GlobalData) {
let menuBrowser: BrowserMp = null;
let menuBrowser = null;
mp.events.add('ToggleVehicleMenu', () => { mp.events.add('ToggleVehicleMenu', () => {
if (menuBrowser !== null) { if (menuBrowser !== null) {
@@ -30,7 +28,6 @@ export default function vehicleMenu() {
}); });
mp.events.add('doAction', (action) => { mp.events.add('doAction', (action) => {
mp.events.call('ToggleVehicleMenu');
switch (action) { switch (action) {
case 8: // Motor case 8: // Motor
mp.events.callRemote("VehicleMenu_ToggleEngine"); mp.events.callRemote("VehicleMenu_ToggleEngine");
@@ -43,11 +40,15 @@ export default function vehicleMenu() {
break; break;
case 7: // Parken case 7: // Parken
mp.events.callRemote("CLIENT:VehicleMenu_ParkCar"); mp.events.callRemote("CLIENT:VehicleMenu_ParkCar");
break;
} }
mp.events.call('ToggleVehicleMenu');
}); });
function showDoorsMenu() { function showDoorsMenu() {
mp.gui.chat.show(false); mp.gui.chat.show(false);
globalData.InMenu = true;
var doorMenu = new Menu("Türen", "Türen verwalten", new Point(50, 50), null, null); 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(() => { doorMenu.MenuClose.on(() => {
mp.gui.chat.show(true); mp.gui.chat.show(true);
globalData.InMenu = false;
}); });
doorMenu.Open(); doorMenu.Open();

View File

@@ -59,7 +59,7 @@ import inventory from './Gui/Inventory/inventory';
inventory(globalData); inventory(globalData);
import vehicleMenu from './Gui/vehiclemenu/main'; import vehicleMenu from './Gui/vehiclemenu/main';
vehicleMenu(); vehicleMenu(globalData);
import interiors from './Gui/interiors'; import interiors from './Gui/interiors';
interiors(globalData); interiors(globalData);