mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-08-20 09:57:09 +00:00
Remove the things made for other PR
This commit is contained in:
parent
ac0b905280
commit
12347b13b0
|
|
@ -453,16 +453,11 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD
|
|||
|
||||
DLCFile *dlcFile = nullptr;
|
||||
DLCPack *dlcTexturePack = nullptr;
|
||||
DLCPack *dlcSkinPack = nullptr;
|
||||
|
||||
if(type == e_DLCType_TexturePack)
|
||||
{
|
||||
dlcTexturePack = new DLCPack(pack->getName(), pack->getLicenseMask());
|
||||
}
|
||||
else if(type == e_DLCType_SkinData)
|
||||
{
|
||||
dlcSkinPack = new DLCPack(pack->getName(), pack->getLicenseMask());
|
||||
}
|
||||
else if(type != e_DLCType_PackConfig)
|
||||
{
|
||||
dlcFile = pack->addFile(type,(WCHAR *)pFile->wchFile);
|
||||
|
|
@ -522,42 +517,6 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD
|
|||
}
|
||||
++dwFilesProcessed;
|
||||
}
|
||||
else if(dlcSkinPack != nullptr)
|
||||
{
|
||||
DWORD skinFilesProcessed = 0;
|
||||
bool validPack = processDLCDataFile(skinFilesProcessed, pbTemp, pFile->uiFileSize, dlcSkinPack);
|
||||
if(!validPack || skinFilesProcessed == 0)
|
||||
{
|
||||
delete dlcSkinPack;
|
||||
dlcSkinPack = nullptr;
|
||||
}
|
||||
else
|
||||
{
|
||||
for(DWORD i = 0; i < dlcSkinPack->getSkinCount(); ++i)
|
||||
{
|
||||
DLCSkinFile* skinFile = dlcSkinPack->getSkinFile(i);
|
||||
if(skinFile)
|
||||
{
|
||||
DLCFile* newFile = pack->addFile(DLCManager::e_DLCType_Skin, skinFile->getPath());
|
||||
|
||||
for(int param = 0; param < DLCManager::e_DLCParamType_Max; ++param)
|
||||
{
|
||||
auto value = skinFile->getParameterAsString(static_cast<DLCManager::EDLCParameterType>(param));
|
||||
if(!value.empty())
|
||||
{
|
||||
newFile->addParameter(static_cast<DLCManager::EDLCParameterType>(param), value);
|
||||
}
|
||||
}
|
||||
|
||||
app.vSkinNames.push_back(skinFile->getPath());
|
||||
}
|
||||
}
|
||||
|
||||
pack->addChildPack(dlcSkinPack);
|
||||
}
|
||||
|
||||
++dwFilesProcessed;
|
||||
}
|
||||
else if(dlcFile != nullptr)
|
||||
{
|
||||
// Data
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ public:
|
|||
e_DLCType_Audio,
|
||||
e_DLCType_ColourTable,
|
||||
e_DLCType_GameRulesHeader,
|
||||
e_DLCType_SkinData,
|
||||
|
||||
e_DLCType_Max,
|
||||
e_DLCType_All,
|
||||
|
|
|
|||
Loading…
Reference in a new issue