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