Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

ReallifeGamemode.Client/FactionManagement/main.ts

@@ -4,7 +4,7 @@
  * @copyright (c) 2008 - 2018 Life of German
  */
 
-export default function factionManagement() {
+export default function factionManagement(globalData: IGlobalData) {
 
     var manageFactionRanksBrowser = null;
     var rankData = null;
@@ -21,7 +21,7 @@ export default function factionManagement() {
             manageFactionRanksBrowser.execute(`setFactionName('${rankData.FactionName}')`);
             manageFactionRanksBrowser.execute(`loadData(` + JSON.stringify(rankData.Ranks) + `)`);
             mp.gui.cursor.show(true, true);
-            this.data.InMenu = true;
+            globalData.InMenu = true;
         }
     });
 
@@ -30,7 +30,7 @@ export default function factionManagement() {
             manageFactionRanksBrowser.destroy();
             mp.gui.cursor.show(false, false);
             mp.gui.chat.activate(true);
-            this.data.InMenu = false;
+            globalData.InMenu = false;
 
             var obj: FactionRanks = {
                 factionId: rankData.FactionId,

ReallifeGamemode.Client/index.ts

@@ -84,7 +84,7 @@ import doorManager from './DoorManager/doormanager';
 doorManager();
 
 import factionManagement from './FactionManagement/main';
-factionManagement();
+factionManagement(globalData);
 
 import deathScreen from './Gui/deathscreen';
 deathScreen();