thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'file-fixems' into 'master'

Browse source 
File Fixems

See merge request KartKrew/Kart!1055
This commit is contained in:
James R 2023-03-18 11:09:11 +00:00
commit 8de2910dcb
8 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/d_main.c
View file

@ -1208,7 +1208,10 @@ static void IdentifyVersion(void)
const char *musicpath = va(pandf,srb2waddir,str);\
int ms = W_VerifyNMUSlumps(musicpath, false); \
if (ms == 1) \
{ \
D_AddFile(startupiwads, musicpath); \
musicwads++; \
} \
else if (ms == 0) \
I_Error("File "str" has been modified with non-music/sound lumps"); \
}

2
src/d_netcmd.c
View file

@ -4653,7 +4653,7 @@ static void Command_ListWADS_f(void)
else if (i <= mainwads)
CONS_Printf("\x82 * %.2d\x80: %s\n", i, tempname);
else if (!wadfiles[i]->important)
CONS_Printf("\x86 %.2d: %s\n", i, tempname);
CONS_Printf("\x86 %c %.2d: %s\n", ((i <= mainwads + musicwads) ? '*' : ' '), i, tempname);
else
CONS_Printf(" %.2d: %s\n", i, tempname);
}

1
src/doomstat.h
View file

@ -132,6 +132,7 @@ struct recorddata_t
extern boolean modifiedgame;
extern boolean majormods;
extern UINT16 mainwads;
extern UINT16 musicwads;
extern boolean savemoddata; // This mod saves time/emblem data.
extern boolean usedCheats;
extern boolean imcontinuing; // Temporary flag while continuing

1
src/g_game.c
View file

@ -130,6 +130,7 @@ UINT8 numgameovers = 0; // for startinglives balance
SINT8 startinglivesbalance[maxgameovers+1] = {3, 5, 7, 9, 12, 15, 20, 25, 30, 40, 50, 75, 99, 0x7F};
UINT16 mainwads = 0;
UINT16 musicwads = 0;
boolean modifiedgame = false; // Set if homebrew PWAD stuff has been added.
boolean majormods = false; // Set if Lua/Gameplay SOC/replacement map has been added.
boolean savemoddata = false;

1
src/k_menu.h
View file

@ -1122,7 +1122,6 @@ void M_DrawReplayStartMenu(void);
// Misc menus:
#define LOCATIONSTRING1 "Visit \x83SRB2.ORG/MODS\x80 to get & make addons!"
#define LOCATIONSTRING2 "Visit \x88SRB2.ORG/MODS\x80 to get & make addons!"
void M_DrawAddons(void);
// Challenges menu:

9
src/k_menudraw.c
View file

@ -4478,13 +4478,14 @@ void M_DrawAddons(void)
}
if (Playing())
V_DrawCenteredString(BASEVIDWIDTH/2, 5, warningflags, "Adding files mid-game may cause problems.");
V_DrawCenteredString(BASEVIDWIDTH/2, 4, warningflags, "Adding files mid-game may cause problems.");
else
V_DrawCenteredString(BASEVIDWIDTH/2, 5, 0, (recommendedflags == V_SKYMAP ? LOCATIONSTRING2 : LOCATIONSTRING1));
V_DrawCenteredString(BASEVIDWIDTH/2, 4, 0,
LOCATIONSTRING1);
// DRAW MENU
x = currentMenu->x;
y = currentMenu->y + 1;
y = currentMenu->y - 1;
hilicol = V_GetStringColormap(highlightflags)[0];
@ -4602,7 +4603,7 @@ void M_DrawAddons(void)
if (modifiedgame)
V_DrawSmallScaledPatch(x, y, 0, addonsp[NUM_EXT+2]);
m = numwadfiles-(mainwads+2+1);
m = numwadfiles-(mainwads+musicwads+1);
V_DrawCenteredString(BASEVIDWIDTH/2, y+4, (majormods ? highlightflags : V_TRANSLUCENT), va("%ld ADD-ON%s LOADED", (long)m, (m == 1) ? "" : "S")); //+2 for music, sounds, +1 for main.kart
}

2
src/p_setup.c
View file

@ -8314,7 +8314,9 @@ boolean P_AddWadFile(const char *wadfilename)
if ((wadnum = P_PartialAddWadFile(wadfilename)) == UINT16_MAX)
return false;
if (P_PartialAddGetStage() >= 0)
P_MultiSetupWadFiles(true);
return true;
}

2
src/w_wad.c
View file

@ -816,7 +816,7 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
switch(type = ResourceFileDetect(filename))
{
case RET_SOC:
lumpinfo = ResGetLumpsStandalone(handle, &numlumps, "OBJCTCFG");
lumpinfo = ResGetLumpsStandalone(handle, &numlumps, "SOC_INIT");
break;
case RET_LUA:
lumpinfo = ResGetLumpsStandalone(handle, &numlumps, "LUA_INIT");