teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-03-02 23:32:01 +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
source/games/blood/src
blood.cppbloodactor.hloadsave.cpp

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[4])
IMPLEMENT_POINTER(genDudeExtra.slave[5]) IMPLEMENT_POINTER(genDudeExtra.slave[5])
IMPLEMENT_POINTER(genDudeExtra.slave[6]) IMPLEMENT_POINTER(genDudeExtra.slave[6])
IMPLEMENT_POINTER(xsprite.burnSource) IMPLEMENT_POINTER(xspr.burnSource)
IMPLEMENT_POINTER(xsprite.target) IMPLEMENT_POINTER(xspr.target)
IMPLEMENT_POINTERS_END IMPLEMENT_POINTERS_END
size_t DBloodActor::PropagateMark() size_t DBloodActor::PropagateMark()

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

@ -21,7 +21,7 @@ public:
int dudeSlope; int dudeSlope;
int xvel, yvel, zvel; int xvel, yvel, zvel;
bool hasx; bool hasx;
XSPRITE xsprite; XSPRITE xspr;
SPRITEHIT hit; SPRITEHIT hit;
DUDEEXTRA dudeExtra; DUDEEXTRA dudeExtra;
SPRITEMASS spriteMass; SPRITEMASS spriteMass;
@ -52,7 +52,7 @@ public:
prevmarker = nullptr; prevmarker = nullptr;
ownerActor = nullptr; ownerActor = nullptr;
basePoint = {}; basePoint = {};
xsprite = {}; xspr = {};
hasx = false; hasx = false;
interpolated = false; interpolated = false;
xvel = yvel = zvel = 0; xvel = yvel = zvel = 0;
@ -66,7 +66,7 @@ public:
bool hasX() { return hasx; } bool hasX() { return hasx; }
void addX() { hasx = true; } 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) 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. // The rest is only relevant if the actor has an xsprite.
if (hasX()) if (hasX())
{ {
arc("xsprite", xsprite) arc("xsprite", xspr)
("dudeslope", dudeSlope) ("dudeslope", dudeSlope)
("dudeextra", dudeExtra) ("dudeextra", dudeExtra)
("explosionflag", explosionhackflag) ("explosionflag", explosionhackflag)