thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge f_finale.c/h

Browse source
This commit is contained in:
Sally Coolatta 2020-08-06 15:35:07 -04:00
parent b9886a166e
commit 43c627b02e
2 changed files with 54 additions and 1013 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1055
src/f_finale.c
View file

File diff suppressed because it is too large Load diff

12
src/f_finale.h
View file

@ -185,15 +185,11 @@ extern INT32 lastwipetic;
void F_WipeStartScreen(void); void F_WipeStartScreen(void);
void F_WipeEndScreen(void); void F_WipeEndScreen(void);
<<<<<<< HEAD
void F_RunWipe(UINT8 wipetype, boolean drawMenu, const char *colormap, boolean reverse, boolean encorewiggle); void F_RunWipe(UINT8 wipetype, boolean drawMenu, const char *colormap, boolean reverse, boolean encorewiggle);
=======
void F_RunWipe(UINT8 wipetype, boolean drawMenu);
void F_WipeStageTitle(void); void F_WipeStageTitle(void);
#define F_WipeColorFill(c) V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, c) #define F_WipeColorFill(c) V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, c)
tic_t F_GetWipeLength(UINT8 wipetype); tic_t F_GetWipeLength(UINT8 wipetype);
boolean F_WipeExists(UINT8 wipetype); boolean F_WipeExists(UINT8 wipetype);
>>>>>>> srb2/next
enum enum
{ {
@ -231,12 +227,6 @@ enum
wipe_ending_final, wipe_ending_final,
wipe_cutscene_final, wipe_cutscene_final,
<<<<<<< HEAD
NUMWIPEDEFS,
WIPEFINALSHIFT = wipe_level_final - wipe_level_toblack
};
=======
// custom intermissions // custom intermissions
wipe_specinter_final, wipe_specinter_final,
wipe_multinter_final, wipe_multinter_final,
@ -244,7 +234,7 @@ enum
NUMWIPEDEFS, NUMWIPEDEFS,
WIPEFINALSHIFT = (wipe_level_final-wipe_level_toblack) WIPEFINALSHIFT = (wipe_level_final-wipe_level_toblack)
}; };
>>>>>>> srb2/next
extern UINT8 wipedefs[NUMWIPEDEFS]; extern UINT8 wipedefs[NUMWIPEDEFS];
#endif #endif