zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-11 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

- missed two things that need to be 'common'.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-11 18:19:50 +02:00
parent ac610d87e5
commit b4e9c3f20d
3 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/common/engine/palettecontainer.cpp
View file

@ -40,10 +40,8 @@
#include "templates.h" #include "templates.h"
#include "palettecontainer.h" #include "palettecontainer.h"
#include "v_palette.h"
PaletteContainer GPalette; PaletteContainer GPalette;
FColorMatcher ColorMatcher;
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// //
@ -235,6 +233,21 @@ static bool IndexOutOfRange(const int start1, const int end1, const int start2,
// //
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool FRemapTable::operator==(const FRemapTable& o)
{
// Two translations are identical when they have the same amount of colors
// and the palette values for both are identical.
if (&o == this) return true;
if (o.NumEntries != NumEntries) return false;
return !memcmp(o.Palette, Palette, NumEntries * sizeof(*Palette));
}
//----------------------------------------------------------------------------
//
//
//
//----------------------------------------------------------------------------
void FRemapTable::MakeIdentity() void FRemapTable::MakeIdentity()
{ {
int i; int i;

15
src/r_data/r_translate.cpp
View file

@ -80,21 +80,6 @@ const uint8_t IcePalette[16][3] =
// //
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool FRemapTable::operator==(const FRemapTable &o)
{
// Two translations are identical when they have the same amount of colors
// and the palette values for both are identical.
if (&o == this) return true;
if (o.NumEntries != NumEntries) return false;
return !memcmp(o.Palette, Palette, NumEntries * sizeof(*Palette));
}
//----------------------------------------------------------------------------
//
//
//
//----------------------------------------------------------------------------
static void SerializeRemap(FSerializer &arc, FRemapTable &remap) static void SerializeRemap(FSerializer &arc, FRemapTable &remap)
{ {
arc("numentries", remap.NumEntries); arc("numentries", remap.NumEntries);

2
src/r_data/v_palette.cpp
View file

@ -57,8 +57,6 @@ uint32_t Col2RGB8_2[63][256]; // this array's second dimension is called up by p
ColorTable32k RGB32k; ColorTable32k RGB32k;
ColorTable256k RGB256k; ColorTable256k RGB256k;
FColorMatcher ColorMatcher;
/* Current color blending values */ /* Current color blending values */
int BlendR, BlendG, BlendB, BlendA; int BlendR, BlendG, BlendB, BlendA;