Skip to content

Commit 7685553

Browse files
committed
4.14.1 accepts 4.15, bump version to 4.15.1
1 parent 02523b1 commit 7685553

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

src/common/engine/sc_man_scanner.re

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ std2:
177177
/* Other keywords from UnrealScript */
178178
'abstract' { RET(TK_Abstract); }
179179
'foreach' { RET(ParseVersion >= MakeVersion(4, 10, 0)? TK_ForEach : TK_Identifier); }
180-
'unsafe' { RET(ParseVersion >= MakeVersion(4, 15, 0)? TK_Unsafe : TK_Identifier); }
180+
'unsafe' { RET(ParseVersion >= MakeVersion(4, 15, 1)? TK_Unsafe : TK_Identifier); }
181181
'true' { RET(TK_True); }
182182
'false' { RET(TK_False); }
183183
'none' { RET(TK_None); }

src/common/scripting/frontend/zcc_compile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2497,7 +2497,7 @@ void ZCCCompiler::CompileFunction(ZCC_StructWork *c, ZCC_FuncDeclarator *f, bool
24972497
if (f->Flags & ZCC_Override) varflags |= VARF_Override;
24982498
if (f->Flags & ZCC_Abstract) varflags |= VARF_Abstract;
24992499
if (f->Flags & ZCC_VarArg) varflags |= VARF_VarArg;
2500-
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
2500+
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
25012501
if (f->Flags & ZCC_FuncConstUnsafe) varflags |= VARF_ReadOnly;
25022502

25032503
if (mVersion >= MakeVersion(2, 4, 0))

src/version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ const char *GetVersionString();
5050
// These are for content versioning.
5151
#define VER_MAJOR 4
5252
#define VER_MINOR 15
53-
#define VER_REVISION 0
53+
#define VER_REVISION 1
5454

5555
// This should always refer to the GZDoom version a derived port is based on and not reflect the derived port's version number!
5656
#define ENG_MAJOR 4
5757
#define ENG_MINOR 15
58-
#define ENG_REVISION 0
58+
#define ENG_REVISION 1
5959

6060
// Version identifier for network games.
6161
// Bump it every time you do a release unless you're certain you

wadsrc/static/zscript.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version "4.15"
1+
version "4.15.1"
22

33
// Generic engine code
44
#include "zscript/engine/base.zs"

wadsrc/static/zscript/actors/actor.zs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class ViewPosition native
7373
native readonly int Flags;
7474
}
7575

76-
class Behavior native play abstract version("4.15")
76+
class Behavior native play abstract version("4.15.1")
7777
{
7878
native readonly Actor Owner;
7979
native readonly LevelLocals Level;
@@ -84,7 +84,7 @@ class Behavior native play abstract version("4.15")
8484
virtual void Tick() {}
8585
}
8686

87-
class BehaviorIterator native abstract final version("4.15")
87+
class BehaviorIterator native abstract final version("4.15.1")
8888
{
8989
native static BehaviorIterator CreateFrom(Actor mobj, class<Behavior> type = null);
9090
native static BehaviorIterator Create(class<Behavior> type = null, class<Actor> ownerType = null);
@@ -521,12 +521,12 @@ class Actor : Thinker native
521521
return sin(fb * (180./32)) * 8;
522522
}
523523

524-
native version("4.15") clearscope Behavior FindBehavior(class<Behavior> type) const;
525-
native version("4.15") bool RemoveBehavior(class<Behavior> type);
526-
native version("4.15") Behavior AddBehavior(class<Behavior> type);
527-
native version("4.15") void TickBehaviors();
528-
native version("4.15") void ClearBehaviors(class<Behavior> type = null);
529-
native version("4.15") void MoveBehaviors(Actor from);
524+
native version("4.15.1") clearscope Behavior FindBehavior(class<Behavior> type) const;
525+
native version("4.15.1") bool RemoveBehavior(class<Behavior> type);
526+
native version("4.15.1") Behavior AddBehavior(class<Behavior> type);
527+
native version("4.15.1") void TickBehaviors();
528+
native version("4.15.1") void ClearBehaviors(class<Behavior> type = null);
529+
native version("4.15.1") void MoveBehaviors(Actor from);
530530

531531
native clearscope bool isFrozen() const;
532532
virtual native void BeginPlay();

wadsrc/static/zscript/engine/dictionary.zs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* @note keys are case-sensitive.
77
*/
8-
class Dictionary deprecated("4.15", "Use Map<String, String> instead")
8+
class Dictionary deprecated("4.15.1", "Use Map<String, String> instead")
99
{
1010
native static Dictionary Create();
1111

@@ -38,7 +38,7 @@ class Dictionary deprecated("4.15", "Use Map<String, String> instead")
3838
* DictionaryIterator is not serializable. To make DictionaryIterator a class
3939
* member, use `transient` keyword.
4040
*/
41-
class DictionaryIterator deprecated("4.15", "Use Map<String, String> instead")
41+
class DictionaryIterator deprecated("4.15.1", "Use Map<String, String> instead")
4242
{
4343
native static DictionaryIterator Create(Dictionary dict);
4444

0 commit comments

Comments
 (0)