mirror of
https://github.com/ZDoom/Raze.git
synced 2024-11-29 07:21:54 +00:00
- deleted ClearContent functions from actor classes.
this is a leftover from pre-DObject times and no longer needed.
This commit is contained in:
parent
d46a7abb0e
commit
3fcecedf32
5 changed files with 0 additions and 54 deletions
|
@ -26,14 +26,6 @@ public:
|
||||||
DCoreActor& operator=(const DCoreActor& other) = delete;
|
DCoreActor& operator=(const DCoreActor& other) = delete;
|
||||||
|
|
||||||
virtual void Serialize(FSerializer& arc);
|
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() {}
|
virtual void BeginPlay() {}
|
||||||
void OnDestroy() override;
|
void OnDestroy() override;
|
||||||
|
|
|
@ -42,27 +42,6 @@ public:
|
||||||
|
|
||||||
DBloodActor& operator=(const DBloodActor& other) = default;
|
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; }
|
bool hasX() { return hasx; }
|
||||||
void addX() { hasx = true; }
|
void addX() { hasx = true; }
|
||||||
|
|
||||||
|
|
|
@ -58,18 +58,6 @@ public:
|
||||||
|
|
||||||
DDukeActor() = default;
|
DDukeActor() = default;
|
||||||
size_t PropagateMark() override;
|
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
|
// This once was stored in the owner field of the sprite
|
||||||
inline DDukeActor* GetOwner()
|
inline DDukeActor* GetOwner()
|
||||||
|
|
|
@ -41,13 +41,6 @@ public:
|
||||||
|
|
||||||
DExhumedActor() = default;
|
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;
|
void Serialize(FSerializer& arc) override;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -20,12 +20,6 @@ public:
|
||||||
DSWActor() = default;
|
DSWActor() = default;
|
||||||
DSWActor& operator=(const DSWActor& other) = default;
|
DSWActor& operator=(const DSWActor& other) = default;
|
||||||
|
|
||||||
void ClearContent()
|
|
||||||
{
|
|
||||||
Super::ClearContent();
|
|
||||||
clearUser();
|
|
||||||
tempwall = nullptr;
|
|
||||||
}
|
|
||||||
bool hasU() { return hasUser; }
|
bool hasU() { return hasUser; }
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue