zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-06-02 10:11:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- store palettes in the palette container.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-12 07:50:24 +02:00
parent 960d4b6ecc
commit 6f9ee4b60f
22 changed files with 103 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

11
source/build/src/defs.cpp
View file

@ -17,6 +17,7 @@
#include "bitmap.h"
#include "m_argv.h"
#include "gamecontrol.h"
#include "palettecontainer.h"
#ifdef USE_OPENGL
# include "hightile.h"
@ -2673,21 +2674,21 @@ static int32_t defsparser(scriptfile *script)
break;
}
uint8_t const * const sourcetable = basepaltable[source];
if (EDUKE32_PREDICT_FALSE(sourcetable == NULL))
auto sourcepal = GPalette.GetTranslation(Translation_BasePalettes, source);
if (sourcepal == NULL)
{
Printf("Error: basepalette: Source basepal does not exist on line %s:%d\n",
script->filename, scriptfile_getlinum(script,cmdtokptr));
break;
}
paletteSetColorTable(id, sourcetable);
GPalette.CopyTranslation(TRANSLATION(Translation_BasePalettes, id), TRANSLATION(Translation_BasePalettes, source));
didLoadPal = 1;
break;
}
case T_UNDEF:
{
paletteFreeColorTable(id);
GPalette.ClearTranslationSlot(TRANSLATION(Translation_BasePalettes, id));
didLoadPal = 0;
if (id == 0)
@ -3325,7 +3326,7 @@ static int32_t defsparser(scriptfile *script)
}
for (bssize_t i = id0; i <= id1; i++)
paletteFreeColorTable(i);
GPalette.ClearTranslationSlot(TRANSLATION(Translation_BasePalettes, i));
if (id0 == 0)
paletteloaded &= ~PALETTE_MAIN;