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

Softcode these? You got it boss

Browse source 
SOC warnings are an error now for mainwads btw :^)
This commit is contained in:
GenericHeroGuy 2025-12-22 13:22:52 +01:00
parent 57993914c7
commit d237a2720c
3 changed files with 5 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_main.cpp
View file

@ -93,7 +93,7 @@
#define ASSET_HASH_TEXTURES_KART 0xb4211b2f32b6a291
#define ASSET_HASH_CHARS_KART 0x1e68a3e01aa5c68b
#define ASSET_HASH_MAPS_KART 0x38558ed00da41ce9
#define ASSET_HASH_MAIN_PK3 0x6ae176cd227ed0eb
#define ASSET_HASH_MAIN_PK3 0x5ae5830da34ceb41
#define ASSET_HASH_MAPPATCH_PK3 0x6ad99efcfaafb70f
#define ASSET_HASH_BONUSCHARS_KART 0x60e6f13d822a7461
#ifdef USE_PATCH_FILE

2
src/dehacked.c
View file

@ -900,7 +900,7 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
if (deh_num_warning)
{
CONS_Printf(M_GetText("%d warning%s in the SOC lump\n"), deh_num_warning, deh_num_warning == 1 ? "" : "s");
if (devparm) {
if (devparm || numwadfiles > 1) {
I_Error("%s%s",va(M_GetText("%d warning%s in the SOC lump\n"), deh_num_warning, deh_num_warning == 1 ? "" : "s"), M_GetText("See log.txt for details.\n"));
//while (!I_GetKey())
//I_OsPolling();

28
src/m_cond.c
View file

@ -35,36 +35,14 @@ conditionset_t conditionSets[MAXCONDITIONSETS];
emblem_t emblemlocations[MAXEMBLEMS] = {0};
// Default Extra Emblems
extraemblem_t extraemblems[MAXEXTRAEMBLEMS] =
{
{"Novice", "Play 100 matches", 10, 'C', 0,SKINCOLOR_RED, 0},
{"Standard", "Play 250 matches", 11, 'C', 0,SKINCOLOR_RED, 0},
{"Expert", "Play 500 matches", 12, 'C', 0,SKINCOLOR_RED, 0},
{"Master", "Play 750 matches", 13, 'C', 0,SKINCOLOR_RED, 0},
{"Nightmare", "Play 1000 matches", 14, 'C', 0,SKINCOLOR_RED, 0},
};
extraemblem_t extraemblems[MAXEXTRAEMBLEMS] = {0};
// Unlockables
// Default Unlockables
// TODO: Softcode these or make new objectives even!
unlockable_t unlockables[MAXUNLOCKABLES] =
{
// Name, Objective, Showing Conditionset, ConditionSet, Unlock Type, Variable, NoCecho, NoChecklist, Unlocked
/* 01 */ {"Egg Cup", "", -1, 1, SECRET_NONE, 0, NULL, false, false, 0},
/* 02 */ {"Chao Cup", "", -1, 2, SECRET_NONE, 0, NULL, false, false, 0},
/* 03 */ {"SMK Cup", "", 2, 3, SECRET_NONE, 0, NULL, false, false, 0},
/* 04 */ {"Hard Game Speed", "", -1, 4, SECRET_HARDSPEED, 0, NULL, false, false, 0},
/* 05 */ {"Encore Mode", "", 4, 5, SECRET_ENCORE, 0, NULL, false, false, 0},
/* 06 */ {"Hell Attack", "", 6, 6, SECRET_HELLATTACK, 0, NULL, false, false, 0},
/* 07 */ {"Record Attack", "", -1, -1, SECRET_TIMEATTACK, 0, NULL ,true, true, 0},
/* 08 */ {"Capsule Attack", "", -1, -1, SECRET_ITEMBREAKER, 0, NULL, true, true, 0},
};
unlockable_t unlockables[MAXUNLOCKABLES] = {0};
// Number of emblems and extra emblems
INT32 numemblems = 0;
INT32 numextraemblems = 5;
INT32 numextraemblems = 0;
// DEFAULT CONDITION SETS FOR SRB2KART:
void M_SetupDefaultConditionSets(void)