Merge remote-tracking branch 'remotes/internal/INTERNAL_netreplays' into INTERNAL_netreplays

This commit is contained in:
fickleheart 2019-04-09 23:00:42 -05:00
commit d6e77fc12e
3 changed files with 3 additions and 3 deletions

View file

@ -7048,7 +7048,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
}
// I think that's everything we need?
free(infobuffer);
Z_Free(infobuffer);
}
//

View file

@ -5126,7 +5126,7 @@ menudemo_t *demolist;
#define DF_ENCORE 0x40
static INT16 replayScrollTitle = 0;
static INT8 replayScrollDelay = TICRATE, replayScrollDir = 1;
static SINT8 replayScrollDelay = TICRATE, replayScrollDir = 1;
static void PrepReplayList(void)
{

View file

@ -1227,7 +1227,7 @@ void V_DrawVhsEffect(boolean rewind)
UINT8 *tmapstart = ((UINT8 *)transtables + (6<<FF_TRANSSHIFT));
#endif
UINT8 *thismapstart;
INT8 offs;
SINT8 offs;
UINT8 barsize = vid.dupy<<5;
UINT8 updistort = vid.dupx<<(rewind ? 5 : 3);