LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-30 17:46:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: unglob std::wstring

Browse Source
This commit is contained in:
Tropical
2026-03-06 11:50:22 -06:00
parent 41db813a6d
commit cdc08700e4
581 changed files with 2156 additions and 2154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Minecraft.Client/Textures/Packs/FolderTexturePack.cpp
View File

@@ -1,7 +1,7 @@
#include "../../Build/stdafx.h"
#include "FolderTexturePack.h"
FolderTexturePack::FolderTexturePack(DWORD id, const wstring &name, File *folder, TexturePack *fallback) : AbstractTexturePack(id, folder, name, fallback)
FolderTexturePack::FolderTexturePack(DWORD id, const std::wstring &name, File *folder, TexturePack *fallback) : AbstractTexturePack(id, folder, name, fallback)
{
// 4J Stu - These calls need to be in the most derived version of the class
loadIcon();
@@ -11,7 +11,7 @@ FolderTexturePack::FolderTexturePack(DWORD id, const wstring &name, File *folder
bUILoaded = false;
}
InputStream *FolderTexturePack::getResourceImplementation(const wstring &name) //throws IOException
InputStream *FolderTexturePack::getResourceImplementation(const std::wstring &name) //throws IOException
{
#if 0
final File file = new File(this.file, name.substring(1));
@@ -22,7 +22,7 @@ InputStream *FolderTexturePack::getResourceImplementation(const wstring &name) /
return new BufferedInputStream(new FileInputStream(file));
#endif
wstring wDrive = L"";
std::wstring wDrive = L"";
// Make the content package point to to the UPDATE: drive is needed
#ifdef _XBOX
wDrive=L"GAME:\\DummyTexturePack\\res";
@@ -40,7 +40,7 @@ InputStream *FolderTexturePack::getResourceImplementation(const wstring &name) /
return resource;
}
bool FolderTexturePack::hasFile(const wstring &name)
bool FolderTexturePack::hasFile(const std::wstring &name)
{
File file = File( getPath() + name);
return file.exists() && file.isFile();
@@ -58,9 +58,9 @@ bool FolderTexturePack::isTerrainUpdateCompatible()
return true;
}
wstring FolderTexturePack::getPath(bool bTitleUpdateTexture /*= false*/)
std::wstring FolderTexturePack::getPath(bool bTitleUpdateTexture /*= false*/)
{
wstring wDrive;
std::wstring wDrive;
#ifdef _XBOX
wDrive=L"GAME:\\" + file->getPath() + L"\\";
#else