From 7685553af8d3f451789a25209684ee0b8df3770f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Lu=C3=ADs=20Vaz=20Silva?= Date: Mon, 3 Mar 2025 08:15:10 -0300 Subject: [PATCH] 4.14.1 accepts 4.15, bump version to 4.15.1 --- src/common/engine/sc_man_scanner.re | 2 +- src/common/scripting/frontend/zcc_compile.cpp | 2 +- src/version.h | 4 ++-- wadsrc/static/zscript.txt | 2 +- wadsrc/static/zscript/actors/actor.zs | 16 ++++++++-------- wadsrc/static/zscript/engine/dictionary.zs | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/common/engine/sc_man_scanner.re b/src/common/engine/sc_man_scanner.re index a1283778e..5a0d88fb0 100644 --- a/src/common/engine/sc_man_scanner.re +++ b/src/common/engine/sc_man_scanner.re @@ -177,7 +177,7 @@ std2: /* Other keywords from UnrealScript */ 'abstract' { RET(TK_Abstract); } 'foreach' { RET(ParseVersion >= MakeVersion(4, 10, 0)? TK_ForEach : TK_Identifier); } - 'unsafe' { RET(ParseVersion >= MakeVersion(4, 15, 0)? TK_Unsafe : TK_Identifier); } + 'unsafe' { RET(ParseVersion >= MakeVersion(4, 15, 1)? TK_Unsafe : TK_Identifier); } 'true' { RET(TK_True); } 'false' { RET(TK_False); } 'none' { RET(TK_None); } diff --git a/src/common/scripting/frontend/zcc_compile.cpp b/src/common/scripting/frontend/zcc_compile.cpp index 2eff4dab0..492498f4b 100644 --- a/src/common/scripting/frontend/zcc_compile.cpp +++ b/src/common/scripting/frontend/zcc_compile.cpp @@ -2497,7 +2497,7 @@ void ZCCCompiler::CompileFunction(ZCC_StructWork *c, ZCC_FuncDeclarator *f, bool if (f->Flags & ZCC_Override) varflags |= VARF_Override; if (f->Flags & ZCC_Abstract) varflags |= VARF_Abstract; if (f->Flags & ZCC_VarArg) varflags |= VARF_VarArg; - if (f->Flags & ZCC_FuncConst) varflags |= (mVersion >= MakeVersion(4, 15, 0) ? VARF_ReadOnly | VARF_SafeConst : VARF_ReadOnly); // FuncConst method is internally marked as VARF_ReadOnly + if (f->Flags & ZCC_FuncConst) varflags |= (mVersion >= MakeVersion(4, 15, 1) ? VARF_ReadOnly | VARF_SafeConst : VARF_ReadOnly); // FuncConst method is internally marked as VARF_ReadOnly if (f->Flags & ZCC_FuncConstUnsafe) varflags |= VARF_ReadOnly; if (mVersion >= MakeVersion(2, 4, 0)) diff --git a/src/version.h b/src/version.h index 58e7927a1..7a04c37dc 100644 --- a/src/version.h +++ b/src/version.h @@ -50,12 +50,12 @@ const char *GetVersionString(); // These are for content versioning. #define VER_MAJOR 4 #define VER_MINOR 15 -#define VER_REVISION 0 +#define VER_REVISION 1 // 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 15 -#define ENG_REVISION 0 +#define ENG_REVISION 1 // Version identifier for network games. // Bump it every time you do a release unless you're certain you diff --git a/wadsrc/static/zscript.txt b/wadsrc/static/zscript.txt index b3565f8a7..54939e70a 100644 --- a/wadsrc/static/zscript.txt +++ b/wadsrc/static/zscript.txt @@ -1,4 +1,4 @@ -version "4.15" +version "4.15.1" // Generic engine code #include "zscript/engine/base.zs" diff --git a/wadsrc/static/zscript/actors/actor.zs b/wadsrc/static/zscript/actors/actor.zs index 898185701..c27dbf8ba 100644 --- a/wadsrc/static/zscript/actors/actor.zs +++ b/wadsrc/static/zscript/actors/actor.zs @@ -73,7 +73,7 @@ class ViewPosition native native readonly int Flags; } -class Behavior native play abstract version("4.15") +class Behavior native play abstract version("4.15.1") { native readonly Actor Owner; native readonly LevelLocals Level; @@ -84,7 +84,7 @@ class Behavior native play abstract version("4.15") virtual void Tick() {} } -class BehaviorIterator native abstract final version("4.15") +class BehaviorIterator native abstract final version("4.15.1") { native static BehaviorIterator CreateFrom(Actor mobj, class type = null); native static BehaviorIterator Create(class type = null, class ownerType = null); @@ -521,12 +521,12 @@ class Actor : Thinker native return sin(fb * (180./32)) * 8; } - native version("4.15") clearscope Behavior FindBehavior(class type) const; - native version("4.15") bool RemoveBehavior(class type); - native version("4.15") Behavior AddBehavior(class type); - native version("4.15") void TickBehaviors(); - native version("4.15") void ClearBehaviors(class type = null); - native version("4.15") void MoveBehaviors(Actor from); + native version("4.15.1") clearscope Behavior FindBehavior(class type) const; + native version("4.15.1") bool RemoveBehavior(class type); + native version("4.15.1") Behavior AddBehavior(class type); + native version("4.15.1") void TickBehaviors(); + native version("4.15.1") void ClearBehaviors(class type = null); + native version("4.15.1") void MoveBehaviors(Actor from); native clearscope bool isFrozen() const; virtual native void BeginPlay(); diff --git a/wadsrc/static/zscript/engine/dictionary.zs b/wadsrc/static/zscript/engine/dictionary.zs index 6c778492f..322d62b18 100644 --- a/wadsrc/static/zscript/engine/dictionary.zs +++ b/wadsrc/static/zscript/engine/dictionary.zs @@ -5,7 +5,7 @@ * * @note keys are case-sensitive. */ -class Dictionary deprecated("4.15", "Use Map instead") +class Dictionary deprecated("4.15.1", "Use Map instead") { native static Dictionary Create(); @@ -38,7 +38,7 @@ class Dictionary deprecated("4.15", "Use Map instead") * DictionaryIterator is not serializable. To make DictionaryIterator a class * member, use `transient` keyword. */ -class DictionaryIterator deprecated("4.15", "Use Map instead") +class DictionaryIterator deprecated("4.15.1", "Use Map instead") { native static DictionaryIterator Create(Dictionary dict);