thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Get past w_wad.o

Browse source
This commit is contained in:
Sally Coolatta 2020-08-15 03:31:23 -04:00
parent 7d095060cf
commit fd5fe916bc
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/dehacked.c
View file

@ -5195,8 +5195,10 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
deh_warning("No word in this line: %s", s); deh_warning("No word in this line: %s", s);
} // end while } // end while
/*if (gamedataadded) -- REFRESHDIR_GAMEDATA murdered this /* REFRESHDIR_GAMEDATA murdered this
G_LoadGameData();*/ if (gamedataadded)
G_LoadGameData();
*/
if (gamestate == GS_TITLESCREEN) if (gamestate == GS_TITLESCREEN)
{ {

3
src/w_wad.c
View file

@ -713,7 +713,6 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
#ifndef NOMD5 #ifndef NOMD5
size_t i; size_t i;
#endif #endif
size_t packetsize;
UINT8 md5sum[16]; UINT8 md5sum[16];
boolean important; boolean important;
@ -886,7 +885,7 @@ INT32 W_InitMultipleFiles(char **filenames, boolean addons)
G_SetGameModified(true, false); G_SetGameModified(true, false);
//CONS_Debug(DBG_SETUP, "Loading %s\n", *filenames); //CONS_Debug(DBG_SETUP, "Loading %s\n", *filenames);
rc &= (W_InitFile(*filenames, numwadfiles < mainfiles, true) != INT16_MAX) ? 1 : 0; rc &= (W_InitFile(*filenames, !addons, true) != INT16_MAX) ? 1 : 0;
} }
if (!numwadfiles) if (!numwadfiles)

2
src/w_wad.h
View file

@ -153,7 +153,7 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup);
// W_InitMultipleFiles returns 1 if all is okay, 0 otherwise, // W_InitMultipleFiles returns 1 if all is okay, 0 otherwise,
// so that it stops with a message if a file was not found, but not if all is okay. // so that it stops with a message if a file was not found, but not if all is okay.
// W_InitMultipleFiles exits if a file was not found, but not if all is okay. // W_InitMultipleFiles exits if a file was not found, but not if all is okay.
INT32 W_InitMultipleFiles(char **filenames, UINT16 mainfiles); INT32 W_InitMultipleFiles(char **filenames, boolean addons);
const char *W_CheckNameForNumPwad(UINT16 wad, UINT16 lump); const char *W_CheckNameForNumPwad(UINT16 wad, UINT16 lump);
const char *W_CheckNameForNum(lumpnum_t lumpnum); const char *W_CheckNameForNum(lumpnum_t lumpnum);