zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 04:20:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

- moved palette.cpp out of Build folder.

Browse source
This commit is contained in:
Christoph Oelckers 2020-06-07 13:06:18 +02:00
parent 3fe4dbed01
commit f2a637418d
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/CMakeLists.txt
View file

@ -778,7 +778,6 @@ set (PCH_SOURCES
build/src/hash.cpp build/src/hash.cpp
build/src/mdsprite.cpp build/src/mdsprite.cpp
build/src/mhk.cpp build/src/mhk.cpp
build/src/palette.cpp
build/src/polymost.cpp build/src/polymost.cpp
build/src/pragmas.cpp build/src/pragmas.cpp
build/src/scriptfile.cpp build/src/scriptfile.cpp
@ -801,6 +800,7 @@ set (PCH_SOURCES
core/screenshot.cpp core/screenshot.cpp
core/raze_music.cpp core/raze_music.cpp
core/raze_sound.cpp core/raze_sound.cpp
core/palette.cpp
core/2d/screentext.cpp core/2d/screentext.cpp

16
source/build/src/palette.cpp → source/core/palette.cpp
View file

@ -6,9 +6,7 @@
// by Jonathon Fowler (jf@jonof.id.au) // by Jonathon Fowler (jf@jonof.id.au)
// by the EDuke32 team (development@voidpoint.com) // by the EDuke32 team (development@voidpoint.com)
#include "compat.h"
#include "build.h" #include "build.h"
#include "engine_priv.h"
#include "baselayer.h" #include "baselayer.h"
#include "imagehelpers.h" #include "imagehelpers.h"
@ -75,8 +73,8 @@ void paletteLoadFromDisk(void)
if (768 != fil.Read(palette, 768)) if (768 != fil.Read(palette, 768))
return; return;
for (unsigned char & k : palette) for (auto & pe : palette)
k <<= 2; pe <<= 2;
paletteSetColorTable(0, palette, false, false); paletteSetColorTable(0, palette, false, false);
paletteloaded |= PALETTE_MAIN; paletteloaded |= PALETTE_MAIN;
@ -176,7 +174,7 @@ void LookupTableInfo::postLoadTables(void)
int32_t LookupTableInfo::loadTable(FileReader &fp) int32_t LookupTableInfo::loadTable(FileReader &fp)
{ {
uint8_t remapbuf[256]; uint8_t buffer[256];
int numlookups = fp.ReadUInt8(); int numlookups = fp.ReadUInt8();
if (numlookups < 1) if (numlookups < 1)
return -1; return -1;
@ -185,15 +183,15 @@ int32_t LookupTableInfo::loadTable(FileReader &fp)
{ {
int palnum = fp.ReadUInt8(); int palnum = fp.ReadUInt8();
if (256 != fp.Read(remapbuf, 256)) if (256 != fp.Read(buffer, 256))
return -1; return -1;
if (palnum >= 256 - RESERVEDPALS) if (palnum < 0 || palnum >= 256 - RESERVEDPALS)
{ {
Printf("ERROR: attempt to load lookup at reserved pal %d\n", palnum); Printf("ERROR: attempt to load lookup at invalid index %d\n", palnum);
} }
else else
makeTable(palnum, remapbuf, 0, 0, 0, 0); makeTable(palnum, buffer, 0, 0, 0, 0);
} }
return 0; return 0;

0
source/build/include/palette.h → source/core/palette.h
View file