teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-01 05:20:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- missed this in Blood

Browse source
This commit is contained in:
Christoph Oelckers 2022-01-31 19:20:53 +01:00
parent 0ad571b72d
commit b9568aa372
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/core/coreactor.h
View file

@ -70,7 +70,7 @@ public:
return time; return time;
} }
vec3_t int_pos() const const vec3_t int_pos() const
{ {
return spr.pos; return spr.pos;
} }

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

@ -5343,7 +5343,7 @@ int MoveMissile(DBloodActor* actor)
vz += ClipLow(ceilZ - top, 0); vz += ClipLow(ceilZ - top, 0);
cliptype = 1; cliptype = 1;
} }
actor->int_pos() = pos; actor->set_int_pos( pos);
actor->add_int_z(vz); actor->add_int_z(vz);
updatesector(pos.X, pos.Y, &pSector); updatesector(pos.X, pos.Y, &pSector);
if (pSector != nullptr && pSector != actor->sector()) if (pSector != nullptr && pSector != actor->sector())
@ -6653,7 +6653,7 @@ bool actCheckRespawn(DBloodActor* actor)
if (!(actor->spr.type >= kDudeBase && actor->spr.type < kDudeMax)) if (!(actor->spr.type >= kDudeBase && actor->spr.type < kDudeMax))
{ {
actor->spr.cstat &= ~CSTAT_SPRITE_BLOCK_ALL; actor->spr.cstat &= ~CSTAT_SPRITE_BLOCK_ALL;
actor->int_pos() = actor->basePoint; actor->set_int_pos(actor->basePoint);
} }
evPostActor(actor, nRespawnTime, kCallbackRespawn); evPostActor(actor, nRespawnTime, kCallbackRespawn);
} }

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

@ -298,7 +298,7 @@ void Respawn(DBloodActor* actor, sectortype*) // 9
if (actor->IsDudeActor()) if (actor->IsDudeActor())
{ {
int nType = actor->spr.type - kDudeBase; int nType = actor->spr.type - kDudeBase;
actor->int_pos() = actor->basePoint; actor->set_int_pos(actor->basePoint);
actor->spr.cstat |= CSTAT_SPRITE_BLOOD_BIT1 | CSTAT_SPRITE_BLOCK_ALL; actor->spr.cstat |= CSTAT_SPRITE_BLOOD_BIT1 | CSTAT_SPRITE_BLOCK_ALL;
#ifdef NOONE_EXTENSIONS #ifdef NOONE_EXTENSIONS
if (!gModernMap || actor->xspr.sysData2 <= 0) actor->xspr.health = dudeInfo[actor->spr.type - kDudeBase].startHealth << 4; if (!gModernMap || actor->xspr.sysData2 <= 0) actor->xspr.health = dudeInfo[actor->spr.type - kDudeBase].startHealth << 4;