zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-18 22:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename E_PostInitTables back to E_PostInit and move it back to where it belongs in engine.c (i.e. preinitengine, initengine, "postinitengine"). It should not have been changed.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5952 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2016-12-26 06:01:32 +00:00
parent d2934c4ba5
commit e258ca51f8
6 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
polymer/eduke32/build/include/build.h
View file

@ -998,6 +998,7 @@ typedef struct artheader_t {
int32_t preinitengine(void); // a partial setup of the engine used for launch windows int32_t preinitengine(void); // a partial setup of the engine used for launch windows
int32_t initengine(void); int32_t initengine(void);
int32_t E_PostInit(void);
void uninitengine(void); void uninitengine(void);
void initspritelists(void); void initspritelists(void);
int32_t E_FatalError(char const * const msg); int32_t E_FatalError(char const * const msg);

2
polymer/eduke32/build/include/palette.h
View file

@ -39,7 +39,7 @@ extern int32_t globalblend;
extern uint32_t g_lastpalettesum; extern uint32_t g_lastpalettesum;
extern palette_t getpal(int32_t col); extern palette_t getpal(int32_t col);
extern void loadpalette(void); extern void loadpalette(void);
extern int32_t E_PostInitTables(void); extern void E_PostLoadPalette(void);
extern void setup_blend(int32_t blend, int32_t doreverse); extern void setup_blend(int32_t blend, int32_t doreverse);
extern uint8_t basepalreset; extern uint8_t basepalreset;
extern int32_t curbrightness, gammabrightness; extern int32_t curbrightness, gammabrightness;

2
polymer/eduke32/build/src/build.c
View file

@ -692,7 +692,7 @@ int app_main(int argc, char const * const * argv)
DO_FREE_AND_NULL(g_defModules); DO_FREE_AND_NULL(g_defModules);
g_defModulesNum = 0; g_defModulesNum = 0;
if (E_PostInitTables()) if (E_PostInit())
M32_FatalEngineError(); M32_FatalEngineError();
CallExtPostInit(); CallExtPostInit();

17
polymer/eduke32/build/src/engine.c
View file

@ -7753,6 +7753,23 @@ int32_t initengine(void)
return 0; return 0;
} }
//
// E_PostInit
//
int32_t E_PostInit(void)
{
if (!(paletteloaded & PALETTE_MAIN))
return E_FatalError("No palette found.");
if (!(paletteloaded & PALETTE_SHADE))
return E_FatalError("No shade table found.");
if (!(paletteloaded & PALETTE_TRANSLUC))
return E_FatalError("No translucency table found.");
E_PostLoadPalette();
return 0;
}
// //
// uninitengine // uninitengine
// //

20
polymer/eduke32/build/src/palette.c
View file

@ -268,7 +268,7 @@ void loadpalette(void)
uint32_t PaletteIndexFullbrights[8]; uint32_t PaletteIndexFullbrights[8];
static void E_PostLoadPalette(void) void E_PostLoadPalette(void)
{ {
globalpal = 0; globalpal = 0;
@ -319,24 +319,6 @@ static void E_PostLoadPalette(void)
} }
} }
//
// E_PostInitTables
//
int32_t E_PostInitTables(void)
{
if (!(paletteloaded & PALETTE_MAIN))
return E_FatalError("No palette found.");
if (!(paletteloaded & PALETTE_SHADE))
return E_FatalError("No shade table found.");
if (!(paletteloaded & PALETTE_TRANSLUC))
return E_FatalError("No translucency table found.");
E_PostLoadPalette();
return 0;
}
void E_ReplaceTransparentColorWithBlack(void) void E_ReplaceTransparentColorWithBlack(void)
{ {
for (bssize_t i=0; i<MAXPALOOKUPS; i++) for (bssize_t i=0; i<MAXPALOOKUPS; i++)

2
polymer/eduke32/source/game.c
View file

@ -6306,7 +6306,7 @@ int app_main(int argc, char const * const * argv)
DO_FREE_AND_NULL(g_defModules); DO_FREE_AND_NULL(g_defModules);
g_defModulesNum = 0; g_defModulesNum = 0;
if (E_PostInitTables()) if (E_PostInit())
G_FatalEngineError(); G_FatalEngineError();
G_PostLoadPalette(); G_PostLoadPalette();