From 33a00869d840bac5d15b46441298f484349a9d8e Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Wed, 22 Dec 2021 09:49:00 +0100
Subject: [PATCH] - shortened the name of DBloodActor::xsprite to xspr.

---
 source/games/blood/src/blood.cpp    | 4 ++--
 source/games/blood/src/bloodactor.h | 6 +++---
 source/games/blood/src/loadsave.cpp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/games/blood/src/blood.cpp b/source/games/blood/src/blood.cpp
index bdb2b9e21..a5f06f5f1 100644
--- a/source/games/blood/src/blood.cpp
+++ b/source/games/blood/src/blood.cpp
@@ -67,8 +67,8 @@ IMPLEMENT_POINTER(genDudeExtra.slave[3])
 IMPLEMENT_POINTER(genDudeExtra.slave[4])
 IMPLEMENT_POINTER(genDudeExtra.slave[5])
 IMPLEMENT_POINTER(genDudeExtra.slave[6])
-IMPLEMENT_POINTER(xsprite.burnSource)
-IMPLEMENT_POINTER(xsprite.target)
+IMPLEMENT_POINTER(xspr.burnSource)
+IMPLEMENT_POINTER(xspr.target)
 IMPLEMENT_POINTERS_END
 
 size_t DBloodActor::PropagateMark()
diff --git a/source/games/blood/src/bloodactor.h b/source/games/blood/src/bloodactor.h
index 360753522..ab9c45163 100644
--- a/source/games/blood/src/bloodactor.h
+++ b/source/games/blood/src/bloodactor.h
@@ -21,7 +21,7 @@ public:
 	int dudeSlope;
 	int xvel, yvel, zvel;
 	bool hasx;
-	XSPRITE xsprite;
+	XSPRITE xspr;
 	SPRITEHIT hit;
 	DUDEEXTRA dudeExtra;
 	SPRITEMASS spriteMass;
@@ -52,7 +52,7 @@ public:
 		prevmarker = nullptr;
 		ownerActor = nullptr;
 		basePoint = {};
-		xsprite = {};
+		xspr = {};
 		hasx = false;
 		interpolated = false;
 		xvel = yvel = zvel = 0;
@@ -66,7 +66,7 @@ public:
 	bool hasX() { return hasx; }
 	void addX() { hasx = true; }
 
-	XSPRITE& x() { return xsprite; }	// calling this does not validate the xsprite!
+	XSPRITE& x() { return xspr; }	// calling this does not validate the xsprite!
 
 	void SetOwner(DBloodActor* own)
 	{
diff --git a/source/games/blood/src/loadsave.cpp b/source/games/blood/src/loadsave.cpp
index 6cdb543fa..6fa7f63b8 100644
--- a/source/games/blood/src/loadsave.cpp
+++ b/source/games/blood/src/loadsave.cpp
@@ -467,7 +467,7 @@ void DBloodActor::Serialize(FSerializer& arc)
 		// The rest is only relevant if the actor has an xsprite.
 	if (hasX())
 		{
-		arc("xsprite", xsprite)
+		arc("xsprite", xspr)
 			("dudeslope", dudeSlope)
 			("dudeextra", dudeExtra)
 			("explosionflag", explosionhackflag)