From 42e4e9288fca5e4b6d6a31bfb5bb7eae4dbbcfcb Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 5 Dec 2021 21:17:42 +0100
Subject: [PATCH] - deleted GetSpriteIndex.

It's not needed anymore.
---
 source/core/actorlist.cpp         |  1 -
 source/core/coreactor.h           | 10 ----------
 source/games/blood/src/blood.cpp  |  2 +-
 source/games/duke/src/spawn_d.cpp |  2 +-
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/source/core/actorlist.cpp b/source/core/actorlist.cpp
index 57450d113..cc499ee15 100644
--- a/source/core/actorlist.cpp
+++ b/source/core/actorlist.cpp
@@ -465,7 +465,6 @@ void SetupActors(PClass* clstype)
 	for (int i = 0; i < 16384; i++)
 	{
 		actorArray[i] = static_cast<DCoreActor*>(clstype->CreateNew());
-		actorArray[i]->index = i;
 		actorArray[i]->Release();	// no GC for this static array.
 	}
 }
\ No newline at end of file
diff --git a/source/core/coreactor.h b/source/core/coreactor.h
index 12999836a..f19ac91a8 100644
--- a/source/core/coreactor.h
+++ b/source/core/coreactor.h
@@ -8,10 +8,6 @@ class DCoreActor : public DObject
 	DECLARE_CLASS(DCoreActor, DObject)
 	HAS_OBJECT_POINTERS
 	// common part of the game actors
-//protected:
-public:
-	int index; // this will go away very soon.
-
 public:
 
 	// These two are needed because we cannot rely on the ones in the sprites for unlinking.
@@ -82,12 +78,6 @@ public:
 		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
 	{
 		return s().sector();
diff --git a/source/games/blood/src/blood.cpp b/source/games/blood/src/blood.cpp
index 1bdfb6f9e..2e6039365 100644
--- a/source/games/blood/src/blood.cpp
+++ b/source/games/blood/src/blood.cpp
@@ -75,7 +75,7 @@ size_t DBloodActor::PropagateMark()
 {
 	condition[0].Mark();
 	condition[1].Mark();
-	return 2;
+	return 2 + Super::PropagateMark();
 }
 
 void InitCheats();
diff --git a/source/games/duke/src/spawn_d.cpp b/source/games/duke/src/spawn_d.cpp
index b045526d4..bfaafa406 100644
--- a/source/games/duke/src/spawn_d.cpp
+++ b/source/games/duke/src/spawn_d.cpp
@@ -752,7 +752,7 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
 	case WATERBUBBLEMAKER:
 		if (sp->hitag && sp->picnum == WATERBUBBLEMAKER)
 		{	// 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->cstat |= 32768;