backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use fixed-width skin IDs in DLC files

Browse source
This commit is contained in:
notmatthewbeshay 2026-03-11 03:04:59 +11:00
parent a798d0f174
commit 491783c301
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Minecraft.Client/Platform/Common/DLC/DLCFile.cpp
View file

@ -23,4 +23,4 @@ DLCFile::DLCFile(DLCManager::EDLCType type, const std::wstring &path)
{ {
m_dwSkinId=0; m_dwSkinId=0;
} }
} }

4
Minecraft.Client/Platform/Common/DLC/DLCFile.h
View file

@ -7,7 +7,7 @@ class DLCFile
protected: protected:
DLCManager::EDLCType m_type; DLCManager::EDLCType m_type;
std::wstring m_path; std::wstring m_path;
DWORD m_dwSkinId; std::uint32_t m_dwSkinId;
public: public:
DLCFile(DLCManager::EDLCType type, const std::wstring &path); DLCFile(DLCManager::EDLCType type, const std::wstring &path);
@ -15,7 +15,7 @@ public:
DLCManager::EDLCType getType() { return m_type; } DLCManager::EDLCType getType() { return m_type; }
std::wstring getPath() { return m_path; } std::wstring getPath() { return m_path; }
DWORD getSkinID() { return m_dwSkinId; } std::uint32_t getSkinID() { return m_dwSkinId; }
virtual void addData(std::uint8_t *pbData, std::uint32_t dataBytes) {} virtual void addData(std::uint8_t *pbData, std::uint32_t dataBytes) {}
virtual std::uint8_t *getData(std::uint32_t &dataBytes) { dataBytes = 0; return NULL; } virtual std::uint8_t *getData(std::uint32_t &dataBytes) { dataBytes = 0; return NULL; }

2
Minecraft.Client/Platform/Common/DLC/DLCSkinFile.cpp
View file

@ -157,7 +157,7 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, const std::ws
case DLCManager::e_DLCParamType_Anim: case DLCManager::e_DLCParamType_Anim:
// 4J Stu - The Xbox version used swscanf_s which isn't available in GCC. // 4J Stu - The Xbox version used swscanf_s which isn't available in GCC.
swscanf(value.c_str(), L"%X", &m_uiAnimOverrideBitmask); swscanf(value.c_str(), L"%X", &m_uiAnimOverrideBitmask);
DWORD skinId = app.getSkinIdFromPath(m_path); std::uint32_t skinId = app.getSkinIdFromPath(m_path);
app.SetAnimOverrideBitmask(skinId, m_uiAnimOverrideBitmask); app.SetAnimOverrideBitmask(skinId, m_uiAnimOverrideBitmask);
break; break;
} }