initial minigame loading + ui stuff

thank you rockefeler

Minecraft.Client/Common/UI/UIController.h

@@ -1,425 +1,431 @@
-#pragma once
+#pragma once
-using namespace std;
+using namespace std;
-#include "IUIController.h"
+#include "IUIController.h"
-#include "UIEnums.h"
+#include "UIEnums.h"
-#include "UIGroup.h"
+#include "UIGroup.h"
-#include <random>
+#include <random>
-
+
-class UIAbstractBitmapFont;
+class UIAbstractBitmapFont;
-class UIBitmapFont;
+class UIBitmapFont;
-class UIUnicodeBitmapFont;
+class UIUnicodeBitmapFont;
-class UITTFFont;
+class UITTFFont;
-class UIComponent_DebugUIConsole;
+class UIComponent_DebugUIConsole;
-class UIComponent_DebugUIMarketingGuide;
+class UIComponent_DebugUIMarketingGuide;
-class UIControl;
+class UIControl;
-
+
-// Base class for all shared functions between UIControllers
+// Base class for all shared functions between UIControllers
-class UIController : public IUIController
+class UIController : public IUIController
-{
+{
-public:
+public:
-	static int64_t iggyAllocCount;
+	static int64_t iggyAllocCount;
-	bool toastOn = false;
+	bool toastOn = false;
-	// MGH - added to prevent crash loading Iggy movies while the skins were being reloaded
+	// MGH - added to prevent crash loading Iggy movies while the skins were being reloaded
-	static CRITICAL_SECTION ms_reloadSkinCS;
+	static CRITICAL_SECTION ms_reloadSkinCS;
-	static bool ms_bReloadSkinCSInitialised;
+	static bool ms_bReloadSkinCSInitialised;
-
+
-protected:
+protected:
-	UIComponent_DebugUIConsole *m_uiDebugConsole;
+	UIComponent_DebugUIConsole *m_uiDebugConsole;
-	UIComponent_DebugUIMarketingGuide *m_uiDebugMarketingGuide;
+	UIComponent_DebugUIMarketingGuide *m_uiDebugMarketingGuide;
-
+
-private:
+private:
-	CRITICAL_SECTION m_navigationLock;
+	CRITICAL_SECTION m_navigationLock;
-
+
-	static const int UI_REPEAT_KEY_DELAY_MS = 300; // How long from press until the first repeat
+	static const int UI_REPEAT_KEY_DELAY_MS = 300; // How long from press until the first repeat
-	static const int UI_REPEAT_KEY_REPEAT_RATE_MS = 100; // How long in between repeats
+	static const int UI_REPEAT_KEY_REPEAT_RATE_MS = 100; // How long in between repeats
-	DWORD m_actionRepeatTimer[XUSER_MAX_COUNT][ACTION_MAX_MENU+1];
+	DWORD m_actionRepeatTimer[XUSER_MAX_COUNT][ACTION_MAX_MENU+1];
-
+
-	float m_fScreenWidth;
+	float m_fScreenWidth;
-	float m_fScreenHeight;
+	float m_fScreenHeight;
-	bool m_bScreenWidthSetup;
+	bool m_bScreenWidthSetup;
-
+
-	S32 m_tileOriginX, m_tileOriginY;
+	S32 m_tileOriginX, m_tileOriginY;
-
+
-	enum EFont
+	enum EFont
-	{
+	{
-		eFont_NotLoaded = 0,
+		eFont_NotLoaded = 0,
-
+
-		eFont_Bitmap,
+		eFont_Bitmap,
-		eFont_Japanese,
+		eFont_Japanese,
-		eFont_SimpChinese,
+		eFont_SimpChinese,
-		eFont_TradChinese,
+		eFont_TradChinese,
-		eFont_Korean,
+		eFont_Korean,
-
+
-	};
+	};
-
+
-	// 4J-JEV: It's important that currentFont == targetFont, unless updateCurrentLanguage is going to be called.
+	// 4J-JEV: It's important that currentFont == targetFont, unless updateCurrentLanguage is going to be called.
-	EFont m_eCurrentFont, m_eTargetFont;
+	EFont m_eCurrentFont, m_eTargetFont;
-
+
-	// 4J-JEV: Behaves like navigateToHome when not ingame. When in-game, it closes all player scenes instead.
+	// 4J-JEV: Behaves like navigateToHome when not ingame. When in-game, it closes all player scenes instead.
-	bool m_bCleanupOnReload;
+	bool m_bCleanupOnReload;
-
+
-	EFont getFontForLanguage(int language);
+	EFont getFontForLanguage(int language);
-	UITTFFont *createFont(EFont fontLanguage);
+	UITTFFont *createFont(EFont fontLanguage);
-
+
-	UIAbstractBitmapFont *m_mcBitmapFont;
+	UIAbstractBitmapFont *m_mcBitmapFont;
-	UITTFFont *m_mcTTFFont;
+	UITTFFont *m_mcTTFFont;
-	UIBitmapFont *m_moj7, *m_moj11;
+	UIBitmapFont *m_moj7, *m_moj11;
-	UIUnicodeBitmapFont *m_unicodeBitmapFont;
+	UIUnicodeBitmapFont *m_unicodeBitmapFont;
-
+
-	std::mt19937 m_randomGenerator;
+	std::mt19937 m_randomGenerator;
-	std::uniform_real_distribution<float> m_randomDistribution;
+	std::uniform_real_distribution<float> m_randomDistribution;
-
+
-public:
+public:
-	void setCleanupOnReload();
+	void setCleanupOnReload();
-	void updateCurrentFont();
+	void updateCurrentFont();
-
+
-
+
-private:
+private:
-	// 4J-PB - ui element type for PSVita touch control
+	// 4J-PB - ui element type for PSVita touch control
-#ifdef __PSVITA__
+#ifdef __PSVITA__
-
+
-	typedef struct
+	typedef struct
-	{
+	{
-		UIControl *pControl;
+		UIControl *pControl;
-		S32 x1,y1,x2,y2;
+		S32 x1,y1,x2,y2;
-	}
+	}
-	UIELEMENT;
+	UIELEMENT;
-	// E3 - Fine for now, but we need to make this better!
+	// E3 - Fine for now, but we need to make this better!
-	vector<UIELEMENT *> m_TouchBoxes[eUIGroup_COUNT][eUILayer_COUNT][eUIScene_COUNT];
+	vector<UIELEMENT *> m_TouchBoxes[eUIGroup_COUNT][eUILayer_COUNT][eUIScene_COUNT];
-	bool m_bTouchscreenPressed;
+	bool m_bTouchscreenPressed;
-#endif
+#endif
-	// 4J Stu - These should be in the order that they reference each other (i.e. they can only reference one with a lower value in the enum)
+	// 4J Stu - These should be in the order that they reference each other (i.e. they can only reference one with a lower value in the enum)
-	enum ELibraries
+	enum ELibraries
-	{
+	{
-		eLibrary_Platform,
+		eLibrary_Platform,
-		eLibrary_GraphicsDefault,
+		eLibrary_GraphicsDefault,
-		eLibrary_GraphicsHUD,
+		eLibrary_GraphicsHUD,
-		eLibrary_GraphicsInGame,
+		eLibrary_GraphicsInGame,
-		eLibrary_GraphicsTooltips,
+		eLibrary_GraphicsTooltips,
-		eLibrary_GraphicsLabels,
+		eLibrary_GraphicsLabels,
-		eLibrary_Labels,
+		eLibrary_Labels,
-		eLibrary_InGame,
+		eLibrary_InGame,
-		eLibrary_HUD,
+		eLibrary_HUD,
-		eLibrary_Tooltips,
+		eLibrary_Tooltips,
-		eLibrary_Default,
+		eLibrary_Default,
-
+
-		eLibrary_LCDefault,
+		eLibrary_LCDefault,
-		eLibrary_LCInGame,
+		eLibrary_LCInGame,
-		eLibrary_LCGraphics,
+		eLibrary_LCGraphics,
-		eLibrary_LCLabels,
+		eLibrary_LCLabels,
-
+		eLibrary_LCGraphicsLabels,
-#if defined(_WINDOWS64)
+		eLibrary_LCGraphicsHud,
-		// Non-HD skin libraries needed by 720p/480p scene SWFs.
+		eLibrary_LCGraphicsInGame,
-		eLibraryFallback_Platform,
+		eLibrary_LCGraphicsTooltips,
-		eLibraryFallback_GraphicsDefault,
+		eLibrary_LCHud,
-		eLibraryFallback_GraphicsHUD,
+		eLibrary_LCTooltips,
-		eLibraryFallback_GraphicsInGame,
+
-		eLibraryFallback_GraphicsTooltips,
+#if defined(_WINDOWS64)
-		eLibraryFallback_GraphicsLabels,
+		// Non-HD skin libraries needed by 720p/480p scene SWFs.
-		eLibraryFallback_Labels,
+		eLibraryFallback_Platform,
-		eLibraryFallback_InGame,
+		eLibraryFallback_GraphicsDefault,
-		eLibraryFallback_HUD,
+		eLibraryFallback_GraphicsHUD,
-		eLibraryFallback_Tooltips,
+		eLibraryFallback_GraphicsInGame,
-		eLibraryFallback_Default,
+		eLibraryFallback_GraphicsTooltips,
-
+		eLibraryFallback_GraphicsLabels,
-		// Optional DR-specific HD libraries used by some 1080p menu SWFs.
+		eLibraryFallback_Labels,
-		// Keep these after the normal HD and fallback sets so they don't disturb
+		eLibraryFallback_InGame,
-		// existing references and can be loaded only when the files exist.
+		eLibraryFallback_HUD,
-		eLibraryDR_GraphicsDefault,
+		eLibraryFallback_Tooltips,
-		eLibraryDR_Labels,
+		eLibraryFallback_Default,
-		eLibraryDR_Default,
+
-#endif
+		// Optional DR-specific HD libraries used by some 1080p menu SWFs.
-
+		// Keep these after the normal HD and fallback sets so they don't disturb
-		eLibrary_Count,
+		// existing references and can be loaded only when the files exist.
-	};
+		eLibraryDR_GraphicsDefault,
-
+		eLibraryDR_Labels,
-	IggyLibrary m_iggyLibraries[eLibrary_Count];
+		eLibraryDR_Default,
-
+#endif
-protected:
+
-	GDrawFunctions *gdraw_funcs;
+		eLibrary_Count,
-
+	};
-private:
+
-	HIGGYEXP iggy_explorer;
+	IggyLibrary m_iggyLibraries[eLibrary_Count];
-	HIGGYPERFMON iggy_perfmon;
+
-	bool m_iggyPerfmonEnabled;
+protected:
-
+	GDrawFunctions *gdraw_funcs;
-	bool m_bMenuDisplayed[XUSER_MAX_COUNT]; // track each players menu displayed
+
-	bool m_bMenuToBeClosed[XUSER_MAX_COUNT]; // actioned at the end of the game loop
+private:
-	int m_iCountDown[XUSER_MAX_COUNT]; // ticks to block input
+	HIGGYEXP iggy_explorer;
-
+	HIGGYPERFMON iggy_perfmon;
-	bool m_bCloseAllScenes[eUIGroup_COUNT];
+	bool m_iggyPerfmonEnabled;
-
+
-	int	m_iPressStartQuadrantsMask;
+	bool m_bMenuDisplayed[XUSER_MAX_COUNT]; // track each players menu displayed
-
+	bool m_bMenuToBeClosed[XUSER_MAX_COUNT]; // actioned at the end of the game loop
-	C4JRender::eViewportType m_currentRenderViewport;
+	int m_iCountDown[XUSER_MAX_COUNT]; // ticks to block input
-	bool m_bCustomRenderPosition;
+
-
+	bool m_bCloseAllScenes[eUIGroup_COUNT];
-	static DWORD				m_dwTrialTimerLimitSecs;
+
-
+	int	m_iPressStartQuadrantsMask;
-	unordered_map<wstring, byteArray> m_substitutionTextures;
+
-
+	C4JRender::eViewportType m_currentRenderViewport;
-	typedef struct _CachedMovieData
+	bool m_bCustomRenderPosition;
-	{
+
-		byteArray m_ba;
+	static DWORD				m_dwTrialTimerLimitSecs;
-		int64_t m_expiry;
+
-	} CachedMovieData;
+	unordered_map<wstring, byteArray> m_substitutionTextures;
-	unordered_map<wstring, CachedMovieData> m_cachedMovieData;
+
-
+	typedef struct _CachedMovieData
-	typedef struct _QueuedMessageBoxData
+	{
-	{
+		byteArray m_ba;
-		MessageBoxInfo info;
+		int64_t m_expiry;
-		int iPad;
+	} CachedMovieData;
-		EUILayer layer;
+	unordered_map<wstring, CachedMovieData> m_cachedMovieData;
-	} QueuedMessageBoxData;
+
-	vector<QueuedMessageBoxData *> m_queuedMessageBoxData;
+	typedef struct _QueuedMessageBoxData
-
+	{
-	unsigned int m_winUserIndex;
+		MessageBoxInfo info;
-	EUIScene m_mouseDraggingSliderScene;
+		int iPad;
-	int m_mouseDraggingSliderId;
+		EUILayer layer;
-	bool m_mouseClickConsumedByScene;
+	} QueuedMessageBoxData;
-	bool m_bMouseHoverHorizontalList;
+	vector<QueuedMessageBoxData *> m_queuedMessageBoxData;
-	int m_lastHoverMouseX;
+
-	int m_lastHoverMouseY;
+	unsigned int m_winUserIndex;
-	//bool m_bSysUIShowing;
+	EUIScene m_mouseDraggingSliderScene;
-	bool m_bSystemUIShowing;
+	int m_mouseDraggingSliderId;
-	C4JThread *m_reloadSkinThread;
+	bool m_mouseClickConsumedByScene;
-	bool m_navigateToHomeOnReload;
+	bool m_bMouseHoverHorizontalList;
-	int m_accumulatedTicks;
+	int m_lastHoverMouseX;
-	uint64_t m_lastUiSfx; // Tracks time (ms) of last UI sound effect
+	int m_lastHoverMouseY;
-
+	//bool m_bSysUIShowing;
-	D3D11_RECT m_customRenderingClearRect;
+	bool m_bSystemUIShowing;
-
+	C4JThread *m_reloadSkinThread;
-	unordered_map<size_t, UIScene *> m_registeredCallbackScenes; // A collection of scenes and unique id's that are used in async callbacks so we can safely handle when they get destroyed
+	bool m_navigateToHomeOnReload;
-	CRITICAL_SECTION m_registeredCallbackScenesCS;;
+	int m_accumulatedTicks;
-
+	uint64_t m_lastUiSfx; // Tracks time (ms) of last UI sound effect
-public:
+
-	UIController();
+	D3D11_RECT m_customRenderingClearRect;
-#ifdef __PSVITA__
+
-	void TouchBoxAdd(UIControl *pControl,UIScene *pUIScene);
+	unordered_map<size_t, UIScene *> m_registeredCallbackScenes; // A collection of scenes and unique id's that are used in async callbacks so we can safely handle when they get destroyed
-	bool TouchBoxHit(UIScene *pUIScene,S32 x, S32 y);
+	CRITICAL_SECTION m_registeredCallbackScenesCS;;
-	void TouchBoxesClear(UIScene *pUIScene);
+
-	void TouchBoxRebuild(UIScene *pUIScene);
+public:
-
+	UIController();
-	void HandleTouchInput(unsigned int iPad, unsigned int key, bool bPressed, bool bRepeat, bool bReleased);
+#ifdef __PSVITA__
-	void SendTouchInput(unsigned int iPad, unsigned int key, bool bPressed, bool bRepeat, bool bReleased);
+	void TouchBoxAdd(UIControl *pControl,UIScene *pUIScene);
-
+	bool TouchBoxHit(UIScene *pUIScene,S32 x, S32 y);
-	private:
+	void TouchBoxesClear(UIScene *pUIScene);
-	void TouchBoxAdd(UIControl *pControl,EUIGroup eUIGroup,EUILayer eUILayer,EUIScene eUIscene, UIControl *pMainPanelControl);
+	void TouchBoxRebuild(UIScene *pUIScene);
-	UIELEMENT *m_ActiveUIElement;
+
-	UIELEMENT *m_HighlightedUIElement;
+	void HandleTouchInput(unsigned int iPad, unsigned int key, bool bPressed, bool bRepeat, bool bReleased);
-#endif
+	void SendTouchInput(unsigned int iPad, unsigned int key, bool bPressed, bool bRepeat, bool bReleased);
-
+
-protected:
+	private:
-	UIGroup *m_groups[eUIGroup_COUNT];
+	void TouchBoxAdd(UIControl *pControl,EUIGroup eUIGroup,EUILayer eUILayer,EUIScene eUIscene, UIControl *pMainPanelControl);
-
+	UIELEMENT *m_ActiveUIElement;
-public:
+	UIELEMENT *m_HighlightedUIElement;
-
+#endif
-	auto& getGroups() { return m_groups; }
+
-
+protected:
-	void showComponent(int iPad, EUIScene scene, EUILayer layer, EUIGroup group, bool show)
+	UIGroup *m_groups[eUIGroup_COUNT];
-	{
+
-		m_groups[group]->showComponent(iPad, scene, layer, show);
+public:
-	}
+
-
+	auto& getGroups() { return m_groups; }
-	void removeComponent(EUIScene scene, EUILayer layer, EUIGroup group)
+
-	{
+	void showComponent(int iPad, EUIScene scene, EUILayer layer, EUIGroup group, bool show)
-		m_groups[group]->removeComponent(scene, layer);
+	{
-	}
+		m_groups[group]->showComponent(iPad, scene, layer, show);
-
+	}
-protected:
+
-	// Should be called from the platforms init function
+	void removeComponent(EUIScene scene, EUILayer layer, EUIGroup group)
-	void preInit(S32 width, S32 height);
+	{
-	void postInit();
+		m_groups[group]->removeComponent(scene, layer);
-
+	}
-
+
-public:
+protected:
-	CRITICAL_SECTION m_Allocatorlock;
+	// Should be called from the platforms init function
-	void SetupFont();
+	void preInit(S32 width, S32 height);
-	bool PendingFontChange();
+	void postInit();
-	bool UsingBitmapFont();
+
-
+
-public:
+public:
-	// TICKING
+	CRITICAL_SECTION m_Allocatorlock;
-	virtual void tick();
+	void SetupFont();
-
+	bool PendingFontChange();
-private:
+	bool UsingBitmapFont();
-	void loadSkins();
+
-	IggyLibrary loadSkin(const wstring &skinPath, const wstring &skinName);
+public:
-
+	// TICKING
-public:
+	virtual void tick();
-	void ReloadSkin();
+
-	virtual void StartReloadSkinThread();
+private:
-	virtual bool IsReloadingSkin();
+	void loadSkins();
-	virtual bool IsExpectingOrReloadingSkin();
+	IggyLibrary loadSkin(const wstring &skinPath, const wstring &skinName);
-	virtual void CleanUpSkinReload();
+
-
+public:
-private:
+	void ReloadSkin();
-	static int reloadSkinThreadProc(void* lpParam);
+	virtual void StartReloadSkinThread();
-
+	virtual bool IsReloadingSkin();
-public:
+	virtual bool IsExpectingOrReloadingSkin();
-	byteArray getMovieData(const wstring &filename);
+	virtual void CleanUpSkinReload();
-
+
-	// INPUT
+private:
-private:
+	static int reloadSkinThreadProc(void* lpParam);
-	void tickInput();
+
-	void UpdateCursorIcon(UIControl *hitCtrl);
+public:
-	void handleInput();
+	byteArray getMovieData(const wstring &filename);
-	void handleKeyPress(unsigned int iPad, unsigned int key);
+
-
+	// INPUT
-protected:
+private:
-	static rrbool RADLINK ExternalFunctionCallback( void * user_callback_data , Iggy * player , IggyExternalFunctionCallUTF16 * call );
+	void tickInput();
-
+	void UpdateCursorIcon(UIControl *hitCtrl);
-public:
+	void handleInput();
-	// RENDERING
+	void handleKeyPress(unsigned int iPad, unsigned int key);
-	float getScreenWidth() { return m_fScreenWidth; }
+
-	float getScreenHeight() { return m_fScreenHeight; }
+protected:
-	void updateScreenSize(S32 w, S32 h) { m_fScreenWidth = (float)w; m_fScreenHeight = (float)h; app.DebugPrintf("[UI-INIT] updateScreenSize: %d x %d\n", w, h); }
+	static rrbool RADLINK ExternalFunctionCallback( void * user_callback_data , Iggy * player , IggyExternalFunctionCallUTF16 * call );
-
+
-	virtual void render() = 0;
+public:
-	void getRenderDimensions(C4JRender::eViewportType viewport, S32 &width, S32 &height);
+	// RENDERING
-	void setupRenderPosition(C4JRender::eViewportType viewport);
+	float getScreenWidth() { return m_fScreenWidth; }
-	void setupRenderPosition(S32 xOrigin, S32 yOrigin);
+	float getScreenHeight() { return m_fScreenHeight; }
-
+	void updateScreenSize(S32 w, S32 h) { m_fScreenWidth = (float)w; m_fScreenHeight = (float)h; app.DebugPrintf("[UI-INIT] updateScreenSize: %d x %d\n", w, h); }
-	void SetSysUIShowing(bool bVal);
+
-	static void SetSystemUIShowing(LPVOID lpParam,bool bVal);
+	virtual void render() = 0;
-
+	void getRenderDimensions(C4JRender::eViewportType viewport, S32 &width, S32 &height);
-protected:
+	void setupRenderPosition(C4JRender::eViewportType viewport);
-	virtual void setTileOrigin(S32 xPos, S32 yPos) = 0;
+	void setupRenderPosition(S32 xOrigin, S32 yOrigin);
-
+
-public:
+	void SetSysUIShowing(bool bVal);
-
+	static void SetSystemUIShowing(LPVOID lpParam,bool bVal);
-	virtual CustomDrawData *setupCustomDraw(UIScene *scene, IggyCustomDrawCallbackRegion *region) = 0;
+
-	virtual CustomDrawData *calculateCustomDraw(IggyCustomDrawCallbackRegion *region) = 0;
+protected:
-	virtual void endCustomDraw(IggyCustomDrawCallbackRegion *region) = 0;
+	virtual void setTileOrigin(S32 xPos, S32 yPos) = 0;
-protected:
+
-	// Should be called from the platforms render function
+public:
-	void renderScenes();
+
-
+	virtual CustomDrawData *setupCustomDraw(UIScene *scene, IggyCustomDrawCallbackRegion *region) = 0;
-public:
+	virtual CustomDrawData *calculateCustomDraw(IggyCustomDrawCallbackRegion *region) = 0;
-	virtual void beginIggyCustomDraw4J(IggyCustomDrawCallbackRegion *region, CustomDrawData *customDrawRegion) = 0;
+	virtual void endCustomDraw(IggyCustomDrawCallbackRegion *region) = 0;
-	void setupCustomDrawGameState();
+protected:
-	void endCustomDrawGameState();
+	// Should be called from the platforms render function
-	void setupCustomDrawMatrices(UIScene *scene, CustomDrawData *customDrawRegion);
+	void renderScenes();
-	void setupCustomDrawGameStateAndMatrices(UIScene *scene, CustomDrawData *customDrawRegion);
+
-	void endCustomDrawMatrices();
+public:
-	void endCustomDrawGameStateAndMatrices();
+	virtual void beginIggyCustomDraw4J(IggyCustomDrawCallbackRegion *region, CustomDrawData *customDrawRegion) = 0;
-
+	void setupCustomDrawGameState();
-protected:
+	void endCustomDrawGameState();
-
+	void setupCustomDrawMatrices(UIScene *scene, CustomDrawData *customDrawRegion);
-	static void RADLINK CustomDrawCallback(void *user_callback_data, Iggy *player, IggyCustomDrawCallbackRegion *Region);
+	void setupCustomDrawGameStateAndMatrices(UIScene *scene, CustomDrawData *customDrawRegion);
-	static GDrawTexture * RADLINK TextureSubstitutionCreateCallback( void * user_callback_data , IggyUTF16 * texture_name , S32 * width , S32 * height , void **destroy_callback_data );
+	void endCustomDrawMatrices();
-	static void RADLINK TextureSubstitutionDestroyCallback( void * user_callback_data , void * destroy_callback_data , GDrawTexture * handle );
+	void endCustomDrawGameStateAndMatrices();
-
+
-	virtual GDrawTexture *getSubstitutionTexture(int textureId) { return nullptr; }
+protected:
-	virtual void destroySubstitutionTexture(void *destroyCallBackData, GDrawTexture *handle) {}
+
-
+	static void RADLINK CustomDrawCallback(void *user_callback_data, Iggy *player, IggyCustomDrawCallbackRegion *Region);
-public:
+	static GDrawTexture * RADLINK TextureSubstitutionCreateCallback( void * user_callback_data , IggyUTF16 * texture_name , S32 * width , S32 * height , void **destroy_callback_data );
-	void registerSubstitutionTexture(const wstring &textureName, PBYTE pbData, DWORD dwLength);
+	static void RADLINK TextureSubstitutionDestroyCallback( void * user_callback_data , void * destroy_callback_data , GDrawTexture * handle );
-	void unregisterSubstitutionTexture(const wstring &textureName, bool deleteData);
+
-
+	virtual GDrawTexture *getSubstitutionTexture(int textureId) { return nullptr; }
-public:
+	virtual void destroySubstitutionTexture(void *destroyCallBackData, GDrawTexture *handle) {}
-	// NAVIGATION
+
-	bool NavigateToScene(int iPad, EUIScene scene, void *initData = nullptr, EUILayer layer = eUILayer_Scene, EUIGroup group = eUIGroup_PAD);
+public:
-	bool NavigateBack(int iPad, bool forceUsePad = false, EUIScene eScene = eUIScene_COUNT, EUILayer eLayer = eUILayer_COUNT);
+	void registerSubstitutionTexture(const wstring &textureName, PBYTE pbData, DWORD dwLength);
-	void NavigateToHomeMenu();
+	void unregisterSubstitutionTexture(const wstring &textureName, bool deleteData);
-	UIScene *GetTopScene(int iPad, EUILayer layer = eUILayer_Scene, EUIGroup group = eUIGroup_PAD);
+
-
+public:
-	size_t RegisterForCallbackId(UIScene *scene);
+	// NAVIGATION
-	void UnregisterCallbackId(size_t id);
+	bool NavigateToScene(int iPad, EUIScene scene, void *initData = nullptr, EUILayer layer = eUILayer_Scene, EUIGroup group = eUIGroup_PAD);
-	UIScene *GetSceneFromCallbackId(size_t id);
+	bool NavigateBack(int iPad, bool forceUsePad = false, EUIScene eScene = eUIScene_COUNT, EUILayer eLayer = eUILayer_COUNT);
-	void EnterCallbackIdCriticalSection();
+	void NavigateToHomeMenu();
-	void LeaveCallbackIdCriticalSection();
+	UIScene *GetTopScene(int iPad, EUILayer layer = eUILayer_Scene, EUIGroup group = eUIGroup_PAD);
-
+
-private:
+	size_t RegisterForCallbackId(UIScene *scene);
-	void setFullscreenMenuDisplayed(bool displayed);
+	void UnregisterCallbackId(size_t id);
-
+	UIScene *GetSceneFromCallbackId(size_t id);
-public:
+	void EnterCallbackIdCriticalSection();
-	void CloseAllPlayersScenes();
+	void LeaveCallbackIdCriticalSection();
-	void CloseUIScenes(int iPad, bool forceIPad = false);
+
-
+private:
-	virtual bool IsPauseMenuDisplayed(int iPad);
+	void setFullscreenMenuDisplayed(bool displayed);
-	virtual bool IsContainerMenuDisplayed(int iPad);
+
-	virtual bool IsIgnorePlayerJoinMenuDisplayed(int iPad);
+public:
-	virtual bool IsIgnoreAutosaveMenuDisplayed(int iPad);
+	void CloseAllPlayersScenes();
-	virtual void SetIgnoreAutosaveMenuDisplayed(int iPad, bool displayed);
+	void CloseUIScenes(int iPad, bool forceIPad = false);
-	virtual bool IsSceneInStack(int iPad, EUIScene eScene);
+
-	bool GetMenuDisplayed(int iPad);
+	virtual bool IsPauseMenuDisplayed(int iPad);
-	void SetMenuDisplayed(int iPad,bool bVal);
+	virtual bool IsContainerMenuDisplayed(int iPad);
-	virtual void CheckMenuDisplayed();
+	virtual bool IsIgnorePlayerJoinMenuDisplayed(int iPad);
-	void AnimateKeyPress(int iPad, int iAction, bool bRepeat, bool bPressed, bool bReleased);
+	virtual bool IsIgnoreAutosaveMenuDisplayed(int iPad);
-	void OverrideSFX(int iPad, int iAction,bool bVal);
+	virtual void SetIgnoreAutosaveMenuDisplayed(int iPad, bool displayed);
-
+	virtual bool IsSceneInStack(int iPad, EUIScene eScene);
-	// TOOLTIPS
+	bool GetMenuDisplayed(int iPad);
-	virtual void SetTooltipText( unsigned int iPad, unsigned int tooltip, int iTextID );
+	void SetMenuDisplayed(int iPad,bool bVal);
-	virtual void SetEnableTooltips( unsigned int iPad, BOOL bVal );
+	virtual void CheckMenuDisplayed();
-	virtual void ShowTooltip( unsigned int iPad, unsigned int tooltip, bool show );
+	void AnimateKeyPress(int iPad, int iAction, bool bRepeat, bool bPressed, bool bReleased);
-	virtual void SetTooltips( unsigned int iPad, int iA, int iB=-1, int iX=-1, int iY=-1 , int iLT=-1, int iRT=-1, int iLB=-1, int iRB=-1, int iLS=-1, int iRS=-1, int iBack=-1, bool forceUpdate = false);
+	void OverrideSFX(int iPad, int iAction,bool bVal);
-	virtual void EnableTooltip( unsigned int iPad, unsigned int tooltip, bool enable );
+
-	virtual void RefreshTooltips(unsigned int iPad);
+	// TOOLTIPS
-
+	virtual void SetTooltipText( unsigned int iPad, unsigned int tooltip, int iTextID );
-	virtual void PlayUISFX(ESoundEffect eSound);
+	virtual void SetEnableTooltips( unsigned int iPad, BOOL bVal );
-
+	virtual void ShowTooltip( unsigned int iPad, unsigned int tooltip, bool show );
-	virtual void DisplayGamertag(unsigned int iPad, bool show);
+	virtual void SetTooltips( unsigned int iPad, int iA, int iB=-1, int iX=-1, int iY=-1 , int iLT=-1, int iRT=-1, int iLB=-1, int iRB=-1, int iLS=-1, int iRS=-1, int iBack=-1, bool forceUpdate = false);
-	virtual void SetSelectedItem(unsigned int iPad, const wstring &name);
+	virtual void EnableTooltip( unsigned int iPad, unsigned int tooltip, bool enable );
-	virtual void UpdateSelectedItemPos(unsigned int iPad);
+	virtual void RefreshTooltips(unsigned int iPad);
-
+
-	virtual void HandleDLCMountingComplete();
+	virtual void PlayUISFX(ESoundEffect eSound);
-	virtual void HandleDLCInstalled(int iPad);
+
-#ifdef _XBOX_ONE
+	virtual void DisplayGamertag(unsigned int iPad, bool show);
-	virtual void HandleDLCLicenseChange();
+	virtual void SetSelectedItem(unsigned int iPad, const wstring &name);
-#endif
+	virtual void UpdateSelectedItemPos(unsigned int iPad);
-	virtual void HandleTMSDLCFileRetrieved(int iPad);
+
-	virtual void HandleTMSBanFileRetrieved(int iPad);
+	virtual void HandleDLCMountingComplete();
-	virtual void HandleInventoryUpdated(int iPad);
+	virtual void HandleDLCInstalled(int iPad);
-	virtual void HandleGameTick();
+#ifdef _XBOX_ONE
-
+	virtual void HandleDLCLicenseChange();
-	virtual void SetTutorial(int iPad, Tutorial *tutorial);
+#endif
-	virtual void SetTutorialDescription(int iPad, TutorialPopupInfo *info);
+	virtual void HandleTMSDLCFileRetrieved(int iPad);
-	virtual void RemoveInteractSceneReference(int iPad, UIScene *scene);
+	virtual void HandleTMSBanFileRetrieved(int iPad);
-	virtual void SetTutorialVisible(int iPad, bool visible);
+	virtual void HandleInventoryUpdated(int iPad);
-	virtual bool IsTutorialVisible(int iPad);
+	virtual void HandleGameTick();
-
+
-	virtual void UpdatePlayerBasePositions();
+	virtual void SetTutorial(int iPad, Tutorial *tutorial);
-	virtual void SetEmptyQuadrantLogo(int iSection);
+	virtual void SetTutorialDescription(int iPad, TutorialPopupInfo *info);
-	virtual void HideAllGameUIElements();
+	virtual void RemoveInteractSceneReference(int iPad, UIScene *scene);
-	virtual void ShowOtherPlayersBaseScene(unsigned int iPad, bool show);
+	virtual void SetTutorialVisible(int iPad, bool visible);
-
+	virtual bool IsTutorialVisible(int iPad);
-	virtual void ShowTrialTimer(bool show);
+
-	virtual void SetTrialTimerLimitSecs(unsigned int uiSeconds);
+	virtual void UpdatePlayerBasePositions();
-	virtual void UpdateTrialTimer(unsigned int iPad);
+	virtual void SetEmptyQuadrantLogo(int iSection);
-	virtual void ReduceTrialTimerValue();
+	virtual void HideAllGameUIElements();
-
+	virtual void ShowOtherPlayersBaseScene(unsigned int iPad, bool show);
-	virtual void ShowAutosaveCountdownTimer(bool show);
+
-	virtual void UpdateAutosaveCountdownTimer(unsigned int uiSeconds);
+	virtual void ShowTrialTimer(bool show);
-	virtual void ShowSavingMessage(unsigned int iPad, C4JStorage::ESavingMessage eVal);
+	virtual void SetTrialTimerLimitSecs(unsigned int uiSeconds);
-
+	virtual void UpdateTrialTimer(unsigned int iPad);
-	virtual void ShowPlayerDisplayname(bool show);
+	virtual void ReduceTrialTimerValue();
-	virtual bool PressStartPlaying(unsigned int iPad);
+
-	virtual void ShowPressStart(unsigned int iPad);
+	virtual void ShowAutosaveCountdownTimer(bool show);
-	virtual void HidePressStart();
+	virtual void UpdateAutosaveCountdownTimer(unsigned int uiSeconds);
-	void ShowAchievementToast(string achievementName, string achievementDescription, byteArray b, string achT = "");
+	virtual void ShowSavingMessage(unsigned int iPad, C4JStorage::ESavingMessage eVal);
-	void ClearPressStart();
+
-
+	virtual void ShowPlayerDisplayname(bool show);
-	virtual C4JStorage::EMessageResult RequestAlertMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=nullptr,LPVOID lpParam=nullptr, WCHAR *pwchFormatString=nullptr);
+	virtual bool PressStartPlaying(unsigned int iPad);
-	virtual C4JStorage::EMessageResult RequestErrorMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=nullptr,LPVOID lpParam=nullptr, WCHAR *pwchFormatString=nullptr);
+	virtual void ShowPressStart(unsigned int iPad);
-private:
+	virtual void HidePressStart();
-	virtual C4JStorage::EMessageResult RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad,int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, WCHAR *pwchFormatString,DWORD dwFocusButton, bool bIsError);
+	void ShowAchievementToast(string achievementName, string achievementDescription, byteArray b, string achT = "");
-
+	void ClearPressStart();
-public:
+
-	C4JStorage::EMessageResult RequestUGCMessageBox(UINT title = -1, UINT message = -1, int iPad = -1, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult) = nullptr, LPVOID lpParam = nullptr);
+	virtual C4JStorage::EMessageResult RequestAlertMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=nullptr,LPVOID lpParam=nullptr, WCHAR *pwchFormatString=nullptr);
-	C4JStorage::EMessageResult RequestContentRestrictedMessageBox(UINT title = -1, UINT message = -1, int iPad = -1, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult) = nullptr, LPVOID lpParam = nullptr);
+	virtual C4JStorage::EMessageResult RequestErrorMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=nullptr,LPVOID lpParam=nullptr, WCHAR *pwchFormatString=nullptr);
-
+private:
-	virtual void SetWinUserIndex(unsigned int iPad);
+	virtual C4JStorage::EMessageResult RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad,int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, WCHAR *pwchFormatString,DWORD dwFocusButton, bool bIsError);
-	unsigned int GetWinUserIndex();
+
-
+public:
-	virtual void ShowUIDebugConsole(bool show);
+	C4JStorage::EMessageResult RequestUGCMessageBox(UINT title = -1, UINT message = -1, int iPad = -1, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult) = nullptr, LPVOID lpParam = nullptr);
-	virtual void ShowUIDebugMarketingGuide(bool show);
+	C4JStorage::EMessageResult RequestContentRestrictedMessageBox(UINT title = -1, UINT message = -1, int iPad = -1, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult) = nullptr, LPVOID lpParam = nullptr);
-	void logDebugString(const string &text);
+
-	UIScene* FindScene(EUIScene sceneType);
+	virtual void SetWinUserIndex(unsigned int iPad);
-
+	unsigned int GetWinUserIndex();
-public:
+
-	char *m_defaultBuffer, *m_tempBuffer;
+	virtual void ShowUIDebugConsole(bool show);
-	void setFontCachingCalculationBuffer(int length);
+	virtual void ShowUIDebugMarketingGuide(bool show);
-
+	void logDebugString(const string &text);
-
+	UIScene* FindScene(EUIScene sceneType);
-};
+
+public:
+	char *m_defaultBuffer, *m_tempBuffer;
+	void setFontCachingCalculationBuffer(int length);
+
+
+};

Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp

