lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into next

This commit is contained in:
James R 2020-02-21 21:06:27 -08:00
parent 76f26cda24 f6df71ba54
commit af12f26f37
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/d_clisrv.c
View File

@ -3945,7 +3945,9 @@ static void HandlePacketFromPlayer(SINT8 node)
INT32 netconsole; INT32 netconsole;
tic_t realend, realstart; tic_t realend, realstart;
UINT8 *pak, *txtpak, numtxtpak; UINT8 *pak, *txtpak, numtxtpak;
#ifndef NOMD5
UINT8 finalmd5[16];/* Well, it's the cool thing to do? */ UINT8 finalmd5[16];/* Well, it's the cool thing to do? */
#endif
txtpak = NULL; txtpak = NULL;

2
src/w_wad.c
View File

@ -670,7 +670,9 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
wadfile_t *wadfile; wadfile_t *wadfile;
restype_t type; restype_t type;
UINT16 numlumps = 0; UINT16 numlumps = 0;
#ifndef NOMD5
size_t i; size_t i;
#endif
size_t packetsize; size_t packetsize;
UINT8 md5sum[16]; UINT8 md5sum[16];
boolean important; boolean important;