- mark all places using a sprite index that needs addressing with a GetSpriteIndex function.

source/games/blood/src/_polymost.cpp

@@ -50,7 +50,7 @@ void collectTSpritesForPortal(int x, int y, int i, int interpolation)
                 pTSprite->yoffset = pSprite->yoffset;
                 pTSprite->cstat = pSprite->cstat;
                 pTSprite->statnum = kStatDecoration;
-                pTSprite->owner = pSprite->index;
+                pTSprite->owner = actor->GetSpriteIndex();
                 pTSprite->flags = pSprite->hitag | 0x200;
                 pTSprite->x = dx + interpolatedvalue(pSprite->ox, pSprite->x, interpolation);
                 pTSprite->y = dy + interpolatedvalue(pSprite->oy, pSprite->y, interpolation);

source/games/blood/src/animatesprite.cpp

@@ -895,7 +895,7 @@ void viewProcessSprites(spritetype* tsprite, int& spritesortcnt, int32_t cX, int
                 }
             }
             
-            if (pTSprite->owner != gView->pSprite->index || gViewPos != VIEWPOS_0) {
+            if (pTSprite->owner != gView->actor->GetSpriteIndex() || gViewPos != VIEWPOS_0) {
                 if (getflorzofslope(pTSprite->sectnum, pTSprite->x, pTSprite->y) >= cZ)
                 {
                     viewAddEffect(tsprite, spritesortcnt, nTSprite, kViewEffectShadow);

source/games/blood/src/bloodactor.h

@@ -129,10 +129,11 @@ public:
 	spritetype& s() { return sprite[index]; }
 	XSPRITE& x() { return xsprite[sprite[index].extra]; }	// calling this does not validate the xsprite!
 	int GetIndex() { return s().time; }	// For error printing only! This is only identical with the sprite index for items spawned at map start.
+	int GetSpriteIndex() { return index; }	// this is only here to mark places that need changing later!
 
 	void SetOwner(DBloodActor* own)
 	{
-		s().owner = own ? own->s().index : -1;
+		s().owner = own ? own->GetSpriteIndex() : -1;
 	}
 
 	DBloodActor* GetOwner()
@@ -143,7 +144,7 @@ public:
 
 	void SetTarget(DBloodActor* own)
 	{
-		x().target_i = own ? own->s().index : -1;
+		x().target_i = own ? own->GetSpriteIndex() : -1;
 	}
 
 	DBloodActor* GetTarget()
@@ -164,7 +165,7 @@ public:
 
 	void SetBurnSource(DBloodActor* own)
 	{
-		x().burnSource = own ? own->s().index : -1;
+		x().burnSource = own ? own->GetSpriteIndex() : -1;
 	}
 
 	DBloodActor* GetBurnSource()
@@ -320,7 +321,7 @@ public:
 
 inline int DeleteSprite(DBloodActor* nSprite)
 {
-	if (nSprite) return DeleteSprite(nSprite->s().index);
+	if (nSprite) return DeleteSprite(nSprite->GetSpriteIndex());
 	return 0;
 }
 
@@ -362,12 +363,12 @@ inline void sfxKill3DSound(DBloodActor* pSprite, int a2 = -1, int a3 = -1)
 
 inline void ChangeActorStat(DBloodActor* actor, int stat)
 {
-	ChangeSpriteStat(actor->s().index, stat);
+	ChangeSpriteStat(actor->GetSpriteIndex(), stat);
 }
 
 inline void ChangeActorSect(DBloodActor* actor, int stat)
 {
-	ChangeSpriteSect(actor->s().index, stat);
+	ChangeSpriteSect(actor->GetSpriteIndex(), stat);
 }
 
 inline int Collision::actorIndex(DBloodActor* actor)
@@ -382,7 +383,7 @@ inline DBloodActor* Collision::Actor(int a)
 
 inline void setActorPos(DBloodActor* actor, vec3_t* pos)
 {
-	setsprite(actor->s().index, pos);
+	setsprite(actor->GetSpriteIndex(), pos);
 }
 
 END_BLD_NS

source/games/blood/src/nnexts.cpp

@@ -1423,7 +1423,7 @@ void nnExtProcessSuperSprites()
                             debrisactor->xvel += MulScale(nSpeed, Cos(pPlayer->pSprite->ang), 30);
                             debrisactor->yvel += MulScale(nSpeed, Sin(pPlayer->pSprite->ang), 30);
 
-                        debrisactor->hit.hit = pPlayer->pSprite->index | 0xc000;
+                        debrisactor->hit.hit.setSprite(pPlayer->actor);
                     }
                 }
             }
@@ -7669,7 +7669,6 @@ void nnExtAiSetDirection(DBloodActor* actor, int a3)
     XSPRITE* pXSprite = &actor->x();
     assert(pSprite->type >= kDudeBase && pSprite->type < kDudeMax);
     
-    int nSprite = pSprite->index;
     int vc = ((a3 + 1024 - pSprite->ang) & 2047) - 1024;
     int t1 = DMulScale(actor->xvel, Cos(pSprite->ang), actor->yvel, Sin(pSprite->ang), 30);
     int vsi = ((t1 * 15) >> 12) / 2;
@@ -8454,7 +8453,7 @@ DBloodActor* aiPatrolSearchTargets(DBloodActor* actor)
                         sndy = emitter->y;
 
                         // sound attached to the sprite
-                        if (pSpr != emitter && emitter->owner != pSpr->index) 
+                        if (pSpr != emitter && emitter->owner != actor->GetSpriteIndex())
                         {
 
                             if (!sectRangeIsFine(emitter->sectnum)) return false;

source/games/blood/src/triggers.cpp

@@ -1458,7 +1458,6 @@ void OperateTeleport(unsigned int nSector, XSECTOR *pXSector)
                 ChangeActorSect(actor, pDest->sectnum);
                 sfxPlay3DSound(pDest, 201, -1, 0);
                 actor->xvel = actor->yvel = actor->zvel = 0;
-                int nSprite = actor->s().index;
                 actor->interpolated = false;
                 viewBackupSpriteLoc(actor);
                 if (pPlayer)