zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 23:02:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- declare builtins as static.

Browse source
This commit is contained in:
Christoph Oelckers 2018-11-25 21:47:28 +01:00
parent 176da5de68
commit 9475bfe4f1
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dobjtype.cpp
View file

@ -266,8 +266,6 @@ void PClass::StaticShutdown ()
// This flags DObject::Destroy not to call any scripted OnDestroy methods anymore. // This flags DObject::Destroy not to call any scripted OnDestroy methods anymore.
bVMOperational = false; bVMOperational = false;
// PendingWeapon must be cleared manually because it is not subjected to the GC if it contains WP_NOCHANGE, which is just RUNTIME_CLASS(AWWeapon).
// But that will get cleared here, confusing the GC if the value is left in.
for (auto &p : players) for (auto &p : players)
{ {
p.PendingWeapon = nullptr; p.PendingWeapon = nullptr;

14
wadsrc/static/zscript/base.txt
View file

@ -374,13 +374,13 @@ class Object native
native bool bDestroyed; native bool bDestroyed;
// These must be defined in some class, so that the compiler can find them. Object is just fine, as long as they are private to external code. // These must be defined in some class, so that the compiler can find them. Object is just fine, as long as they are private to external code.
private native int BuiltinRandom(voidptr rng, int min, int max); private native static int BuiltinRandom(voidptr rng, int min, int max);
private native double BuiltinFRandom(voidptr rng, double min, double max); private native static double BuiltinFRandom(voidptr rng, double min, double max);
private native int BuiltinRandom2(voidptr rng, int mask); private native static int BuiltinRandom2(voidptr rng, int mask);
private native void BuiltinRandomSeed(voidptr rng, int seed); private native static void BuiltinRandomSeed(voidptr rng, int seed);
private native int BuiltinCallLineSpecial(int special, Actor activator, int arg1, int arg2, int arg3, int arg4, int arg5); private native static int BuiltinCallLineSpecial(int special, Actor activator, int arg1, int arg2, int arg3, int arg4, int arg5);
private native Class<Object> BuiltinNameToClass(Name nm, Class<Object> filter); private native static Class<Object> BuiltinNameToClass(Name nm, Class<Object> filter);
private native Object BuiltinClassCast(Object inptr, Class<Object> test); private native static Object BuiltinClassCast(Object inptr, Class<Object> test);
// These really should be global functions... // These really should be global functions...
native static String G_SkillName(); native static String G_SkillName();