thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 12:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set new fades, fixed crash upon using non-colormapped fade

Browse source
This commit is contained in:
TehRealSalt 2019-08-08 01:43:50 -04:00
parent 36e4f25cc9
commit 274dc434ff
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/f_wipe.c
View file

@ -51,26 +51,26 @@ UINT8 wipedefs[NUMWIPEDEFS] = {
99, // wipe_credits_intermediate (0) 99, // wipe_credits_intermediate (0)
0, // wipe_level_toblack 0, // wipe_level_toblack
UINT8_MAX, // wipe_intermission_toblack 0, // wipe_intermission_toblack
0, // wipe_voting_toblack, 0, // wipe_voting_toblack,
UINT8_MAX, // wipe_continuing_toblack 0, // wipe_continuing_toblack
3, // wipe_titlescreen_toblack 0, // wipe_titlescreen_toblack
0, // wipe_timeattack_toblack 0, // wipe_timeattack_toblack
99, // wipe_credits_toblack 99, // wipe_credits_toblack
0, // wipe_evaluation_toblack 0, // wipe_evaluation_toblack
0, // wipe_gameend_toblack 0, // wipe_gameend_toblack
UINT8_MAX, // wipe_intro_toblack (hardcoded) UINT8_MAX, // wipe_intro_toblack (hardcoded)
UINT8_MAX, // wipe_cutscene_toblack (hardcoded) 99, // wipe_cutscene_toblack (hardcoded)
UINT8_MAX, // wipe_specinter_toblack 0, // wipe_specinter_toblack
UINT8_MAX, // wipe_multinter_toblack 0, // wipe_multinter_toblack
99, // wipe_speclevel_towhite 0, // wipe_speclevel_towhite
3, // wipe_level_final UINT8_MAX, // wipe_level_final
0, // wipe_intermission_final 0, // wipe_intermission_final
0, // wipe_voting_final 0, // wipe_voting_final
0, // wipe_continuing_final 0, // wipe_continuing_final
3, // wipe_titlescreen_final 0, // wipe_titlescreen_final
0, // wipe_timeattack_final 0, // wipe_timeattack_final
99, // wipe_credits_final 99, // wipe_credits_final
0, // wipe_evaluation_final 0, // wipe_evaluation_final
@ -376,10 +376,11 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu, const char *colormap, boolean r
UINT8 wipeframe = 0; UINT8 wipeframe = 0;
fademask_t *fmask; fademask_t *fmask;
lumpnum_t clump; lumpnum_t clump = LUMPERROR;
lighttable_t *fcolor = NULL; lighttable_t *fcolor = NULL;
clump = W_GetNumForName(colormap); if (colormap != NULL)
clump = W_GetNumForName(colormap);
if (clump != LUMPERROR && wipetype != UINT8_MAX) if (clump != LUMPERROR && wipetype != UINT8_MAX)
{ {