stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-12 21:01:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into next

Browse source
This commit is contained in:
Monster Iestyn 2019-08-24 23:28:38 +01:00
commit 964693d542
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/d_netfil.c
View file

@ -752,9 +752,12 @@ void Got_Filetxpak(void)
{ {
INT32 filenum = netbuffer->u.filetxpak.fileid; INT32 filenum = netbuffer->u.filetxpak.fileid;
fileneeded_t *file = &fileneeded[filenum]; fileneeded_t *file = &fileneeded[filenum];
char *filename = file->filename; char *filename;
static INT32 filetime = 0; static INT32 filetime = 0;
filename = va("%s", file->filename);
nameonly(filename);
if (!(strcmp(filename, "srb2.srb") if (!(strcmp(filename, "srb2.srb")
&& strcmp(filename, "srb2.wad") && strcmp(filename, "srb2.wad")
&& strcmp(filename, "zones.dta") && strcmp(filename, "zones.dta")
@ -765,6 +768,8 @@ void Got_Filetxpak(void)
)) ))
I_Error("Tried to download \"%s\"", filename); I_Error("Tried to download \"%s\"", filename);
filename = file->filename;
if (filenum >= fileneedednum) if (filenum >= fileneedednum)
{ {
DEBFILE(va("fileframent not needed %d>%d\n", filenum, fileneedednum)); DEBFILE(va("fileframent not needed %d>%d\n", filenum, fileneedednum));

2
src/m_cheat.c
View file

@ -109,7 +109,7 @@ static UINT8 cheatf_devmode(void)
G_SetGameModified(false); G_SetGameModified(false);
for (i = 0; i < MAXUNLOCKABLES; i++) for (i = 0; i < MAXUNLOCKABLES; i++)
unlockables[i].unlocked = true; unlockables[i].unlocked = true;
devparm = TRUE; devparm = true;
cv_debug |= 0x8000; cv_debug |= 0x8000;
// Refresh secrets menu existing. // Refresh secrets menu existing.