Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 27 insertions, 10 deletions

diff --git a/Minecraft.Client/TexturePack.cpp b/Minecraft.Client/TexturePack.cpp
index 39f03569..7ed208ae 100644
--- a/Minecraft.Client/TexturePack.cpp
+++ b/Minecraft.Client/TexturePack.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "TexturePack.h"
 
-wstring TexturePack::getPath(bool bTitleUpdateTexture /*= false*/)
+wstring TexturePack::getPath(bool bTitleUpdateTexture /*= false*/,const char *pchBDPatchFileName /*= NULL*/)
 {
 	wstring wDrive;
 #ifdef _XBOX
@@ -24,21 +24,38 @@ wstring TexturePack::getPath(bool bTitleUpdateTexture /*= false*/)
 #ifdef __PS3__
 
 	// 4J-PB - we need to check for a BD patch - this is going to be an issue for full DLC texture packs (Halloween)
+	char *pchUsrDir=NULL;
+	if(app.GetBootedFromDiscPatch() && pchBDPatchFileName!=NULL)
+	{
+		pchUsrDir = app.GetBDUsrDirPath(pchBDPatchFileName);
+		wstring wstr (pchUsrDir, pchUsrDir+strlen(pchUsrDir));
 
-	char *pchUsrDir=getUsrDirPath();
-	
-	wstring wstr (pchUsrDir, pchUsrDir+strlen(pchUsrDir));
+		if(bTitleUpdateTexture)
+		{
+			wDrive= wstr + L"\\Common\\res\\TitleUpdate\\";
 
-	if(bTitleUpdateTexture)
-	{
-		// Make the content package point to to the UPDATE: drive is needed
-		wDrive= wstr + L"\\Common\\res\\TitleUpdate\\";
+		}
+		else
+		{
+			wDrive= wstr + L"/Common/";
+		}
 	}
 	else
 	{
-		wDrive= wstr + L"/Common/";
-	}			
+		pchUsrDir=getUsrDirPath();
+	
+		wstring wstr (pchUsrDir, pchUsrDir+strlen(pchUsrDir));
 
+		if(bTitleUpdateTexture)
+		{
+			// Make the content package point to to the UPDATE: drive is needed
+			wDrive= wstr + L"\\Common\\res\\TitleUpdate\\";
+		}
+		else
+		{
+			wDrive= wstr + L"/Common/";
+		}			
+	}
 
 #elif __PSVITA__
 	char *pchUsrDir="";//getUsrDirPath();