incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjust wad load order for new assets

Browse source
This commit is contained in:
NepDisk 2025-02-23 11:33:30 -05:00
parent 244cfa9538
commit bf77bd7f3a
4 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/d_main.cpp
View file

@ -1201,11 +1201,11 @@ static void IdentifyVersion(void)
#define GRAPHICSNAME "gfx.kart"
#define SOUNDSNAME "sounds.kart"
D_AddFile(startupiwads, va(pandf,srb2waddir,MAINNAME));
D_AddFile(startupiwads, va(pandf,srb2waddir,GRAPHICSNAME));
D_AddFile(startupiwads, va(pandf,srb2waddir,TEXTURESNAME));
D_AddFile(startupiwads, va(pandf,srb2waddir,CHARSNAME));
D_AddFile(startupiwads, va(pandf,srb2waddir,MAPSNAME));
D_AddFile(startupiwads, va(pandf,srb2waddir,MAINNAME));
//D_AddFile(startupiwads, va(pandf,srb2waddir,FOLLOWERSNAME));
#ifdef USE_PATCH_FILE
D_AddFile(startupiwads, va(pandf,srb2waddir,PATCHNAME));
@ -1484,22 +1484,22 @@ void D_SRB2Main(void)
#ifndef DEVELOP
// Check MD5s of autoloaded files
// Note: Do not add any files that ignore MD5!
W_VerifyFileMD5(mainwads, ASSET_HASH_SRB2_SRB); // srb2.srb
mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_MAIN_PK3); // main.pk3
W_VerifyFileMD5(mainwads, ASSET_HASH_SRB2_SRB); // srb2.srb
mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_GFX_KART); // gfx.pk3
mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_TEXTURES_KART); // textures.pk3
mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_TEXTURES_KART); // textures.pk3
mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_CHARS_KART); // chars.kart
mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_MAPS_KART); // maps.pk3 -- 4 - If you touch this, make sure to touch up the majormods stuff below.
mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_MAPS_KART); // maps.kart
mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_MAIN_PK3); // main.pk3
//mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_FOLLOWERS_PK3); // followers.pk3
#ifdef USE_PATCH_FILE
mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_PATCH_PK3); // patch.pk3
#endif
#else
mainwads++; // main.pk3
mainwads++; // gfx.kart
mainwads++; // textures.kart
mainwads++; // chars.kart
mainwads++; // maps.kart
mainwads++; // main.pk3
//mainwads++; // followers.pk3
#ifdef USE_PATCH_FILE
mainwads++; // patch.pk3

2
src/k_hud.c
View file

@ -588,6 +588,8 @@ const char *K_GetItemPatch(UINT8 item, boolean tiny)
return (tiny ? "K_ISPOGO" : "K_ITPOGO");
case KITEM_SUPERRING:
return (tiny ? "K_ISRING" : "K_ITRING");
case KITEM_DROPTARGET:
return (tiny ? "K_ISDTRG" : "K_ITDTRG");
case KITEM_KITCHENSINK:
return (tiny ? "K_ISSINK" : "K_ITSINK");
case KRITEM_TRIPLEORBINAUT:

5
src/m_menu.c
View file

@ -1576,7 +1576,7 @@ static menuitem_t OP_AdvServerOptionsMenu[] =
{IT_STRING | IT_CVAR, NULL, "Karma Comeback", &cv_kartcomeback, 66},
};*/
#define ITEMTOGGLEBOTTOMRIGHT
//#define ITEMTOGGLEBOTTOMRIGHT
static menuitem_t OP_MonitorToggleMenu[] =
{
@ -1609,6 +1609,7 @@ static menuitem_t OP_MonitorToggleMenu[] =
{IT_KEYHANDLER | IT_NOTHING, NULL, "Pogo Springs", {.routine = M_HandleMonitorToggles}, KITEM_POGOSPRING},
{IT_KEYHANDLER | IT_NOTHING, NULL, "Super Rings", {.routine = M_HandleMonitorToggles}, KITEM_SUPERRING},
{IT_KEYHANDLER | IT_NOTHING, NULL, "Kitchen Sinks", {.routine = M_HandleMonitorToggles}, KITEM_KITCHENSINK},
{IT_KEYHANDLER | IT_NOTHING, NULL, "Drop Target", {.routine = M_HandleMonitorToggles}, KITEM_DROPTARGET},
#ifdef ITEMTOGGLEBOTTOMRIGHT
{IT_KEYHANDLER | IT_NOTHING, NULL, "---", {.routine = M_HandleMonitorToggles}, 255},
#endif
@ -11387,7 +11388,7 @@ static void M_HandleMonitorToggles(INT32 choice)
S_StartSound(NULL, sfx_menu1);
column--;
if (column < 0)
column = width-1;
column = width;
if (((column*height)+row) >= currentMenu->numitems)
column--;
next = max(((column*height)+row), 0);

2
src/r_skins.c
View file

@ -153,7 +153,7 @@ void R_InitSkins(void)
for (i = 0; i < numwadfiles; i++)
{
if (i == 4) // chars.kart
if (i == 3) // chars.kart
R_IHateThatHedgehog((UINT16)i);
R_AddSkins((UINT16)i);
R_PatchSkins((UINT16)i);