diff --git a/src/dobjtype.cpp b/src/dobjtype.cpp index e3dfd232a..9d2d6f438 100644 --- a/src/dobjtype.cpp +++ b/src/dobjtype.cpp @@ -266,8 +266,6 @@ void PClass::StaticShutdown () // This flags DObject::Destroy not to call any scripted OnDestroy methods anymore. 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) { p.PendingWeapon = nullptr; diff --git a/wadsrc/static/zscript/base.txt b/wadsrc/static/zscript/base.txt index d2868a36f..cc7c3abbb 100644 --- a/wadsrc/static/zscript/base.txt +++ b/wadsrc/static/zscript/base.txt @@ -374,13 +374,13 @@ class Object native 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. - private native int BuiltinRandom(voidptr rng, int min, int max); - private native double BuiltinFRandom(voidptr rng, double min, double max); - private native int BuiltinRandom2(voidptr rng, int mask); - private native 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 Class BuiltinNameToClass(Name nm, Class filter); - private native Object BuiltinClassCast(Object inptr, Class test); + private native static int BuiltinRandom(voidptr rng, int min, int max); + private native static double BuiltinFRandom(voidptr rng, double min, double max); + private native static int BuiltinRandom2(voidptr rng, int mask); + private native static void BuiltinRandomSeed(voidptr rng, int seed); + private native static int BuiltinCallLineSpecial(int special, Actor activator, int arg1, int arg2, int arg3, int arg4, int arg5); + private native static Class BuiltinNameToClass(Name nm, Class filter); + private native static Object BuiltinClassCast(Object inptr, Class test); // These really should be global functions... native static String G_SkillName();