Merge branch 'main' of https://github.com/Foxify52/MinecraftConsoles

4 files changed, 30 insertions, 7 deletions

diff --git a/Minecraft.Client/Common/DLC/DLCPack.cpp b/Minecraft.Client/Common/DLC/DLCPack.cpp
index 23a2e44a..507e51a7 100644
--- a/Minecraft.Client/Common/DLC/DLCPack.cpp
+++ b/Minecraft.Client/Common/DLC/DLCPack.cpp
@@ -382,7 +382,10 @@ DWORD DLCPack::getFileIndexAt(DLCManager::EDLCType type, const wstring &path, bo
 
 bool DLCPack::hasPurchasedFile(DLCManager::EDLCType type, const wstring &path)
 {
-	if(type == DLCManager::e_DLCType_All)
+	// Patch all DLC to be "purchased"
+	return true;
+	
+	/*if(type == DLCManager::e_DLCType_All)
 	{
 		app.DebugPrintf("Unimplemented\n");
 #ifndef _CONTENT_PACKAGE
@@ -406,5 +409,5 @@ bool DLCPack::hasPurchasedFile(DLCManager::EDLCType type, const wstring &path)
 	{
 		//purchased
 		return true;
-	}
+	}*/
 }
diff --git a/Minecraft.Client/Common/DLC/DLCSkinFile.cpp b/Minecraft.Client/Common/DLC/DLCSkinFile.cpp
index f3768a34..c845acd9 100644
--- a/Minecraft.Client/Common/DLC/DLCSkinFile.cpp
+++ b/Minecraft.Client/Common/DLC/DLCSkinFile.cpp
@@ -205,7 +205,9 @@ bool DLCSkinFile::getParameterAsBool(DLCManager::EDLCParameterType type)
 	switch(type)
 	{
 	case DLCManager::e_DLCParamType_Free:
-		return m_bIsFree;
+		// Patch all DLC to be "paid"
+		return false;
+		// return m_bIsFree;
 	default:
 		return false;
 	}
diff --git a/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
index e2cbc2aa..1c07e540 100644
--- a/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
@@ -62,7 +62,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
 
 	LoadMenuInitData *params = (LoadMenuInitData *)initData;
 
-	//m_labelGameName.init(app.GetString(IDS_WORLD_NAME));
+	m_labelGameName.init(app.GetString(IDS_WORLD_NAME));
 	m_labelSeed.init(L"");
 	m_labelCreatedMode.init(app.GetString(IDS_CREATED_IN_SURVIVAL));
 
diff --git a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
index 6910dd65..bce5e34e 100644
--- a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
@@ -1249,7 +1249,13 @@ void UIScene_SkinSelectMenu::updatePackDisplay()
 	if(m_packIndex >= SKIN_SELECT_MAX_DEFAULTS)
 	{
 		DLCPack *thisPack = app.m_dlcManager.getPack(m_packIndex - SKIN_SELECT_MAX_DEFAULTS, DLCManager::e_DLCType_Skin);
-		setCentreLabel(thisPack->getName().c_str());
+		// Fix the incorrect string type on title to display correctly
+		const char* name = static_cast<const char*>(thisPack->getName().c_str());
+		int len = MultiByteToWideChar(CP_UTF8, 0, name, -1, NULL, 0);
+		std::wstring wName(len, 0);
+		MultiByteToWideChar(CP_UTF8, 0, name, -1, &wName[0], len);
+		setCentreLabel(wName.c_str());
+		//setCentreLabel(thisPack->getName().c_str());
 	}
 	else
 	{
@@ -1268,7 +1274,13 @@ void UIScene_SkinSelectMenu::updatePackDisplay()
 	if(nextPackIndex >= SKIN_SELECT_MAX_DEFAULTS)
 	{
 		DLCPack *thisPack = app.m_dlcManager.getPack(nextPackIndex - SKIN_SELECT_MAX_DEFAULTS, DLCManager::e_DLCType_Skin);
-		setRightLabel(thisPack->getName().c_str());
+		// Fix the incorrect string type on title to display correctly
+		const char* name = static_cast<const char*>(thisPack->getName().c_str());
+		int len = MultiByteToWideChar(CP_UTF8, 0, name, -1, NULL, 0);
+		std::wstring wName(len, 0);
+		MultiByteToWideChar(CP_UTF8, 0, name, -1, &wName[0], len);
+		setRightLabel(wName.c_str());
+		//setRightLabel(thisPack->getName().c_str());
 	}
 	else
 	{
@@ -1287,7 +1299,13 @@ void UIScene_SkinSelectMenu::updatePackDisplay()
 	if(previousPackIndex >= SKIN_SELECT_MAX_DEFAULTS)
 	{
 		DLCPack *thisPack = app.m_dlcManager.getPack(previousPackIndex - SKIN_SELECT_MAX_DEFAULTS, DLCManager::e_DLCType_Skin);
-		setLeftLabel(thisPack->getName().c_str());
+		// Fix the incorrect string type on title to display correctly
+		const char* name = static_cast<const char*>(thisPack->getName().c_str());
+		int len = MultiByteToWideChar(CP_UTF8, 0, name, -1, NULL, 0);
+		std::wstring wName(len, 0);
+		MultiByteToWideChar(CP_UTF8, 0, name, -1, &wName[0], len);
+		setLeftLabel(wName.c_str());
+		//setLeftLabel(thisPack->getName().c_str());
 	}
 	else
 	{