Merge branch 'soc-srb2-fix' into 'master'
The "SRB2" directive, for warning if a SOC isn't compatible See merge request STJr/SRB2!551
This commit is contained in:
commit
f077413f31
|
@ -4462,20 +4462,34 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
|
||||||
ignorelines(f);
|
ignorelines(f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Last I heard this crashes the game if you try to use it
|
else if (fastcmp(word, "SRB2"))
|
||||||
// so this is disabled for now
|
|
||||||
// -- Monster Iestyn
|
|
||||||
/* else if (fastcmp(word, "SRB2"))
|
|
||||||
{
|
{
|
||||||
INT32 ver = searchvalue(strtok(NULL, "\n"));
|
if (isdigit(word2[0]))
|
||||||
if (ver != PATCHVERSION)
|
{
|
||||||
deh_warning("Patch is for SRB2 version %d,\nonly version %d is supported", ver, PATCHVERSION);
|
i = atoi(word2);
|
||||||
|
if (i != PATCHVERSION)
|
||||||
|
{
|
||||||
|
deh_warning(
|
||||||
|
"Patch is for SRB2 version %d, "
|
||||||
|
"only version %d is supported",
|
||||||
|
i,
|
||||||
|
PATCHVERSION
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
deh_warning(
|
||||||
|
"SRB2 version definition has incorrect format, "
|
||||||
|
"use \"SRB2 %d\"",
|
||||||
|
PATCHVERSION
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// Clear all data in certain locations (mostly for unlocks)
|
// Clear all data in certain locations (mostly for unlocks)
|
||||||
// Unless you REALLY want to piss people off,
|
// Unless you REALLY want to piss people off,
|
||||||
// define a custom gamedata /before/ doing this!!
|
// define a custom gamedata /before/ doing this!!
|
||||||
// (then again, modifiedgame will prevent game data saving anyway)
|
// (then again, modifiedgame will prevent game data saving anyway)
|
||||||
*/
|
|
||||||
else if (fastcmp(word, "CLEAR"))
|
else if (fastcmp(word, "CLEAR"))
|
||||||
{
|
{
|
||||||
boolean clearall = (fastcmp(word2, "ALL"));
|
boolean clearall = (fastcmp(word2, "ALL"));
|
||||||
|
|
|
@ -47,7 +47,7 @@ extern const char *superactions[MAXRECURSION];
|
||||||
extern UINT8 superstack;
|
extern UINT8 superstack;
|
||||||
|
|
||||||
// If the dehacked patch does not match this version, we throw a warning
|
// If the dehacked patch does not match this version, we throw a warning
|
||||||
#define PATCHVERSION 210
|
#define PATCHVERSION 220
|
||||||
|
|
||||||
#define MAXLINELEN 1024
|
#define MAXLINELEN 1024
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue