OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- took the translation slot definition out of the container and use a dynamic array to store the data.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-11 12:44:59 +02:00
commit 66a837f983
3 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/r_data/r_translate.cpp
View file

@ -62,7 +62,7 @@ PaletteContainer palMgr;
//
//----------------------------------------------------------------------------
void PaletteContainer::Init() // This cannot be a constructor!!!
void PaletteContainer::Init(int numslots) // This cannot be a constructor!!!
{
Clear();
// Make sure that index 0 is always the identity translation.
@ -70,6 +70,7 @@ void PaletteContainer::Init() // This cannot be a constructor!!!
remap.MakeIdentity();
remap.Inactive = true;
AddRemap(&remap);
TranslationTables.Resize(numslots);
}
//----------------------------------------------------------------------------
@ -82,7 +83,7 @@ void PaletteContainer::Clear()
{
remapArena.FreeAllBlocks();
uniqueRemaps.Reset();
for (auto& slot : TranslationTables) slot.Reset();
TranslationTables.Reset();
}
//----------------------------------------------------------------------------
@ -160,7 +161,7 @@ FRemapTable *PaletteContainer::TranslationToTable(int translation)
unsigned int type = GetTranslationType(translation);
unsigned int index = GetTranslationIndex(translation);
if (type <= 0 || type >= NUM_TRANSLATION_TABLES || index >= NumTranslations(type))
if (type <= 0 || type >= TranslationTables.Size() || index >= NumTranslations(type))
{
return NULL;
}