aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/FolderTexturePack.cpp
diff options
context:
space:
mode:
authorqwasdrizzel <145519042+qwasdrizzel@users.noreply.github.com>2026-03-16 21:44:26 -0500
committerGitHub <noreply@github.com>2026-03-16 21:44:26 -0500
commitce739f6045ec72127491286ea3f3f21e537c1b55 (patch)
treef33bd42a47c1b4a7b2153a7fb77127ee3b407db9 /Minecraft.Client/FolderTexturePack.cpp
parent255a18fe8e9b57377975f82e2b227afe2a12eda0 (diff)
parent5a59f5d146b43811dde6a5a0245ee9875d7b5cd1 (diff)
Merge branch 'smartcmd:main' into main
Diffstat (limited to 'Minecraft.Client/FolderTexturePack.cpp')
-rw-r--r--Minecraft.Client/FolderTexturePack.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Minecraft.Client/FolderTexturePack.cpp b/Minecraft.Client/FolderTexturePack.cpp
index 4b65dc7f..05feca66 100644
--- a/Minecraft.Client/FolderTexturePack.cpp
+++ b/Minecraft.Client/FolderTexturePack.cpp
@@ -31,7 +31,7 @@ InputStream *FolderTexturePack::getResourceImplementation(const wstring &name) /
#endif
InputStream *resource = InputStream::getResourceAsStream(wDrive + name);
//InputStream *stream = DefaultTexturePack::class->getResourceAsStream(name);
- //if (stream == NULL)
+ //if (stream == nullptr)
//{
// throw new FileNotFoundException(name);
//}
@@ -85,7 +85,7 @@ void FolderTexturePack::loadUI()
swprintf(szResourceLocator, LOCATOR_SIZE,L"file://%lsTexturePack.xzp#skin_Minecraft.xur",getPath().c_str());
XuiFreeVisuals(L"");
- app.LoadSkin(szResourceLocator,NULL);//L"TexturePack");
+ app.LoadSkin(szResourceLocator,nullptr);//L"TexturePack");
bUILoaded = true;
//CXuiSceneBase::GetInstance()->SetVisualPrefix(L"TexturePack");
}