From 89f373b6060cf6bbfa544816c487f7c6ff91f43a Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Sun, 28 Jan 2018 13:48:26 -0500 Subject: [PATCH] Revert "Merge commit 'refs/pull/411/head' of https://github.com/coelckers/gzdoom" This reverts commit 799a308ef7be579fb63dbbe3156c85ff54f11c90, reversing changes made to 038654eb8144fac6125ea8730c8ee5722d0da755. --- src/dsectoreffect.cpp | 6 ------ wadsrc/static/zscript/base.txt | 2 -- 2 files changed, 8 deletions(-) diff --git a/src/dsectoreffect.cpp b/src/dsectoreffect.cpp index 80a2cceac..b1d517fe7 100644 --- a/src/dsectoreffect.cpp +++ b/src/dsectoreffect.cpp @@ -79,12 +79,6 @@ void DSectorEffect::Serialize(FSerializer &arc) DEFINE_FIELD(DSectorEffect, m_Sector) -DEFINE_ACTION_FUNCTION(DSectorEffect, GetSector) -{ - PARAM_SELF_PROLOGUE(DSectorEffect); - ACTION_RETURN_POINTER(self->m_Sector); -} - IMPLEMENT_CLASS(DMover, true, true) IMPLEMENT_POINTERS_START(DMover) diff --git a/wadsrc/static/zscript/base.txt b/wadsrc/static/zscript/base.txt index 7462063e7..dc218dc16 100644 --- a/wadsrc/static/zscript/base.txt +++ b/wadsrc/static/zscript/base.txt @@ -795,8 +795,6 @@ struct StringStruct native class SectorEffect : Thinker native { native protected Sector m_Sector; - - native clearscope Sector GetSector(); } class Mover : SectorEffect native