aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/StitchedTexture.cpp
diff options
context:
space:
mode:
authordaoge <3523206925@qq.com>2026-03-03 03:04:10 +0800
committerGitHub <noreply@github.com>2026-03-03 03:04:10 +0800
commitb3feddfef372618c8a9d7a0abcaf18cfad866c18 (patch)
tree267761c3bb39241ba5c347bfbe2254d06686e287 /Minecraft.Client/StitchedTexture.cpp
parent84c31a2331f7a0ec85b9d438992e244f60e5020f (diff)
feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict * feat: TU19 (Dec 2014) Features & Content (#32) * December 2014 files * Working release build * Fix compilation issues * Add sound to Windows64Media * Add DLC content and force Tutorial DLC * Revert "Add DLC content and force Tutorial DLC" This reverts commit 97a43994725008e35fceb984d5549df9c8cea470. * Disable broken light packing * Disable breakpoint during DLC texture map load Allows DLC loading but the DLC textures are still broken * Fix post build not working * ... * fix vs2022 build * fix cmake build --------- Co-authored-by: Loki <lokirautio@gmail.com>
Diffstat (limited to 'Minecraft.Client/StitchedTexture.cpp')
-rw-r--r--Minecraft.Client/StitchedTexture.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/Minecraft.Client/StitchedTexture.cpp b/Minecraft.Client/StitchedTexture.cpp
index d7e47b42..c17f3db5 100644
--- a/Minecraft.Client/StitchedTexture.cpp
+++ b/Minecraft.Client/StitchedTexture.cpp
@@ -19,11 +19,11 @@ StitchedTexture *StitchedTexture::create(const wstring &name)
}
else
{
- return new StitchedTexture(name);
+ return new StitchedTexture(name,name);
}
}
-StitchedTexture::StitchedTexture(const wstring &name) : name(name)
+StitchedTexture::StitchedTexture(const wstring &name, const wstring &filename) : name(name)
{
// 4J Initialisers
source = NULL;
@@ -43,6 +43,7 @@ StitchedTexture::StitchedTexture(const wstring &name) : name(name)
frameOverride = NULL;
flags = 0;
frames = NULL;
+ m_fileName = filename;
}
void StitchedTexture::freeFrameTextures()