zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 17:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

- floatified movesprite_ex

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-13 20:09:29 +02:00
parent 829d06790f
commit facedb6325
3 changed files with 22 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
source/games/duke/src/actors_d.cpp
View file

@ -436,14 +436,14 @@ void hitradius_d(DDukeActor* actor, int r, int hp1, int hp2, int hp3, int h
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
int movesprite_ex_d(DDukeActor* actor, int xchange, int ychange, int zchange, unsigned int cliptype, Collision &result) int movesprite_ex_d(DDukeActor* actor, const DVector3& change, unsigned int cliptype, Collision &result)
{ {
int clipdist; int clipdist;
int bg = badguy(actor); int bg = badguy(actor);
if (actor->spr.statnum == STAT_MISC || (bg && actor->spr.xrepeat < 4)) if (actor->spr.statnum == STAT_MISC || (bg && actor->spr.xrepeat < 4))
{ {
actor->add_int_pos({ (xchange * TICSPERFRAME) >> 2, (ychange * TICSPERFRAME) >> 2, (zchange * TICSPERFRAME) >> 2 }); actor->spr.pos += change;
if (bg) if (bg)
SetActor(actor, actor->spr.pos); SetActor(actor, actor->spr.pos);
return result.setNone(); return result.setNone();
@ -457,7 +457,7 @@ int movesprite_ex_d(DDukeActor* actor, int xchange, int ychange, int zchange, un
if (bg) if (bg)
{ {
if (actor->spr.xrepeat > 60) if (actor->spr.xrepeat > 60)
clipmove(ppos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 1024, (4 << 8), (4 << 8), cliptype, result); clipmove(ppos, &dasectp, FloatToFixed<18>(change.X * 0.5), FloatToFixed<18>(change.Y * 0.5), 1024, (4 << 8), (4 << 8), cliptype, result);
else else
{ {
if (actor->spr.picnum == LIZMAN) if (actor->spr.picnum == LIZMAN)
@ -467,7 +467,7 @@ int movesprite_ex_d(DDukeActor* actor, int xchange, int ychange, int zchange, un
else else
clipdist = 192; clipdist = 192;
clipmove(ppos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), clipdist, (4 << 8), (4 << 8), cliptype, result); clipmove(ppos, &dasectp, FloatToFixed<18>(change.X * 0.5), FloatToFixed<18>(change.Y * 0.5), clipdist, (4 << 8), (4 << 8), cliptype, result);
} }
// conditional code from hell... // conditional code from hell...
@ -480,28 +480,28 @@ int movesprite_ex_d(DDukeActor* actor, int xchange, int ychange, int zchange, un
) )
{ {
if (dasectp && dasectp->lotag == ST_1_ABOVE_WATER && actor->spr.picnum == LIZMAN) if (dasectp && dasectp->lotag == ST_1_ABOVE_WATER && actor->spr.picnum == LIZMAN)
actor->set_int_ang((krand()&2047)); actor->spr.angle = randomAngle();
else if ((actor->temp_data[0]&3) == 1 && actor->spr.picnum != COMMANDER) else if ((actor->temp_data[0]&3) == 1 && actor->spr.picnum != COMMANDER)
actor->set_int_ang((krand()&2047)); actor->spr.angle = randomAngle();
SetActor(actor,actor->spr.pos); SetActor(actor,actor->spr.pos);
if (dasectp == nullptr) dasectp = &sector[0]; if (dasectp == nullptr) dasectp = &sector[0];
return result.setSector(dasectp); return result.setSector(dasectp);
} }
if ((result.type == kHitWall || result.type == kHitSprite) && (actor->cgg == 0)) actor->add_int_ang(768); if ((result.type == kHitWall || result.type == kHitSprite) && (actor->cgg == 0)) actor->spr.angle += DAngle90 + DAngle45;
} }
else else
{ {
if (actor->spr.statnum == STAT_PROJECTILE) if (actor->spr.statnum == STAT_PROJECTILE)
clipmove(ppos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 8, (4 << 8), (4 << 8), cliptype, result); clipmove(ppos, &dasectp, FloatToFixed<18>(change.X * 0.5), FloatToFixed<18>(change.Y * 0.5), 8, (4 << 8), (4 << 8), cliptype, result);
else else
clipmove(ppos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), (int)(actor->int_clipdist()), (4 << 8), (4 << 8), cliptype, result); clipmove(ppos, &dasectp, FloatToFixed<18>(change.X * 0.5), FloatToFixed<18>(change.Y * 0.5), (int)(actor->int_clipdist()), (4 << 8), (4 << 8), cliptype, result);
} }
actor->spr.pos.XY() = ppos.XY(); actor->spr.pos.XY() = ppos.XY();
if (dasectp != nullptr && dasectp != actor->sector()) if (dasectp != nullptr && dasectp != actor->sector())
ChangeActorSect(actor, dasectp); ChangeActorSect(actor, dasectp);
double daz = actor->spr.pos.Z + ((zchange * TICSPERFRAME) >> 3) * zinttoworld; double daz = actor->spr.pos.Z + change.Z * 0.5;
if (daz > actor->ceilingz && daz <= actor->floorz) if (daz > actor->ceilingz && daz <= actor->floorz)
actor->spr.pos.Z = daz; actor->spr.pos.Z = daz;
else if (result.type == kHitNone) else if (result.type == kHitNone)

18
source/games/duke/src/actors_r.cpp
View file

@ -364,14 +364,14 @@ void hitradius_r(DDukeActor* actor, int r, int hp1, int hp2, int hp3, int h
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
int movesprite_ex_r(DDukeActor* actor, int xchange, int ychange, int zchange, unsigned int cliptype, Collision &result) int movesprite_ex_r(DDukeActor* actor, const DVector3& change, unsigned int cliptype, Collision &result)
{ {
int clipdist; int clipdist;
int bg = badguy(actor); int bg = badguy(actor);
if (actor->spr.statnum == 5 || (bg && actor->spr.xrepeat < 4)) if (actor->spr.statnum == 5 || (bg && actor->spr.xrepeat < 4))
{ {
actor->add_int_pos({ (xchange * TICSPERFRAME) >> 2, (ychange * TICSPERFRAME) >> 2, (zchange * TICSPERFRAME) >> 2 }); actor->spr.pos += change;
if (bg) if (bg)
SetActor(actor, actor->spr.pos); SetActor(actor, actor->spr.pos);
return result.setNone(); return result.setNone();
@ -385,19 +385,19 @@ int movesprite_ex_r(DDukeActor* actor, int xchange, int ychange, int zchange, un
if (bg) if (bg)
{ {
if (actor->spr.xrepeat > 60) if (actor->spr.xrepeat > 60)
clipmove(ppos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 1024, (4 << 8), (4 << 8), cliptype, result); clipmove(ppos, &dasectp, FloatToFixed<18>(change.X * 0.5), FloatToFixed<18>(change.Y * 0.5), 1024, (4 << 8), (4 << 8), cliptype, result);
else else
{ {
clipdist = 192; clipdist = 192;
clipmove(ppos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), clipdist, (4 << 8), (4 << 8), cliptype, result); clipmove(ppos, &dasectp, FloatToFixed<18>(change.X * 0.5), FloatToFixed<18>(change.Y * 0.5), clipdist, (4 << 8), (4 << 8), cliptype, result);
} }
if (dasectp == nullptr || (dasectp != nullptr && actor->actorstayput != nullptr && actor->actorstayput != dasectp)) if (dasectp == nullptr || (dasectp != nullptr && actor->actorstayput != nullptr && actor->actorstayput != dasectp))
{ {
if (dasectp && dasectp->lotag == ST_1_ABOVE_WATER) if (dasectp && dasectp->lotag == ST_1_ABOVE_WATER)
actor->set_int_ang((krand() & 2047)); actor->spr.angle = randomAngle();
else if ((actor->temp_data[0] & 3) == 1) else if ((actor->temp_data[0] & 3) == 1)
actor->set_int_ang((krand() & 2047)); actor->spr.angle = randomAngle();
SetActor(actor, actor->spr.pos); SetActor(actor, actor->spr.pos);
if (dasectp == nullptr) dasectp = &sector[0]; if (dasectp == nullptr) dasectp = &sector[0];
return result.setSector(dasectp); return result.setSector(dasectp);
@ -407,16 +407,16 @@ int movesprite_ex_r(DDukeActor* actor, int xchange, int ychange, int zchange, un
else else
{ {
if (actor->spr.statnum == STAT_PROJECTILE) if (actor->spr.statnum == STAT_PROJECTILE)
clipmove(ppos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 8, (4 << 8), (4 << 8), cliptype, result); clipmove(ppos, &dasectp, FloatToFixed<18>(change.X * 0.5), FloatToFixed<18>(change.Y * 0.5), 8, (4 << 8), (4 << 8), cliptype, result);
else else
clipmove(ppos, &dasectp, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 128, (4 << 8), (4 << 8), cliptype, result); clipmove(ppos, &dasectp, FloatToFixed<18>(change.X * 0.5), FloatToFixed<18>(change.Y * 0.5), (int)(actor->int_clipdist()), (4 << 8), (4 << 8), cliptype, result);
} }
actor->spr.pos.XY() = ppos.XY(); actor->spr.pos.XY() = ppos.XY();
if (dasectp) if (dasectp)
if ((dasectp != actor->sector())) if ((dasectp != actor->sector()))
ChangeActorSect(actor, dasectp); ChangeActorSect(actor, dasectp);
double daz = actor->spr.pos.Z + ((zchange * TICSPERFRAME) >> 3) * zinttoworld; double daz = actor->spr.pos.Z + change.Z * 0.5;
if (daz > actor->ceilingz && daz <= actor->floorz) if (daz > actor->ceilingz && daz <= actor->floorz)
actor->spr.pos.Z = daz; actor->spr.pos.Z = daz;
else if (result.type == kHitNone) else if (result.type == kHitNone)

14
source/games/duke/src/dukeactor.h
View file

@ -33,21 +33,13 @@ inline int bossguy(DDukeActor* pSprite)
// old interface versions of already changed functions // old interface versions of already changed functions
int movesprite_ex_d(DDukeActor* actor, int xchange, int ychange, int zchange, unsigned int cliptype, Collision& result); int movesprite_ex_d(DDukeActor* actor, const DVector3& change, unsigned int cliptype, Collision& result);
int movesprite_ex_r(DDukeActor* actor, int xchange, int ychange, int zchange, unsigned int cliptype, Collision& result); int movesprite_ex_r(DDukeActor* actor, const DVector3& change, unsigned int cliptype, Collision& result);
/*
inline int movesprite_ex(DDukeActor* actor, int xchange, int ychange, int zchange, unsigned int cliptype, Collision& result)
{
auto f = isRR() ? movesprite_ex_r : movesprite_ex_d;
return f(actor, xchange, ychange, zchange, cliptype, result);
}
*/
inline int movesprite_ex(DDukeActor* actor, const DVector3& change, unsigned int cliptype, Collision& result) inline int movesprite_ex(DDukeActor* actor, const DVector3& change, unsigned int cliptype, Collision& result)
{ {
auto f = isRR() ? movesprite_ex_r : movesprite_ex_d; auto f = isRR() ? movesprite_ex_r : movesprite_ex_d;
return f(actor, change.X * worldtoint, change.Y * worldtoint, change.Z * zworldtoint, cliptype, result); return f(actor, change, cliptype, result);
} }