zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Provide a RETURN value of -2 to EVENT_DISPLAYLOADINGSCREEN after G_CacheMapData().

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4978 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-02-09 05:50:47 +00:00
parent 929b04d473
commit 529d43f116
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
polymer/eduke32/source/premap.c
View file

@ -1675,7 +1675,7 @@ int32_t G_FindLevelByFile(const char *fn)
return MAXLEVELS * MAXVOLUMES;
}
void G_FadeLoad(int32_t r, int32_t g, int32_t b, int32_t start, int32_t end, int32_t step, int32_t ticwait)
static void G_FadeLoad(int32_t r, int32_t g, int32_t b, int32_t start, int32_t end, int32_t step, int32_t ticwait, int32_t tc)
{
int32_t m = (step < 0) ? -1 : 1;
@ -1695,7 +1695,7 @@ void G_FadeLoad(int32_t r, int32_t g, int32_t b, int32_t start, int32_t end, int
G_FadePalette(r,g,b,start|128);
flushperms();
G_DoLoadScreen(" ", -1);
G_DoLoadScreen(" ", tc);
}
}
@ -1907,9 +1907,9 @@ int32_t G_EnterLevel(int32_t g)
ud.playerbest = CONFIG_GetMapBestTime(MapInfo[mii].filename);
G_FadeLoad(0,0,0, 63,0, -7, 4);
G_FadeLoad(0,0,0, 63,0, -7, 4, -1);
G_CacheMapData();
G_FadeLoad(0,0,0, 0,63, 7, 4);
G_FadeLoad(0,0,0, 0,63, 7, 4, -2);
if (ud.recstat != 2)
{

1
polymer/eduke32/source/premap.h
View file

@ -42,7 +42,6 @@ void G_SetupFilenameBasedMusic(char *levnamebuf, const char *boardfilename, int3
int32_t G_EnterLevel(int32_t g);
int32_t G_FindLevelByFile(const char *fn);
void G_CacheMapData(void);
void G_FadeLoad(int32_t r,int32_t g,int32_t b,int32_t start,int32_t end,int32_t step,int32_t ticwait);
void G_FreeMapState(int32_t mapnum);
void G_NewGame(int32_t vn,int32_t ln,int32_t sk);
void G_ResetTimers(uint8_t keepgtics);