From 6dcc8761fe385ea90cb3eb7c7f583f7d014ba1c5 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sat, 25 Dec 2021 18:37:58 +0100
Subject: [PATCH] - replaced the last remaining s() calls in Blood's interface
 and deleted the method.

---
 source/core/coreactor.h             | 10 ----------
 source/games/blood/src/bloodactor.h | 14 +++++++-------
 source/games/blood/src/loadsave.cpp |  2 +-
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/source/core/coreactor.h b/source/core/coreactor.h
index 8e26b1c13..d14278984 100644
--- a/source/core/coreactor.h
+++ b/source/core/coreactor.h
@@ -44,16 +44,6 @@ public:
 		return (unsigned)spr.statnum < MAXSTATUS;
 	}
 
-	const spritetype& s() const
-	{ 
-		return spr;
-	}
-
-	spritetype& s()
-	{
-		return spr;
-	}
-
 	int GetIndex() const
 	{ 
 		// This is only identical with the sprite index for items spawned at map start.
diff --git a/source/games/blood/src/bloodactor.h b/source/games/blood/src/bloodactor.h
index 0ee8ca4e0..01c6c384e 100644
--- a/source/games/blood/src/bloodactor.h
+++ b/source/games/blood/src/bloodactor.h
@@ -109,37 +109,37 @@ public:
 	void SetSpecialOwner() // nnext hackery
 	{
 		ownerActor = nullptr;
-		s().owner = kMagicOwner;
+		spr.owner = kMagicOwner;
 	}
 
 	bool GetSpecialOwner()
 	{
-		return  ownerActor == nullptr && (s().owner == kMagicOwner);
+		return  ownerActor == nullptr && (spr.owner == kMagicOwner);
 	}
 
 	bool IsPlayerActor()
 	{
-		return s().type >= kDudePlayer1 && s().type <= kDudePlayer8;
+		return spr.type >= kDudePlayer1 && spr.type <= kDudePlayer8;
 	}
 
 	bool IsDudeActor()
 	{
-		return s().type >= kDudeBase && s().type < kDudeMax;
+		return spr.type >= kDudeBase && spr.type < kDudeMax;
 	}
 
 	bool IsItemActor()
 	{
-		return s().type >= kItemBase && s().type < kItemMax;
+		return spr.type >= kItemBase && spr.type < kItemMax;
 	}
 
 	bool IsWeaponActor()
 	{
-		return s().type >= kItemWeaponBase && s().type < kItemWeaponMax;
+		return spr.type >= kItemWeaponBase && spr.type < kItemWeaponMax;
 	}
 
 	bool IsAmmoActor()
 	{
-		return s().type >= kItemAmmoBase && s().type < kItemAmmoMax;
+		return spr.type >= kItemAmmoBase && spr.type < kItemAmmoMax;
 	}
 
 	bool isActive() 
diff --git a/source/games/blood/src/loadsave.cpp b/source/games/blood/src/loadsave.cpp
index 6fa7f63b8..86882685b 100644
--- a/source/games/blood/src/loadsave.cpp
+++ b/source/games/blood/src/loadsave.cpp
@@ -484,7 +484,7 @@ void DBloodActor::Serialize(FSerializer& arc)
 				
 
 				// GenDudeExtra only contains valid info for kDudeModernCustom and kDudeModernCustomBurning so only save when needed as these are not small.
-				if (s().type == kDudeModernCustom || s().type == kDudeModernCustomBurning)
+				if (spr.type == kDudeModernCustom || spr.type == kDudeModernCustomBurning)
 				{
 				arc("gendudeextra", genDudeExtra);
 				}