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

- add_int_pos in MoveDude

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-16 18:23:58 +02:00
parent fb2c4efa2f
commit de38eb4dab
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4745,7 +4745,7 @@ void MoveDude(DBloodActor* actor)
{ {
if (pPlayer && gNoClip) if (pPlayer && gNoClip)
{ {
actor->add_int_pos({ actor->int_vel().X >> 12, actor->int_vel().Y >> 12, 0 }); actor->spr.pos += actor->vel.XY();
updatesector(actor->spr.pos, &pSector); updatesector(actor->spr.pos, &pSector);
if (!pSector) pSector = actor->sector(); if (!pSector) pSector = actor->sector();
} }
@ -4753,6 +4753,7 @@ void MoveDude(DBloodActor* actor)
{ {
auto bakCstat = actor->spr.cstat; auto bakCstat = actor->spr.cstat;
actor->spr.cstat &= ~CSTAT_SPRITE_BLOCK_ALL; actor->spr.cstat &= ~CSTAT_SPRITE_BLOCK_ALL;
// Note: vel is Q16.16, ClipMove wants Q28.4, which passes it on to clipmove which wants Q14.18. Anyone confused yet...?
ClipMove(actor->spr.pos, &pSector, actor->int_vel().X >> 12, actor->int_vel().Y >> 12, wd, tz, bz, CLIPMASK0, actor->hit.hit); ClipMove(actor->spr.pos, &pSector, actor->int_vel().X >> 12, actor->int_vel().Y >> 12, wd, tz, bz, CLIPMASK0, actor->hit.hit);
if (pSector == nullptr) if (pSector == nullptr)
{ {