@@ -6,12 +6,68 @@
 
 UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
+	LoadingInputParams *params = static_cast<LoadingInputParams *>(initData);
+
+	m_CompletionData = params->completionData;
+	m_iPad = params->completionData->iPad;
+	m_cancelFunc = params->cancelFunc;
+	m_cancelFuncParam = params->m_cancelFuncParam;
+	m_completeFunc = params->completeFunc;
+	m_completeFuncParam = params->m_completeFuncParam;
+
+	m_cancelText = params->cancelText;
+	m_bWasCancelled = false;
+	m_bWaitForThreadToDelete = params->waitForThreadToDelete;
+
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
+	if (m_CompletionData && m_CompletionData->bIsMinigame)
+	{
+		byteArray iconBytes = app.getArchiveFile(L"Graphics\\BattleModeIcon.png");
+		if (iconBytes.data && iconBytes.length > 0)
+		{
+			registerSubstitutionTexture(L"mini_game_battle", iconBytes.data, iconBytes.length, true);
+		}
+
+		IggyName funcSetType = registerFastName( L"SetLoadingScreenType" );
+		IggyDataValue result;
+		IggyDataValue value[1];
+		value[0].type = IGGY_DATATYPE_number;
+		value[0].number = 1.0;
+		IggyResult out = IggyPlayerCallMethodRS( getMovie(), &result, IggyPlayerRootPath( getMovie() ), funcSetType, 1, value );
+
+		// set the texture for the minigame logo inside the SWF dynamically
+		IggyValuePath gmIconPath;
+		if (IggyValuePathMakeNameRef(&gmIconPath, IggyPlayerRootPath(getMovie()), "GMIcon"))
+		{
+			// this is to make the logo smaller
+			// by default it looks huge
+			// 5.0 is the original scale 
+			IggyName nameScaleX = registerFastName(L"scaleX");
+			IggyName nameScaleY = registerFastName(L"scaleY");
+			IggyValueSetF64RS(&gmIconPath, nameScaleX, nullptr, 3.45);
+			IggyValueSetF64RS(&gmIconPath, nameScaleY, nullptr, 3.5);
+
+			IggyValuePath mgLogoPath;
+			if (IggyValuePathMakeNameRef(&mgLogoPath, &gmIconPath, "MG_Logo"))
+			{
+				IggyName funcSetTextureName = registerFastName(L"SetTextureName");
+				IggyDataValue resultLogo;
+				IggyDataValue valueLogo[1];
+				IggyStringUTF16 stringVal;
+				stringVal.string = (IggyUTF16*)L"mini_game_battle";
+				stringVal.length = wcslen(L"mini_game_battle");
+				valueLogo[0].type = IGGY_DATATYPE_string_UTF16;
+				valueLogo[0].string16 = stringVal;
+				IggyPlayerCallMethodRS(getMovie(), &resultLogo, &mgLogoPath, funcSetTextureName, 1, valueLogo);
+			}
+		}
+	}
+
 	parentLayer->addComponent(iPad,eUIComponent_Panorama);
 	parentLayer->addComponent(iPad,eUIComponent_Logo);
