OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

4.14.1 accepts 4.15, bump version to 4.15.1

Browse source
This commit is contained in:
Ricardo Luís Vaz Silva 2025-03-03 08:15:10 -03:00
commit 7685553af8
6 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

2
src/common/scripting/frontend/zcc_compile.cpp
View file

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

4
src/version.h
View file

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

2
wadsrc/static/zscript.txt
View file

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

16
wadsrc/static/zscript/actors/actor.zs
View file

@ -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<Behavior> type = null);
native static BehaviorIterator Create(class<Behavior> type = null, class<Actor> ownerType = null);
@ -521,12 +521,12 @@ class Actor : Thinker native
return sin(fb * (180./32)) * 8;
}
native version("4.15") clearscope Behavior FindBehavior(class<Behavior> type) const;
native version("4.15") bool RemoveBehavior(class<Behavior> type);
native version("4.15") Behavior AddBehavior(class<Behavior> type);
native version("4.15") void TickBehaviors();
native version("4.15") void ClearBehaviors(class<Behavior> type = null);
native version("4.15") void MoveBehaviors(Actor from);
native version("4.15.1") clearscope Behavior FindBehavior(class<Behavior> type) const;
native version("4.15.1") bool RemoveBehavior(class<Behavior> type);
native version("4.15.1") Behavior AddBehavior(class<Behavior> type);
native version("4.15.1") void TickBehaviors();
native version("4.15.1") void ClearBehaviors(class<Behavior> type = null);
native version("4.15.1") void MoveBehaviors(Actor from);
native clearscope bool isFrozen() const;
virtual native void BeginPlay();

4
wadsrc/static/zscript/engine/dictionary.zs
View file

@ -5,7 +5,7 @@
*
* @note keys are case-sensitive.
*/
class Dictionary deprecated("4.15", "Use Map<String, String> instead")
class Dictionary deprecated("4.15.1", "Use Map<String, String> instead")
{
native static Dictionary Create();
@ -38,7 +38,7 @@ class Dictionary deprecated("4.15", "Use Map<String, String> instead")
* DictionaryIterator is not serializable. To make DictionaryIterator a class
* member, use `transient` keyword.
*/
class DictionaryIterator deprecated("4.15", "Use Map<String, String> instead")
class DictionaryIterator deprecated("4.15.1", "Use Map<String, String> instead")
{
native static DictionaryIterator Create(Dictionary dict);