From 3dd87cfd7f712832dfd451b5ee312bc288c5b7c2 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 14 Dec 2022 22:21:51 +0100 Subject: [PATCH] - got rid of checkType. --- source/games/duke/src/vmexports.cpp | 7 ------- wadsrc/static/zscript/games/duke/actors/firefly.zs | 2 +- wadsrc/static/zscript/games/duke/dukeactor.zs | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/source/games/duke/src/vmexports.cpp b/source/games/duke/src/vmexports.cpp index 7173114ac..1907b334c 100644 --- a/source/games/duke/src/vmexports.cpp +++ b/source/games/duke/src/vmexports.cpp @@ -732,13 +732,6 @@ DEFINE_ACTION_FUNCTION(DDukeActor, attackerflag2) ACTION_RETURN_BOOL(!!attackerflag(self, EDukeFlags2::FromInt(mask))); } -DEFINE_ACTION_FUNCTION(DDukeActor, checktype) // for temporary checking of types that haven't been ported yet. -{ - PARAM_SELF_PROLOGUE(DDukeActor); - PARAM_STRING(name); - ACTION_RETURN_BOOL(self->spr.picnum == tileForName(name)); -} - //--------------------------------------------------------------------------- // diff --git a/wadsrc/static/zscript/games/duke/actors/firefly.zs b/wadsrc/static/zscript/games/duke/actors/firefly.zs index 2e029a706..8a5338b2d 100644 --- a/wadsrc/static/zscript/games/duke/actors/firefly.zs +++ b/wadsrc/static/zscript/games/duke/actors/firefly.zs @@ -19,7 +19,7 @@ class DukeFireflyFlyingEffect : DukeActor let Owner = self.ownerActor; - if (!Owner || !Owner.checkType("FIREFLY")) + if (!Owner || !(Owner is 'DukeFirefly')) { self.Destroy(); return; diff --git a/wadsrc/static/zscript/games/duke/dukeactor.zs b/wadsrc/static/zscript/games/duke/dukeactor.zs index 78456fcde..1ced2af60 100644 --- a/wadsrc/static/zscript/games/duke/dukeactor.zs +++ b/wadsrc/static/zscript/games/duke/dukeactor.zs @@ -250,7 +250,6 @@ class DukeActor : CoreActor native native int actorflag3(int mask); native int attackerflag1(int mask); native int attackerflag2(int mask); - deprecated("4.9") native bool checktype(String name); // this must not stay in the code, so mark it deprecated to keep the annoying warning at startup.