From 36067baeddf3f92efa211ce2467fdda343896723 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Wed, 3 Nov 2021 00:14:09 +0100
Subject: [PATCH] - owner cleanup.

---
 source/games/sw/src/player.cpp  | 4 ++--
 source/games/sw/src/rotator.cpp | 2 +-
 source/games/sw/src/skull.cpp   | 5 +++--
 source/games/sw/src/slidor.cpp  | 2 +-
 source/games/sw/src/sounds.cpp  | 2 +-
 source/games/sw/src/weapon.cpp  | 7 +++----
 source/games/sw/src/weapon.h    | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/source/games/sw/src/player.cpp b/source/games/sw/src/player.cpp
index 46ff6137e..a49af11ea 100644
--- a/source/games/sw/src/player.cpp
+++ b/source/games/sw/src/player.cpp
@@ -2692,7 +2692,7 @@ void DoPlayerMoveVehicle(PLAYERp pp)
                     else
                         SetCollision(u, 0);
 
-                    VehicleMoveHit(short(sp - sprite));
+                    VehicleMoveHit(actor);
                 }
 
                 if (!TEST(sop->flags, SOBJ_NO_QUAKE))
@@ -2743,7 +2743,7 @@ void DoPlayerMoveVehicle(PLAYERp pp)
 
             if (vel > 13000)
             {
-                VehicleMoveHit(short(sp - sprite));
+                VehicleMoveHit(actor);
                 pp->slide_xvect = -pp->xvect<<1;
                 pp->slide_yvect = -pp->yvect<<1;
                 if (!TEST(sop->flags, SOBJ_NO_QUAKE))
diff --git a/source/games/sw/src/rotator.cpp b/source/games/sw/src/rotator.cpp
index 3d2cbdcb8..020e96c3e 100644
--- a/source/games/sw/src/rotator.cpp
+++ b/source/games/sw/src/rotator.cpp
@@ -348,7 +348,7 @@ int DoRotator(DSWActor* actor)
 
             SetRotatorInactive(actor);
 
-            // set owner swith back to OFF
+            // set Owner swith back to OFF
             // only if ALL vators are inactive
             if (!TestRotatorMatchActive(match))
             {
diff --git a/source/games/sw/src/skull.cpp b/source/games/sw/src/skull.cpp
index 8a92bee69..8bcfc6294 100644
--- a/source/games/sw/src/skull.cpp
+++ b/source/games/sw/src/skull.cpp
@@ -282,8 +282,9 @@ int DoSkullBeginDeath(DSWActor* actor)
     int16_t i,num_ord=0;
 
     // Decrease for Serp God
-    if (sp->owner >= 0)
-        User[sp->owner]->Counter--;
+    auto own = GetOwner(actor);
+    if (own != nullptr && own->hasU())
+        own->u()->Counter--;
 
     // starts the explosion that does the actual damage
 
diff --git a/source/games/sw/src/slidor.cpp b/source/games/sw/src/slidor.cpp
index 949da82f1..f1b521953 100644
--- a/source/games/sw/src/slidor.cpp
+++ b/source/games/sw/src/slidor.cpp
@@ -573,7 +573,7 @@ int DoSlidor(DSWActor* actor)
 
             RESET_BOOL8(sp);
 
-            // set owner swith back to OFF
+            // set Owner swith back to OFF
             // only if ALL vators are inactive
             if (!TestSlidorMatchActive(match))
             {
diff --git a/source/games/sw/src/sounds.cpp b/source/games/sw/src/sounds.cpp
index c0de53379..f1f134d8b 100644
--- a/source/games/sw/src/sounds.cpp
+++ b/source/games/sw/src/sounds.cpp
@@ -728,7 +728,7 @@ void DeleteNoSoundOwner(DSWActor* actor)
 
 //==========================================================================
 //
-// This is called from KillSprite to kill a follow sound with no valid sprite owner
+// This is called from KillSprite to kill a follow sound with no valid sprite Owner
 // Stops any active sound with the follow bit set, even play once sounds.
 //
 //==========================================================================
diff --git a/source/games/sw/src/weapon.cpp b/source/games/sw/src/weapon.cpp
index 7461d4f82..78b926c00 100644
--- a/source/games/sw/src/weapon.cpp
+++ b/source/games/sw/src/weapon.cpp
@@ -4307,10 +4307,9 @@ int SpawnBlood(DSWActor* actor, DSWActor* weapActor, short hit_ang, int hit_x, i
 }
 
 
-bool
-VehicleMoveHit(short SpriteNum)
+bool VehicleMoveHit(DSWActor* actor)
 {
-    USERp u = User[SpriteNum].Data();
+    USERp u = actor->u();
     SPRITEp cp;
     SECTOR_OBJECTp sop;
     SECTOR_OBJECTp hsop;
@@ -4364,7 +4363,7 @@ VehicleMoveHit(short SpriteNum)
         {
             if (hsp->statnum == STAT_MINE_STUCK)
             {
-                DoDamage(hit_sprite, SpriteNum);
+                DoDamage(hit_sprite, actor->GetSpriteIndex());
                 return true;
             }
         }
diff --git a/source/games/sw/src/weapon.h b/source/games/sw/src/weapon.h
index 257bf7686..e5f710171 100644
--- a/source/games/sw/src/weapon.h
+++ b/source/games/sw/src/weapon.h
@@ -231,7 +231,7 @@ void QueueReset(void);
 int PlayerCheckDeath(PLAYERp pp,short Weapon);
 bool SpriteWarpToUnderwater(SPRITEp sp);
 int PlayerDamageSlide(PLAYERp pp,int damage,short ang);
-bool VehicleMoveHit(short SpriteNum);
+bool VehicleMoveHit(DSWActor*);
 int SpawnSplash(short SpriteNum);
 int SpawnMineExp(int16_t Weapon);
 int SpawnLittleExp(int16_t Weapon);