From b9568aa372af666607dc44484cc4def4a482358d Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 31 Jan 2022 19:20:53 +0100 Subject: [PATCH] - missed this in Blood --- source/core/coreactor.h | 2 +- source/games/blood/src/actor.cpp | 4 ++-- source/games/blood/src/callback.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/core/coreactor.h b/source/core/coreactor.h index a51e4a1fd..cb8b6721d 100644 --- a/source/core/coreactor.h +++ b/source/core/coreactor.h @@ -70,7 +70,7 @@ public: return time; } - vec3_t int_pos() const + const vec3_t int_pos() const { return spr.pos; } diff --git a/source/games/blood/src/actor.cpp b/source/games/blood/src/actor.cpp index 3f258bd2b..4f3bddd8c 100644 --- a/source/games/blood/src/actor.cpp +++ b/source/games/blood/src/actor.cpp @@ -5343,7 +5343,7 @@ int MoveMissile(DBloodActor* actor) vz += ClipLow(ceilZ - top, 0); cliptype = 1; } - actor->int_pos() = pos; + actor->set_int_pos( pos); actor->add_int_z(vz); updatesector(pos.X, pos.Y, &pSector); if (pSector != nullptr && pSector != actor->sector()) @@ -6653,7 +6653,7 @@ bool actCheckRespawn(DBloodActor* actor) if (!(actor->spr.type >= kDudeBase && actor->spr.type < kDudeMax)) { actor->spr.cstat &= ~CSTAT_SPRITE_BLOCK_ALL; - actor->int_pos() = actor->basePoint; + actor->set_int_pos(actor->basePoint); } evPostActor(actor, nRespawnTime, kCallbackRespawn); } diff --git a/source/games/blood/src/callback.cpp b/source/games/blood/src/callback.cpp index 586de80da..7918fc71f 100644 --- a/source/games/blood/src/callback.cpp +++ b/source/games/blood/src/callback.cpp @@ -298,7 +298,7 @@ void Respawn(DBloodActor* actor, sectortype*) // 9 if (actor->IsDudeActor()) { 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; #ifdef NOONE_EXTENSIONS if (!gModernMap || actor->xspr.sysData2 <= 0) actor->xspr.health = dudeInfo[actor->spr.type - kDudeBase].startHealth << 4;