From 3e0fa5cc1b4a6e14ae440149fc7bfcfe1532075b Mon Sep 17 00:00:00 2001 From: drfrag Date: Thu, 31 Oct 2019 17:37:54 +0100 Subject: [PATCH] - Bumped ZScript version to be the same as in GZDoom as Graf suggested. --- src/scripting/zscript/zcc_parser.cpp | 6 +++++- src/version.h | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/scripting/zscript/zcc_parser.cpp b/src/scripting/zscript/zcc_parser.cpp index de15dd94a..3eb62374e 100644 --- a/src/scripting/zscript/zcc_parser.cpp +++ b/src/scripting/zscript/zcc_parser.cpp @@ -403,11 +403,15 @@ static void DoParse(int lumpnum) { sc.ScriptError("Bad version directive"); } - if (state.ParseVersion > MakeVersion(VER_MAJOR, VER_MINOR, VER_REVISION) && !Args->CheckParm("-zsvoverride")) + if (state.ParseVersion > MakeVersion(VER_MAJOR, VER_MINOR, VER_REVISION)) { Printf(TEXTCOLOR_RED "Warning: ZScript version mismatch. %d.%d.%d required but only %d.%d.%d supported.\n", state.ParseVersion.major, state.ParseVersion.minor, state.ParseVersion.revision, VER_MAJOR, VER_MINOR, VER_REVISION); } + else if (state.ParseVersion > MakeVersion(3, 9, 0)) + { + Printf(TEXTCOLOR_RED "Warning: ZScript version %d.%d.%d only partially supported.\n", VER_MAJOR, VER_MINOR, VER_REVISION); + } } else { diff --git a/src/version.h b/src/version.h index f8fef162a..8cb46e352 100644 --- a/src/version.h +++ b/src/version.h @@ -48,9 +48,9 @@ const char *GetVersionString(); #define RC_PRODUCTVERSION 3,83,1 #define RC_PRODUCTVERSION2 VERSIONSTR // These are for content versioning. -#define VER_MAJOR 3 -#define VER_MINOR 9 -#define VER_REVISION 0 +#define VER_MAJOR 4 +#define VER_MINOR 2 +#define VER_REVISION 3 // Version identifier for network games. // Bump it every time you do a release unless you're certain you