From 3fcecedf32d72b527bde1fbf398a3a9bdedca473 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 29 Dec 2021 19:16:09 +0100 Subject: [PATCH] - deleted ClearContent functions from actor classes. this is a leftover from pre-DObject times and no longer needed. --- source/core/coreactor.h | 8 -------- source/games/blood/src/bloodactor.h | 21 --------------------- source/games/duke/src/types.h | 12 ------------ source/games/exhumed/src/exhumedactor.h | 7 ------- source/games/sw/src/swactor.h | 6 ------ 5 files changed, 54 deletions(-) diff --git a/source/core/coreactor.h b/source/core/coreactor.h index d14278984..04a4cb6a1 100644 --- a/source/core/coreactor.h +++ b/source/core/coreactor.h @@ -26,14 +26,6 @@ public: DCoreActor& operator=(const DCoreActor& other) = delete; virtual void Serialize(FSerializer& arc); - // This may only be called when all actor lists are clean. - virtual void ClearContent() - { - link_stat = MAXSTATUS; - link_sector = nullptr; - prevStat = nextStat = prevSect = nextSect = nullptr; - spr = {}; - } virtual void BeginPlay() {} void OnDestroy() override; diff --git a/source/games/blood/src/bloodactor.h b/source/games/blood/src/bloodactor.h index 01c6c384e..839dcecaa 100644 --- a/source/games/blood/src/bloodactor.h +++ b/source/games/blood/src/bloodactor.h @@ -42,27 +42,6 @@ public: DBloodActor& operator=(const DBloodActor& other) = default; - void ClearContent() override - { - dudeSlope = 0; - hit = {}; - dudeExtra = {}; - spriteMass = {}; - genDudeExtra = {}; - prevmarker = nullptr; - ownerActor = nullptr; - basePoint = {}; - xspr = {}; - hasx = false; - interpolated = false; - xvel = yvel = zvel = 0; - explosionhackflag = false; - interpolated = false; - condition[0] = {}; - condition[1] = {}; - cumulDamage = 0; - Super::ClearContent(); - } bool hasX() { return hasx; } void addX() { hasx = true; } diff --git a/source/games/duke/src/types.h b/source/games/duke/src/types.h index 43fa23596..646f306b5 100644 --- a/source/games/duke/src/types.h +++ b/source/games/duke/src/types.h @@ -58,18 +58,6 @@ public: DDukeActor() = default; size_t PropagateMark() override; - void ClearContent() override - { - Super::ClearContent(); - temp_sect = actorstayput = nullptr; - temp_actor = seek_actor = nullptr; - ownerActor = nullptr; - hitOwnerActor = nullptr; - cgg = spriteextra = 0; - attackertype = ang = extra = movflag = tempang = dispicnum = timetosleep = 0; - floorz = ceilingz = lastvx = lastvy = aflags = saved_ammo = 0; - memset(temp_data, 0, sizeof(temp_data)); - } // This once was stored in the owner field of the sprite inline DDukeActor* GetOwner() diff --git a/source/games/exhumed/src/exhumedactor.h b/source/games/exhumed/src/exhumedactor.h index 05d0f4cd7..ae0cf9ce7 100644 --- a/source/games/exhumed/src/exhumedactor.h +++ b/source/games/exhumed/src/exhumedactor.h @@ -41,13 +41,6 @@ public: DExhumedActor() = default; - void ClearContent() override - { - Super::ClearContent(); - pTarget = nullptr; - nPhase = nHealth = nFrame = nAction = nCount = nRun = nIndex = nIndex2 = nChannel = nDamage = nTurn = x = y = 0; - } - void Serialize(FSerializer& arc) override; }; diff --git a/source/games/sw/src/swactor.h b/source/games/sw/src/swactor.h index 557737c42..b21e13ee7 100644 --- a/source/games/sw/src/swactor.h +++ b/source/games/sw/src/swactor.h @@ -20,12 +20,6 @@ public: DSWActor() = default; DSWActor& operator=(const DSWActor& other) = default; - void ClearContent() - { - Super::ClearContent(); - clearUser(); - tempwall = nullptr; - } bool hasU() { return hasUser; }