5 files changed, 49 insertions, 4 deletions

diff --git a/Minecraft.Client/Common/DLC/DLCManager.cpp b/Minecraft.Client/Common/DLC/DLCManager.cpp
index 123e4266..17c9fc6d 100644
--- a/Minecraft.Client/Common/DLC/DLCManager.cpp
+++ b/Minecraft.Client/Common/DLC/DLCManager.cpp
@@ -91,6 +91,28 @@ void DLCManager::removePack(DLCPack *pack)
 	}
 }
 
+void DLCManager::removeAllPacks(void)
+{
+	for(AUTO_VAR(it, m_packs.begin()); it != m_packs.end(); ++it)
+	{
+		DLCPack *pack = (DLCPack *)*it;
+		delete pack;
+	}
+
+	m_packs.clear();
+}
+
+void DLCManager::LanguageChanged(void)
+{
+	for(AUTO_VAR(it, m_packs.begin()); it != m_packs.end(); ++it)
+	{
+		DLCPack *pack = (DLCPack *)*it;
+		// update the language
+		pack->UpdateLanguage();
+	}
+
+}
+
 DLCPack *DLCManager::getPack(const wstring &name)
 {
 	DLCPack *pack = NULL;
@@ -292,12 +314,12 @@ DWORD DLCManager::checkForCorruptDLCAndAlert(bool showMessage /*= true*/)
 			WCHAR wchFormat[132];
 			swprintf(wchFormat, 132, L"%ls\n\n%%ls", firstCorruptPack->getName().c_str());
 
-			C4JStorage::EMessageResult result = ui.RequestMessageBox( IDS_CORRUPT_DLC_TITLE, IDS_CORRUPT_DLC, uiIDA,1,ProfileManager.GetPrimaryPad(),NULL,NULL, app.GetStringTable(),wchFormat);
+			C4JStorage::EMessageResult result = ui.RequestErrorMessage( IDS_CORRUPT_DLC_TITLE, IDS_CORRUPT_DLC, uiIDA,1,ProfileManager.GetPrimaryPad(),NULL,NULL,wchFormat);
 
 		}
 		else
 		{
-			C4JStorage::EMessageResult result = ui.RequestMessageBox( IDS_CORRUPT_DLC_TITLE, IDS_CORRUPT_DLC_MULTIPLE, uiIDA,1,ProfileManager.GetPrimaryPad(),NULL,NULL, app.GetStringTable());
+			C4JStorage::EMessageResult result = ui.RequestErrorMessage( IDS_CORRUPT_DLC_TITLE, IDS_CORRUPT_DLC_MULTIPLE, uiIDA,1,ProfileManager.GetPrimaryPad());
 		}
 	}
 
diff --git a/Minecraft.Client/Common/DLC/DLCManager.h b/Minecraft.Client/Common/DLC/DLCManager.h
index 55a62312..27765232 100644
--- a/Minecraft.Client/Common/DLC/DLCManager.h
+++ b/Minecraft.Client/Common/DLC/DLCManager.h
@@ -74,6 +74,8 @@ public:
 
 	void addPack(DLCPack *pack);
 	void removePack(DLCPack *pack);
+	void removeAllPacks(void);
+	void LanguageChanged(void);
 
 	DLCPack *getPack(const wstring &name);
 #ifdef _XBOX_ONE
diff --git a/Minecraft.Client/Common/DLC/DLCPack.cpp b/Minecraft.Client/Common/DLC/DLCPack.cpp
index 507e51a7..4a003d05 100644
--- a/Minecraft.Client/Common/DLC/DLCPack.cpp
+++ b/Minecraft.Client/Common/DLC/DLCPack.cpp
@@ -191,7 +191,8 @@ DLCFile *DLCPack::addFile(DLCManager::EDLCType type, const wstring &path)
 	{
 	case DLCManager::e_DLCType_Skin:
 		{
-			std::vector<std::wstring> splitPath = stringSplit(path,L'/');
+			wstring newPath = replaceAll(path, L"\\", L"/");
+			std::vector<std::wstring> splitPath = stringSplit(newPath,L'/');
 			wstring strippedPath = splitPath.back();
 
 			newFile = new DLCSkinFile(strippedPath);
@@ -211,7 +212,8 @@ DLCFile *DLCPack::addFile(DLCManager::EDLCType type, const wstring &path)
 		break;
 	case DLCManager::e_DLCType_Cape:
 		{
-			std::vector<std::wstring> splitPath = stringSplit(path,L'/');
+			wstring newPath = replaceAll(path, L"\\", L"/");
+			std::vector<std::wstring> splitPath = stringSplit(newPath,L'/');
 			wstring strippedPath = splitPath.back();
 			newFile = new DLCCapeFile(strippedPath);
 		}
@@ -411,3 +413,19 @@ bool DLCPack::hasPurchasedFile(DLCManager::EDLCType type, const wstring &path)
 		return true;
 	}*/
 }
+
+void  DLCPack::UpdateLanguage()
+{
+	// find the language file
+	DLCManager::e_DLCType_LocalisationData;
+	DLCFile *file = NULL;
+
+	if(m_files[DLCManager::e_DLCType_LocalisationData].size() > 0)
+	{
+		file = m_files[DLCManager::e_DLCType_LocalisationData][0];
+		DLCLocalisationFile *localisationFile = (DLCLocalisationFile *)getFile(DLCManager::e_DLCType_LocalisationData, L"languages.loc");
+		StringTable *strTable = localisationFile->getStringTable();
+		strTable->ReloadStringTable();
+	}
+
+}
\ No newline at end of file
diff --git a/Minecraft.Client/Common/DLC/DLCPack.h b/Minecraft.Client/Common/DLC/DLCPack.h
index 856744c2..df1f65f0 100644
--- a/Minecraft.Client/Common/DLC/DLCPack.h
+++ b/Minecraft.Client/Common/DLC/DLCPack.h
@@ -68,6 +68,8 @@ public:
 	DWORD getLicenseMask( ) { return m_dwLicenseMask; }
 	
 	wstring getName() { return m_packName; }
+
+	void UpdateLanguage();
 #ifdef _XBOX_ONE
 	wstring getPurchaseOfferId() { return m_wsProductId; }
 #else
diff --git a/Minecraft.Client/Common/DLC/DLCTextureFile.cpp b/Minecraft.Client/Common/DLC/DLCTextureFile.cpp
index cf99465a..edf071c6 100644
--- a/Minecraft.Client/Common/DLC/DLCTextureFile.cpp
+++ b/Minecraft.Client/Common/DLC/DLCTextureFile.cpp
@@ -30,6 +30,7 @@ void DLCTextureFile::addParameter(DLCManager::EDLCParameterType type, const wstr
 	{
 	case DLCManager::e_DLCParamType_Anim:
 		m_animString = value;
+		if(m_animString.empty()) m_animString = L",";
 		m_bIsAnim = true;
 
 		break;