Merge st_stuff.c/h

This commit is contained in:
SteelT 2020-08-09 20:22:29 -04:00
parent 90bd22aac3
commit a5313e34fe
2 changed files with 30 additions and 2569 deletions

File diff suppressed because it is too large Load diff

View file

@ -45,23 +45,11 @@ void ST_UnloadGraphics(void);
void ST_LoadGraphics(void);
// face load graphics, called when skin changes
<<<<<<< HEAD
void ST_LoadFaceGraphics(char *rankstr, char *wantstr, char *mmapstr, INT32 playernum);
=======
void ST_LoadFaceGraphics(INT32 playernum);
>>>>>>> srb2/next
void ST_ReloadSkinFaceGraphics(void);
void ST_doPaletteStuff(void);
// title card
void ST_startTitleCard(void);
void ST_runTitleCard(void);
void ST_drawTitleCard(void);
void ST_preDrawTitleCard(void);
void ST_preLevelTitleCardDrawer(void);
void ST_drawWipeTitleCard(void);
extern tic_t lt_ticker, lt_lasttic;
extern tic_t lt_exitticker, lt_endtime;