Merge branch 'MCLCE:main' into feat/64x64-skins

This commit is contained in:
Langtanium 2026-05-06 12:02:10 -07:00 committed by GitHub
commit 6f12950c6b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
78 changed files with 136 additions and 156 deletions

View file

@ -172,7 +172,7 @@ DLCPack *DLCManager::getPack(DWORD index, EDLCType type /*= e_DLCType_All*/)
if(index >= m_packs.size())
{
app.DebugPrintf("DLCManager: Trying to access a DLC pack beyond the range of valid packs\n");
__debugbreak();
DEBUG_BREAK();
}
pack = m_packs[index];
}
@ -187,7 +187,6 @@ DWORD DLCManager::getPackIndex(DLCPack *pack, bool &found, EDLCType type /*= e_D
if(pack == nullptr)
{
app.DebugPrintf("DLCManager: Attempting to find the index for a nullptr pack\n");
//__debugbreak();
return foundIndex;
}
if( type != e_DLCType_All )