zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-06-01 01:41:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

- make XSPRITE::target a pointer

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-19 20:54:13 +01:00
parent d576e8f438
commit bee70155d2
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -168,13 +168,12 @@ public:
void SetTarget(DBloodActor* own) void SetTarget(DBloodActor* own)
{ {
x().target_i = own ? own->GetSpriteIndex() : -1; x().target = own;
} }
DBloodActor* GetTarget() DBloodActor* GetTarget()
{ {
if (x().target_i <= -1 || x().target_i == kMaxSprites - 1) return nullptr; return x().target;
return base() + x().target_i;
} }
bool ValidateTarget(const char* func) bool ValidateTarget(const char* func)

4
source/games/blood/src/db.h
View file

@ -94,6 +94,9 @@ struct XSPRITE {
unsigned int unused2 : 1; // (new) patrol state unsigned int unused2 : 1; // (new) patrol state
}; };
}; };
DBloodActor* target; // target sprite
int32_t targetX; // target x int32_t targetX; // target x
int32_t targetY; // target y int32_t targetY; // target y
int32_t targetZ; // target z int32_t targetZ; // target z
@ -107,7 +110,6 @@ struct XSPRITE {
int16_t data1; // Data 1 int16_t data1; // Data 1
int16_t data2; // Data 2 int16_t data2; // Data 2
int16_t data3; // Data 3 int16_t data3; // Data 3
int16_t target_i; // target sprite
int16_t burnSource; int16_t burnSource;
uint16_t txID; // TX ID uint16_t txID; // TX ID
uint16_t rxID; // RX ID uint16_t rxID; // RX ID

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

@ -623,7 +623,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, XSPRITE& w, XSPRIT
("targetX", w.targetX, def->targetX) ("targetX", w.targetX, def->targetX)
("targetY", w.targetY, def->targetY) ("targetY", w.targetY, def->targetY)
("targetZ", w.targetZ, def->targetZ) ("targetZ", w.targetZ, def->targetZ)
("target", w.target_i, def->target_i) ("target", w.target, def->target)
("sysdata1", w.sysData1, def->sysData1) ("sysdata1", w.sysData1, def->sysData1)
("sysdata2", w.sysData2, def->sysData2) ("sysdata2", w.sysData2, def->sysData2)
("scale", w.scale, def->scale) ("scale", w.scale, def->scale)