diff --git a/src/common/engine/sc_man_scanner.re b/src/common/engine/sc_man_scanner.re index e5d507a28d5..8bca2ccc656 100644 --- a/src/common/engine/sc_man_scanner.re +++ b/src/common/engine/sc_man_scanner.re @@ -169,7 +169,7 @@ std2: 'map' { RET(TK_Map); } 'mapiterator' { RET(TK_MapIterator); } 'array' { RET(TK_Array); } - 'function' { RET(ParseVersion >= MakeVersion(4, 11, 0)? TK_FunctionType : TK_Identifier); } + 'function' { RET(ParseVersion >= MakeVersion(4, 12, 0)? TK_FunctionType : TK_Identifier); } 'in' { RET(TK_In); } 'sizeof' { RET(TK_SizeOf); } 'alignof' { RET(TK_AlignOf); } diff --git a/src/version.h b/src/version.h index e995dad82e3..7224391838e 100644 --- a/src/version.h +++ b/src/version.h @@ -41,20 +41,20 @@ const char *GetVersionString(); /** Lots of different version numbers **/ -#define VERSIONSTR "4.11pre" +#define VERSIONSTR "4.12pre" // The version as seen in the Windows resource -#define RC_FILEVERSION 4,10,9999,0 -#define RC_PRODUCTVERSION 4,10,9999,0 +#define RC_FILEVERSION 4,11,9999,0 +#define RC_PRODUCTVERSION 4,11,9999,0 #define RC_PRODUCTVERSION2 VERSIONSTR // These are for content versioning. #define VER_MAJOR 4 -#define VER_MINOR 11 +#define VER_MINOR 12 #define VER_REVISION 0 // This should always refer to the GZDoom version a derived port is based on and not reflect the derived port's version number! #define ENG_MAJOR 4 -#define ENG_MINOR 11 +#define ENG_MINOR 12 #define ENG_REVISION 0 // Version identifier for network games. diff --git a/wadsrc/static/zscript.txt b/wadsrc/static/zscript.txt index 27888cca959..04331c388b8 100644 --- a/wadsrc/static/zscript.txt +++ b/wadsrc/static/zscript.txt @@ -1,4 +1,4 @@ -version "4.11" +version "4.12" // Generic engine code #include "zscript/engine/base.zs" diff --git a/wadsrc/static/zscript/engine/base.zs b/wadsrc/static/zscript/engine/base.zs index dae12d37bb3..d43d8f95cb9 100644 --- a/wadsrc/static/zscript/engine/base.zs +++ b/wadsrc/static/zscript/engine/base.zs @@ -755,7 +755,6 @@ class Object native native vararg static void ThrowAbortException(String fmt, ...); native static Function FindFunction(Class cls, Name fn); - //native static Method FindMethod(Class cls, Name fn); native virtualscope void Destroy();