zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-06-02 10:11:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- deleted GetSpriteIndex.

Browse source 
It's not needed anymore.
This commit is contained in:
Christoph Oelckers 2021-12-05 21:17:42 +01:00
parent 382689e0a7
commit 42e4e9288f
4 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
source/core/actorlist.cpp
View file

@ -465,7 +465,6 @@ void SetupActors(PClass* clstype)
for (int i = 0; i < 16384; i++) for (int i = 0; i < 16384; i++)
{ {
actorArray[i] = static_cast<DCoreActor*>(clstype->CreateNew()); actorArray[i] = static_cast<DCoreActor*>(clstype->CreateNew());
actorArray[i]->index = i;
actorArray[i]->Release(); // no GC for this static array. actorArray[i]->Release(); // no GC for this static array.
} }
} }

10
source/core/coreactor.h
View file

@ -8,10 +8,6 @@ class DCoreActor : public DObject
DECLARE_CLASS(DCoreActor, DObject) DECLARE_CLASS(DCoreActor, DObject)
HAS_OBJECT_POINTERS HAS_OBJECT_POINTERS
// common part of the game actors // common part of the game actors
//protected:
public:
int index; // this will go away very soon.
public: public:
// These two are needed because we cannot rely on the ones in the sprites for unlinking. // These two are needed because we cannot rely on the ones in the sprites for unlinking.
@ -82,12 +78,6 @@ public:
return s().time; return s().time;
} }
int GetSpriteIndex() const
{
// this is only here to mark places that need changing later! It will be removed once the sprite array goes.
return index;
}
sectortype* sector() const sectortype* sector() const
{ {
return s().sector(); return s().sector();

2
source/games/blood/src/blood.cpp
View file

@ -75,7 +75,7 @@ size_t DBloodActor::PropagateMark()
{ {
condition[0].Mark(); condition[0].Mark();
condition[1].Mark(); condition[1].Mark();
return 2; return 2 + Super::PropagateMark();
} }
void InitCheats(); void InitCheats();

2
source/games/duke/src/spawn_d.cpp
View file

@ -752,7 +752,7 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
case WATERBUBBLEMAKER: case WATERBUBBLEMAKER:
if (sp->hitag && sp->picnum == WATERBUBBLEMAKER) if (sp->hitag && sp->picnum == WATERBUBBLEMAKER)
{ // JBF 20030913: Pisses off move(), eg. in bobsp2 { // JBF 20030913: Pisses off move(), eg. in bobsp2
Printf(TEXTCOLOR_YELLOW "WARNING: WATERBUBBLEMAKER %d @ %d,%d with hitag!=0. Applying fixup.\n", act->GetSpriteIndex(), sp->x, sp->y); Printf(TEXTCOLOR_YELLOW "WARNING: WATERBUBBLEMAKER %d @ %d,%d with hitag!=0. Applying fixup.\n", act->GetIndex(), sp->x, sp->y);
sp->hitag = 0; sp->hitag = 0;
} }
sp->cstat |= 32768; sp->cstat |= 32768;