- moved gInterpolateSprite into DBloodActor

ZDoom · Sep 6, 2021 · 9010ea3 · 9010ea3
1 parent edd5bbc
commit 9010ea3
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 26 deletions.
diff --git a/source/games/blood/src/aiunicult.cpp b/source/games/blood/src/aiunicult.cpp
@@ -597,7 +597,7 @@ static void unicultThinkChase(DBloodActor* actor)
                     }
 
                 } 
-                else if (dist > 4072 && dist <= 11072 && !spriteIsUnderwater(actor, false) && pSprite->owner != (kMaxSprites - 1)) 
+                else if (dist > 4072 && dist <= 11072 && !spriteIsUnderwater(actor, false) && !actor->GetSpecialOwner())
                 {
                     switch (curWeapon) 
                     {
@@ -2534,7 +2534,8 @@ bool genDudePrepare(DBloodActor* actor, int propId)
         }
         case kGenDudePropertyLeech:
             pExtra->pLifeLeech = nullptr;
-            if (pSprite->owner != kMaxSprites - 1) {
+            if (!actor->GetSpecialOwner())
+            {
                 BloodStatIterator it(kStatThing);
                 while (auto actor2 = it.Next())
                 {

diff --git a/source/games/blood/src/animatesprite.cpp b/source/games/blood/src/animatesprite.cpp
@@ -543,7 +543,7 @@ void viewProcessSprites(spritetype* tsprite, int& spritesortcnt, int32_t cX, int
         }
 
         int nSprite = pTSprite->owner;
-        if (cl_interpolate && gInterpolateSprite[nSprite] && !(pTSprite->flags&512))
+        if (cl_interpolate && owneractor->interpolated && !(pTSprite->flags&512))
         {
             pTSprite->pos = pTSprite->interpolatedvec3(gInterpolate);
             pTSprite->ang = pTSprite->interpolatedang(gInterpolate);

diff --git a/source/games/blood/src/blood.cpp b/source/games/blood/src/blood.cpp
@@ -263,7 +263,9 @@ void GameInterface::Ticker()
 		if (newweap > 0 && newweap < WeaponSel_MaxBlood) gPlayer[i].newWeapon = newweap;
 	}
 
-	gInterpolateSprite.Zero();
+	BloodSpriteIterator it;
+	while (DBloodActor* act = it.Next()) act->interpolated = false;
+
 	ClearMovementInterpolations();
 	UpdateInterpolations();
 

diff --git a/source/games/blood/src/bloodactor.h b/source/games/blood/src/bloodactor.h
@@ -105,9 +105,10 @@ class DBloodActor
 	// transient data (not written to savegame)
 	int cumulDamage;
 	bool explosionhackflag;		// this originally hijacked the target field which is not safe when working with pointers.
+	bool interpolated;
 	ConditionElement condition[2];
 
-	DBloodActor() :index(int(this - base())) { /*assert(index >= 0 && index < kMaxSprites);*/ }
+	DBloodActor() :index(int(this - base())) {}
 	DBloodActor& operator=(const DBloodActor& other) = default;
 
 	void Clear()
@@ -121,6 +122,7 @@ class DBloodActor
 		basePoint = {};
 		xsprite = {};
 		hasx = false;
+		interpolated = false;
 		xvel = yvel = zvel = 0;
 	}
 	bool hasX() { return hasx; }

diff --git a/source/games/blood/src/db.cpp b/source/games/blood/src/db.cpp
@@ -163,8 +163,7 @@ void qinitspritelists(void) // Replace
     {
         headspritestat[i] = -1;
     }
-    int const nMaxSprites = kMaxSprites;
-    for (short i = 0; i < nMaxSprites; i++)
+    for (short i = 0; i < kMaxSprites; i++)
     {
         sprite[i].sectnum = -1;
         InsertSpriteStat(i, kMaxStatus);

diff --git a/source/games/blood/src/gameutil.h b/source/games/blood/src/gameutil.h
@@ -58,10 +58,6 @@ enum {
 
 
 // by NoOne: functions to quickly check range of specifical arrays
-inline bool spriRangeIsFine(int nIndex) {
-    return (nIndex >= 0 && nIndex < kMaxSprites);
-}
-
 inline bool sectRangeIsFine(int nIndex) {
     return (nIndex >= 0 && nIndex < kMaxSectors);
 }

diff --git a/source/games/blood/src/nnexts.cpp b/source/games/blood/src/nnexts.cpp
@@ -4402,7 +4402,7 @@ bool condCheckDude(DBloodActor* aCond, int cmpOp, bool PUSH)
                         {
                         auto act = actor->genDudeExtra.pLifeLeech;
                             if (!act) return false;
-                            if (pSpr->owner == kMaxSprites - 1) return true;
+                            if (actor->GetSpecialOwner()) return true;
                         else if (PUSH) condPush(aCond, OBJ_SPRITE, 0, act);
                         return false;
                         }

diff --git a/source/games/blood/src/triggers.cpp b/source/games/blood/src/triggers.cpp
@@ -1460,7 +1460,7 @@ void OperateTeleport(unsigned int nSector, XSECTOR *pXSector)
                 sfxPlay3DSound(pDest, 201, -1, 0);
                 actor->xvel = actor->yvel = actor->zvel = 0;
                 int nSprite = actor->GetIndex();
-                gInterpolateSprite.Clear(nSprite);
+                actor->interpolated = false;
                 viewBackupSpriteLoc(actor);
                 if (pPlayer)
                 {

diff --git a/source/games/blood/src/view.cpp b/source/games/blood/src/view.cpp
@@ -49,7 +49,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 EXTERN_CVAR(Bool, testnewrenderer)
 BEGIN_BLD_NS
 
-FixedBitArray<kMaxSprites> gInterpolateSprite;
 VIEW gPrevView[kMaxPlayers];
 VIEWPOS gViewPos;
 int gViewIndex;

diff --git a/source/games/blood/src/view.h b/source/games/blood/src/view.h
@@ -132,7 +132,6 @@ extern int gScreenTilt;
 extern int deliriumTilt, deliriumTurn, deliriumPitch;
 extern int gScreenTiltO, deliriumTurnO, deliriumPitchO;
 extern int gShowFrameRate;
-extern FixedBitArray<kMaxSprites> gInterpolateSprite;
 extern int gLastPal;
 extern double gInterpolate;
 
@@ -169,19 +168,14 @@ inline void viewInterpolateWall(int nWall, walltype *pWall)
     StartInterpolation(nWall, Interp_Wall_Y);
 }
 
-inline void viewBackupSpriteLoc(int nSprite, spritetype *pSprite)
+inline void viewBackupSpriteLoc(DBloodActor* actor)
 {
-    if (!gInterpolateSprite[nSprite])
+    if (!actor->interpolated)
     {
-        pSprite->backuploc();
-        gInterpolateSprite.Set(nSprite);
+        actor->s().backuploc();
+        actor->interpolated = true;
     }
 }
 
-inline void viewBackupSpriteLoc(DBloodActor* actor)
-{
-    viewBackupSpriteLoc(actor->GetIndex(), &actor->s());
-}
-
 
 END_BLD_NS
diff --git a/source/games/blood/src/warp.cpp b/source/games/blood/src/warp.cpp
@@ -198,7 +198,7 @@ int CheckLink(DBloodActor *actor)
             else
                 z2 = getceilzofslope(pSprite->sectnum, pSprite->x, pSprite->y);
             pSprite->z += z2-z;
-            gInterpolateSprite.Clear(actor->GetIndex());
+            actor->interpolated = false;
             return pUpper->type;
         }
     }
@@ -225,7 +225,7 @@ int CheckLink(DBloodActor *actor)
             else
                 z2 = getflorzofslope(pSprite->sectnum, pSprite->x, pSprite->y);
             pSprite->z += z2-z;
-            gInterpolateSprite.Clear(actor->GetIndex());
+            actor->interpolated = false;
             return pLower->type;
         }
     }