zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-16 20:50:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed Blood startup.

Browse source
This commit is contained in:
Christoph Oelckers 2020-05-23 18:58:57 +02:00
parent f64bdccaca
commit 2d29d130c0
4 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/blood/src/screen.cpp
View file

@ -71,10 +71,10 @@ void scrLoadPLUs(void)
// load lookup tables // load lookup tables
for (int i = 0; i < MAXPALOOKUPS; i++) for (int i = 0; i < MAXPALOOKUPS; i++)
{ {
int lump = i <= 15 ? fileSystem.FindFile(PLU[i]) : fileSystem.FindResource(i, "PLU"); int lump = i < 15 ? fileSystem.FindFile(PLU[i]) : fileSystem.FindResource(i, "PLU");
if (lump < 0) if (lump < 0)
{ {
if (i <= 15) I_FatalError("%s.PLU not found", PLU[i]); if (i < 15) I_FatalError("%s.PLU not found", PLU[i]);
else continue; else continue;
} }
auto data = fileSystem.GetFileData(lump); auto data = fileSystem.GetFileData(lump);

1
source/build/src/engine.cpp
View file

@ -2095,6 +2095,7 @@ int32_t engineInit(void)
maxspritesonscreen = MAXSPRITESONSCREEN; maxspritesonscreen = MAXSPRITESONSCREEN;
GPalette.Init(MAXPALOOKUPS + 1); // one slot for each translation, plus a separate one for the base palettes.
if (paletteLoadFromDisk_replace) if (paletteLoadFromDisk_replace)
{ {
paletteLoadFromDisk_replace(); paletteLoadFromDisk_replace();

2
source/build/src/palette.cpp
View file

@ -75,8 +75,6 @@ void paletteSetColorTable(int32_t id, uint8_t const* table, bool notransparency,
void paletteLoadFromDisk(void) void paletteLoadFromDisk(void)
{ {
GPalette.Init(MAXPALOOKUPS + 1); // one slot for each translation, plus a separate one for the base palettes.
for (auto & x : glblend) for (auto & x : glblend)
x = defaultglblend; x = defaultglblend;

7
source/common/utility/basics.h
View file

@ -57,13 +57,6 @@ using INTBOOL = int;
using BITFIELD = uint32_t; using BITFIELD = uint32_t;
#if defined(_MSC_VER)
#define NOVTABLE __declspec(novtable)
#else
#define NOVTABLE
#endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
#define NOVTABLE __declspec(novtable) #define NOVTABLE __declspec(novtable)
#else #else