From 2db9fa1b96a1f6eba8c6d6dee38b58476eddc2b9 Mon Sep 17 00:00:00 2001 From: SeventhSentinel Date: Thu, 3 Jan 2019 16:30:50 -0500 Subject: [PATCH 1/2] Update SOC version, make base SRB2 SOC throw a warning --- src/dehacked.c | 6 +++++- src/dehacked.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/dehacked.c b/src/dehacked.c index 8cb70412..c6c9cced 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -3686,13 +3686,17 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad) // no undo support for this insanity yet //DEH_WriteUndoline(word, word2, UNDO_HEADER); } - else if (fastcmp(word, "SRB2")) + else if (fastcmp(word, "SRB2KART")) { INT32 ver = searchvalue(strtok(NULL, "\n")); if (ver != PATCHVERSION) deh_warning("Patch is for SRB2Kart version %d,\nonly version %d is supported", ver, PATCHVERSION); //DEH_WriteUndoline(word, va("%d", ver), UNDO_NONE); } + else if (fastcmp(word, "SRB2")) + { + deh_warning("Patch is only compatible with base SRB2."); + } // Clear all data in certain locations (mostly for unlocks) // Unless you REALLY want to piss people off, // define a custom gamedata /before/ doing this!! diff --git a/src/dehacked.h b/src/dehacked.h index 411cb6c1..27ceae58 100644 --- a/src/dehacked.h +++ b/src/dehacked.h @@ -54,7 +54,7 @@ extern const char *superactions[MAXRECURSION]; extern UINT8 superstack; // If the dehacked patch does not match this version, we throw a warning -#define PATCHVERSION 210 +#define PATCHVERSION 102 #define MAXLINELEN 1024 From b513b8a11b088a7d4d9acd1faa0a57377574f1ee Mon Sep 17 00:00:00 2001 From: SeventhSentinel Date: Thu, 3 Jan 2019 16:43:01 -0500 Subject: [PATCH 2/2] Actually, let's just do "1" --- src/dehacked.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dehacked.h b/src/dehacked.h index 27ceae58..683fe7d9 100644 --- a/src/dehacked.h +++ b/src/dehacked.h @@ -54,7 +54,7 @@ extern const char *superactions[MAXRECURSION]; extern UINT8 superstack; // If the dehacked patch does not match this version, we throw a warning -#define PATCHVERSION 102 +#define PATCHVERSION 1 #define MAXLINELEN 1024