teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-19 07:31:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- shortened the name of DBloodActor::xsprite to xspr.

Browse source
This commit is contained in:
Christoph Oelckers 2021-12-22 09:49:00 +01:00
parent f8171ac5d9
commit 33a00869d8
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/games/blood/src/blood.cpp
View file

@ -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()

6
source/games/blood/src/bloodactor.h
View file

@ -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)
{

2
source/games/blood/src/loadsave.cpp
View file

@ -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)