diff --git a/source/games/blood/src/actor.cpp b/source/games/blood/src/actor.cpp
index f7d0ce307..1eac6b0fc 100644
--- a/source/games/blood/src/actor.cpp
+++ b/source/games/blood/src/actor.cpp
@@ -7369,7 +7369,7 @@ void MakeSplash(DBloodActor* actor)
 void actBurnSprite(DBloodActor* pSource, DBloodActor* pTarget, int nTime)
 {
 	auto pXSprite = &pTarget->x();
-	pXSprite->burnTime = ClipHigh(pXSprite->burnTime + nTime, sprite[pXSprite->reference].statnum == kStatDude ? 2400 : 1200);
+	pXSprite->burnTime = ClipHigh(pXSprite->burnTime + nTime, pTarget->s().statnum == kStatDude ? 2400 : 1200);
 	pTarget->SetBurnSource(pSource);
 }
 
diff --git a/source/games/blood/src/aizomba.cpp b/source/games/blood/src/aizomba.cpp
index 442b930ac..3296edcb8 100644
--- a/source/games/blood/src/aizomba.cpp
+++ b/source/games/blood/src/aizomba.cpp
@@ -221,8 +221,8 @@ static void myThinkTarget(DBloodActor* actor)
 	for (int p = connecthead; p >= 0; p = connectpoint2[p])
 	{
 		PLAYER* pPlayer = &gPlayer[p];
-		int nOwner = (pSprite->owner & 0x1000) ? (pSprite->owner & 0xfff) : -1;
-		if (nOwner == pPlayer->nSprite || pPlayer->pXSprite->health == 0 || powerupCheck(pPlayer, kPwUpShadowCloak) > 0)
+        auto owneractor = actor->GetOwner();
+        if (owneractor == nullptr || owneractor == pPlayer->actor() || pPlayer->pXSprite->health == 0 || powerupCheck(pPlayer, kPwUpShadowCloak) > 0)
 			continue;
 		int x = pPlayer->pSprite->x;
 		int y = pPlayer->pSprite->y;
diff --git a/source/games/blood/src/gameutil.cpp b/source/games/blood/src/gameutil.cpp
index aba934815..993e562c3 100644
--- a/source/games/blood/src/gameutil.cpp
+++ b/source/games/blood/src/gameutil.cpp
@@ -585,33 +585,31 @@ int VectorScan(DBloodActor *actor, int nOffset, int nZOffset, int dx, int dy, in
         {
             if (dz > 0)
             {
-                if (gUpperLink[gHitInfo.hitsect] < 0)
-                    return 2;
-                int nSprite = gUpperLink[gHitInfo.hitsect];
-                int nLink = sprite[nSprite].owner & 0xfff;
+                auto actor = getUpperLink(gHitInfo.hitsect);
+                if (!actor) return 2;
+                auto link = actor->GetOwner();
                 gHitInfo.clearObj();
-                x1 = gHitInfo.hitx + sprite[nLink].x - sprite[nSprite].x;
-                y1 = gHitInfo.hity + sprite[nLink].y - sprite[nSprite].y;
-                z1 = gHitInfo.hitz + sprite[nLink].z - sprite[nSprite].z;
+                x1 = gHitInfo.hitx + link->s().x - actor->s().x;
+                y1 = gHitInfo.hity + link->s().y - actor->s().y;
+                z1 = gHitInfo.hitz + link->s().z - actor->s().z;
                 pos = { x1, y1, z1 };
                 hitData.pos.z = gHitInfo.hitz;
-                hitscan(&pos, sprite[nLink].sectnum, dx, dy, dz<<4, &hitData, CLIPMASK1);
+                hitscan(&pos, link->s().sectnum, dx, dy, dz<<4, &hitData, CLIPMASK1);
                 gHitInfo.set(&hitData);
                 continue;
             }
             else
             {
-                if (gLowerLink[gHitInfo.hitsect] < 0)
-                    return 1;
-                int nSprite = gLowerLink[gHitInfo.hitsect];
-                int nLink = sprite[nSprite].owner & 0xfff;
+                auto actor = getLowerLink(gHitInfo.hitsect);
+                if (!actor) return 1;
+                auto link = actor->GetOwner();
                 gHitInfo.clearObj();
-                x1 = gHitInfo.hitx + sprite[nLink].x - sprite[nSprite].x;
-                y1 = gHitInfo.hity + sprite[nLink].y - sprite[nSprite].y;
-                z1 = gHitInfo.hitz + sprite[nLink].z - sprite[nSprite].z;
+                x1 = gHitInfo.hitx + link->s().x - actor->s().x;
+                y1 = gHitInfo.hity + link->s().y - actor->s().y;
+                z1 = gHitInfo.hitz + link->s().z - actor->s().z;
                 pos = { x1, y1, z1 };
                 hitData.pos.z = gHitInfo.hitz;
-                hitscan(&pos, sprite[nLink].sectnum, dx, dy, dz<<4, &hitData, CLIPMASK1);
+                hitscan(&pos, link->s().sectnum, dx, dy, dz<<4, &hitData, CLIPMASK1);
                 gHitInfo.set(&hitData);
                 continue;
             }
@@ -643,14 +641,14 @@ void GetZRange(DBloodActor *actor, int *ceilZ, Collision *ceilColl, int *floorZ,
             XSECTOR *pXSector = &xsector[sector[nSector].extra];
             *floorZ += pXSector->Depth << 10;
         }
-        if (gUpperLink[nSector] >= 0)
+        auto actor = getUpperLink(nSector);
+        if (actor)
         {
             int nSprite = gUpperLink[nSector];
-            int nLink = sprite[nSprite].owner & 0xfff;
-            vec3_t lpos = { pSprite->x + sprite[nLink].x - sprite[nSprite].x, pSprite->y + sprite[nLink].y - sprite[nSprite].y,
-                pSprite->z + sprite[nLink].z - sprite[nSprite].z };
-            getzrange(&lpos, sprite[nLink].sectnum, &nTemp1, &nTemp2, (int32_t*)floorZ, &floorHit, nDist, nMask);
-            *floorZ -= sprite[nLink].z - sprite[nSprite].z;
+            auto link = actor->GetOwner();
+            vec3_t lpos = { pSprite->x + link->s().x - actor->s().x, pSprite->y + link->s().y - actor->s().y, pSprite->z + link->s().z - actor->s().z };
+            getzrange(&lpos, link->s().sectnum, &nTemp1, &nTemp2, (int32_t*)floorZ, &floorHit, nDist, nMask);
+            *floorZ -= link->s().z - actor->s().z;
             floorColl->setFromEngine(floorHit);
         }
     }
@@ -659,14 +657,13 @@ void GetZRange(DBloodActor *actor, int *ceilZ, Collision *ceilColl, int *floorZ,
         int nSector = ceilColl->index;
         if ((nClipParallax & PARALLAXCLIP_CEILING) == 0 && (sector[nSector].ceilingstat & 1))
             *ceilZ = 0x80000000;
-        if (gLowerLink[nSector] >= 0)
+        auto actor = getLowerLink(nSector);
+        if (actor)
         {
-            int nSprite = gLowerLink[nSector];
-            int nLink = sprite[nSprite].owner & 0xfff;
-            vec3_t lpos = { pSprite->x + sprite[nLink].x - sprite[nSprite].x, pSprite->y + sprite[nLink].y - sprite[nSprite].y,
-                pSprite->z + sprite[nLink].z - sprite[nSprite].z };
-            getzrange(&lpos, sprite[nLink].sectnum, (int32_t*)ceilZ, &ceilHit, &nTemp1, &nTemp2, nDist, nMask);
-            *ceilZ -= sprite[nLink].z - sprite[nSprite].z;
+            auto link = actor->GetOwner();
+            vec3_t lpos = { pSprite->x + link->s().x - actor->s().x, pSprite->y + link->s().y - actor->s().y, pSprite->z + link->s().z - actor->s().z };
+            getzrange(&lpos, link->s().sectnum, (int32_t*)ceilZ, &ceilHit, &nTemp1, &nTemp2, nDist, nMask);
+            *ceilZ -= link->s().z - actor->s().z;
             ceilColl->setFromEngine(ceilHit);
         }
     }
@@ -691,14 +688,14 @@ void GetZRangeAtXYZ(int x, int y, int z, int nSector, int *ceilZ, Collision* cei
             XSECTOR *pXSector = &xsector[sector[nSector].extra];
             *floorZ += pXSector->Depth << 10;
         }
-        if (gUpperLink[nSector] >= 0)
+        auto actor = getUpperLink(nSector);
+        if (actor)
         {
-            int nSprite = gUpperLink[nSector];
-            int nLink = sprite[nSprite].owner & 0xfff;
-            lpos = { x + sprite[nLink].x - sprite[nSprite].x, y + sprite[nLink].y - sprite[nSprite].y,
-                z + sprite[nLink].z - sprite[nSprite].z };
-            getzrange(&lpos, sprite[nLink].sectnum, &nTemp1, &nTemp2, (int32_t*)floorZ, &floorHit, nDist, nMask);
-            *floorZ -= sprite[nLink].z - sprite[nSprite].z;
+            auto link = actor->GetOwner();
+            lpos = { x+link->s().x-actor->s().x, y+link->s().y-actor->s().y, z+link->s().z-actor->s().z };
+            getzrange(&lpos, link->s().sectnum, &nTemp1, &nTemp2, (int32_t*)floorZ, &floorHit, nDist, nMask);
+            floorColl->setFromEngine(floorHit);
+            *floorZ -= link->s().z - actor->s().z;
         }
     }
     if (ceilColl->type == kHitSector)
@@ -706,14 +703,14 @@ void GetZRangeAtXYZ(int x, int y, int z, int nSector, int *ceilZ, Collision* cei
         int nSector = ceilColl->index;
         if ((nClipParallax & PARALLAXCLIP_CEILING) == 0 && (sector[nSector].ceilingstat & 1))
             *ceilZ = 0x80000000;
-        if (gLowerLink[nSector] >= 0)
+        auto actor = getLowerLink(nSector);
+        if (actor)
         {
-            int nSprite = gLowerLink[nSector];
-            int nLink = sprite[nSprite].owner & 0xfff;
-            lpos = { x + sprite[nLink].x - sprite[nSprite].x, y + sprite[nLink].y - sprite[nSprite].y,
-                z + sprite[nLink].z - sprite[nSprite].z };
-            getzrange(&lpos, sprite[nLink].sectnum, (int32_t*)ceilZ, &ceilHit, &nTemp1, &nTemp2, nDist, nMask);
-            *ceilZ -= sprite[nLink].z - sprite[nSprite].z;
+            auto link = actor->GetOwner();
+            lpos = { x+link->s().x-actor->s().x, y+link->s().y-actor->s().y, z+link->s().z-actor->s().z };
+            getzrange(&lpos, link->s().sectnum, (int32_t*)ceilZ, &ceilHit, &nTemp1, &nTemp2, nDist, nMask);
+            ceilColl->setFromEngine(ceilHit);
+            *ceilZ -= link->s().z - actor->s().z;
         }
     }
 }