-	parentLayer->showComponent(iPad,eUIComponent_Logo,true);
+	parentLayer->showComponent(iPad,eUIComponent_Logo, true);
 	parentLayer->showComponent(iPad,eUIComponent_MenuBackground,false);
 
 	m_controlTimer.setVisible( false );
@@ -26,19 +82,6 @@ UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void *initData,
 	m_buttonConfirm.init( app.GetString( IDS_CONFIRM_OK ), eControl_Confirm );
 	m_buttonConfirm.setVisible(false);
 
-	LoadingInputParams *params = static_cast<LoadingInputParams *>(initData);
-
-	m_CompletionData = params->completionData;
-	m_iPad=params->completionData->iPad;
-	m_cancelFunc = params->cancelFunc;
-	m_cancelFuncParam = params->m_cancelFuncParam;
-	m_completeFunc = params->completeFunc;
-	m_completeFuncParam = params->m_completeFuncParam;
-
-	m_cancelText = params->cancelText;
-	m_bWasCancelled=false;
-	m_bWaitForThreadToDelete = params->waitForThreadToDelete;
-
 	// Clear the progress text
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 	pMinecraft->progressRenderer->progressStart(-1);

Minecraft.Client/Common/UI/UIScene_MinigamesCreateMenu.cpp

@@ -1,11 +1,34 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_MinigamesCreateMenu.h"
+#include "UIScene_FullscreenProgress.h"
 #include "../../Minecraft.h"
