zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-03-20 18:02:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

update/cleanup function pointers

Browse source
This commit is contained in:
Ricardo Luís Vaz Silva 2023-10-09 13:44:20 -03:00 committed by Christoph Oelckers
parent e3704605d8
commit 0ce4b3e7fb
4 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/engine/sc_man_scanner.re
View file

@ -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); }

10
src/version.h
View file

@ -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.

2
wadsrc/static/zscript.txt
View file

@ -1,4 +1,4 @@
version "4.11"
version "4.12"
// Generic engine code
#include "zscript/engine/base.zs"

1
wadsrc/static/zscript/engine/base.zs
View file

@ -755,7 +755,6 @@ class Object native
native vararg static void ThrowAbortException(String fmt, ...);
native static Function<void> FindFunction(Class<Object> cls, Name fn);
//native static Method<void> FindMethod(Class<Object> cls, Name fn);
native virtualscope void Destroy();