Skip to content

Commit

Permalink
update/cleanup function pointers
Browse files Browse the repository at this point in the history
  • Loading branch information
RicardoLuis0 committed Oct 9, 2023
1 parent 0b048ca commit 6cda2c8
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/common/engine/sc_man_scanner.re
Original file line number Diff line number Diff line change
Expand Up @@ -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); }
Expand Down
10 changes: 5 additions & 5 deletions src/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion wadsrc/static/zscript.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version "4.11"
version "4.12"

// Generic engine code
#include "zscript/engine/base.zs"
Expand Down
1 change: 0 additions & 1 deletion wadsrc/static/zscript/engine/base.zs
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down

0 comments on commit 6cda2c8

Please sign in to comment.