+#include "../../MinecraftServer.h"
+#include "../../../Minecraft.World/File.h"
+#include "../../../Minecraft.World/InputOutputStream.h"
+#include "../../TexturePackRepository.h"
 // mini gaimes menus By aRockefeler o aRockefort
 // string localization by Fireblade
 namespace
 {
+	LoadSaveDataThreadParam* LoadLobbySaveData()
+	{
+		File lobbySave(L"Windows64Media\\Lobby\\Lobby.mcs");
+		if (!lobbySave.exists())
+			lobbySave = File(L"Windows64\\Lobby\\Lobby.mcs");
+
+		if (!lobbySave.exists())
+			return nullptr;
+
+		int64_t fileSize = lobbySave.length();
+		FileInputStream fis(lobbySave);
+		byteArray ba(static_cast<unsigned int>(fileSize));
+		fis.read(ba);
+		fis.close();
+
+		return new LoadSaveDataThreadParam(ba.data, ba.length, lobbySave.getName());
+	}
+
 	const wchar_t* GetBattleModeLabel(int mode)
 	{
 		switch (mode)
@@ -385,13 +408,61 @@ void UIScene_MinigamesCreateMenu::checkStateAndStartGame()
 
 void UIScene_MinigamesCreateMenu::LaunchGame()
 {
-	// this is for debugging 
+	SyncBattleCheckboxStates();
-	// if the menu is already complete you can remove this
+	m_bIgnoreInput = true;
-	app.DebugPrintf("[MGDBG] MiniGamesCreateMenu Create pressed for type=%d mode=%d online=%d public=%d friends=%d invite=%d\n",
+
-		m_iMiniGameType,
+	LoadSaveDataThreadParam* saveData = LoadLobbySaveData();
-		m_iBattleModeSelection,
+	if (!saveData)
-		m_MoreOptionsParams.bOnlineGame ? 1 : 0,
+	{
-		m_bPublicGame ? 1 : 0,
+		app.DebugPrintf("[MGDBG] Failed to load Lobby.mcs (Windows64Media/Lobby).\n");
-		m_MoreOptionsParams.bAllowFriendsOfFriends ? 1 : 0,
+		m_bIgnoreInput = false;
-		m_MoreOptionsParams.bInviteOnly ? 1 : 0);
+		return;
+	}
+
+	app.SetTutorialMode(false);
+	StorageManager.ResetSaveData();
+	StorageManager.SetSaveTitle(L"Lobby");
+	app.SetAutosaveTimerTime();
+
+	app.SetGameHostOption(eGameHostOption_FriendsOfFriends, m_MoreOptionsParams.bAllowFriendsOfFriends);
+	app.SetGameHostOption(eGameHostOption_Gamertags, app.GetGameSettings(m_iPad, eGameSetting_GamertagsVisible) ? 1 : 0);
+	app.SetGameHostOption(eGameHostOption_PvP, m_MoreOptionsParams.bPVP);
+	app.SetGameHostOption(eGameHostOption_TrustPlayers, m_MoreOptionsParams.bTrust);
+	app.SetGameHostOption(eGameHostOption_FireSpreads, m_MoreOptionsParams.bFireSpreads);
+	app.SetGameHostOption(eGameHostOption_TNT, m_MoreOptionsParams.bTNT);
+	app.SetGameHostOption(eGameHostOption_HostCanFly, m_MoreOptionsParams.bHostPrivileges);
+	app.SetGameHostOption(eGameHostOption_HostCanChangeHunger, m_MoreOptionsParams.bHostPrivileges);
+	app.SetGameHostOption(eGameHostOption_HostCanBeInvisible, m_MoreOptionsParams.bHostPrivileges);
+	app.SetGameHostOption(eGameHostOption_WasntSaveOwner, false);
+
+	bool isClientSide = ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad())
+		&& m_MoreOptionsParams.bOnlineGame;
+	bool isPrivate = m_MoreOptionsParams.bInviteOnly ? true : false;
+
+	g_NetworkManager.HostGame(0, isClientSide, isPrivate, MINECRAFT_NET_MAX_PLAYERS, 0);
+
+#ifndef _XBOX
+	g_NetworkManager.FakeLocalPlayerJoined();
+#endif
+
+	NetworkGameInitData* param = new NetworkGameInitData();
+	param->seed = 0;
+	param->saveData = saveData;
+	param->settings = app.GetGameHostOption(eGameHostOption_All);
+	param->savePlatform = SAVE_FILE_PLATFORM_LOCAL;
+
+	LoadingInputParams* loadingParams = new LoadingInputParams();
+	loadingParams->func = &CGameNetworkManager::RunNetworkGameThreadProc;
+	loadingParams->lpParam = static_cast<LPVOID>(param);
+
+	UIFullscreenProgressCompletionData* completionData = new UIFullscreenProgressCompletionData();
+	completionData->bShowBackground = TRUE;
+	completionData->bShowLogo = TRUE;
+	completionData->bShowTips = TRUE;
+	completionData->type = e_ProgressCompletion_CloseAllPlayersUIScenes;
+	completionData->iPad = DEFAULT_XUI_MENU_USER;
+	completionData->bIsMinigame = TRUE;
+	loadingParams->completionData = completionData;
+
+	ui.NavigateToScene(m_iPad, eUIScene_FullscreenProgress, loadingParams);
 }

Minecraft.Client/Common/UI/UIScene_MinigamesMenu.cpp

@@ -28,8 +28,8 @@ UIScene_MinigamesMenu::UIScene_MinigamesMenu(int iPad, void *initData, UILayer *
 // here the code ask for the swf
 std::wstring UIScene_MinigamesMenu::getMoviePath()
 {
-	app.DebugPrintf("[MGDBG] UIScene_MinigamesMenu getMoviePath -> MiniGamesMenu\n");// and this is for debugging too
+	app.DebugPrintf("[MGDBG] UIScene_MinigamesMenu getMoviePath -> LoadCreateJoinMenu\n");// and this is for debugging too
-	return L"MiniGamesMenu";
+	return L"LoadCreateJoinMenu";
 }
 
 void UIScene_MinigamesMenu::ApplyMiniGamesLabels()

Minecraft.Client/Common/UI/UIStructs.h

@@ -218,6 +218,7 @@ typedef struct _UIFullscreenProgressCompletionData
 	BOOL bShowBackground;
 	BOOL bShowLogo;
 	BOOL bShowTips;
+	BOOL bIsMinigame;
 	ProgressionCompletionType type;
 	int iPad;
 	EUIScene scene;