diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp index 9d9be200c..dd960bfab 100644 --- a/source/games/duke/src/actors.cpp +++ b/source/games/duke/src/actors.cpp @@ -1365,7 +1365,7 @@ void rpgexplode(DDukeActor *actor, int hit, const DVector3 &pos, int EXPLOSION2, } else if (hit == kHitSector) { - if (actor->int_zvel() > 0 && EXPLOSION2BOT >= 0) + if (actor->float_zvel() > 0 && EXPLOSION2BOT >= 0) spawn(actor, EXPLOSION2BOT); else { @@ -2220,7 +2220,7 @@ bool jibs(DDukeActor *actor, int JIBS6, bool timeout, bool callsetsprite, bool f } actor->add_int_pos({ MulScale(actor->spr.xvel, bcos(actor->int_ang()), 14), MulScale(actor->spr.xvel, bsin(actor->int_ang()), 14), 0 }); - actor->add_int_z(actor->int_zvel()); + actor->spr.pos.Z += actor->float_zvel(); if (floorcheck && actor->spr.pos.Z >= actor->sector()->floorz) { @@ -3357,7 +3357,7 @@ void handle_se05(DDukeActor* actor, int FIRELASER) } } - actor->add_int_z(actor->int_zvel()); + actor->spr.pos.Z += actor->float_zvel(); sc->add_int_ceilingz(actor->int_zvel()); sector[actor->temp_data[0]].add_int_ceilingz(actor->int_zvel()); ms(actor); @@ -4852,7 +4852,7 @@ void makeitfall(DDukeActor* actor) if(actor->int_zvel() < 6144) actor->add_int_zvel( c); else actor->set_int_zvel(6144); - actor->add_int_z(actor->int_zvel()); + actor->spr.pos.Z += actor->float_zvel(); } if (actor->spr.pos.Z >= actor->floorz - FOURSLEIGHT_F) { @@ -5080,7 +5080,7 @@ void fall_common(DDukeActor *actor, int playernum, int JIBS6, int DRONE, int BLO if (actor->spr.pos.Z < actor->floorz - FOURSLEIGHT_F) { actor->add_int_zvel( c); - actor->add_int_z(actor->int_zvel()); + actor->spr.pos.Z += actor->float_zvel(); if (actor->int_zvel() > 6144) actor->set_int_zvel(6144); } diff --git a/source/games/duke/src/actors_d.cpp b/source/games/duke/src/actors_d.cpp index 9111244fc..a66e379c3 100644 --- a/source/games/duke/src/actors_d.cpp +++ b/source/games/duke/src/actors_d.cpp @@ -1455,7 +1455,7 @@ static bool weaponhitsector(DDukeActor* proj, const DVector3& oldpos, bool fireb { SetActor(proj, oldpos); - if (proj->int_zvel() < 0) + if (proj->float_zvel() < 0) { if (proj->sector()->ceilingstat & CSTAT_SECTOR_SKY) if (proj->sector()->ceilingpal == 0) @@ -1644,7 +1644,7 @@ static void weaponcommon_d(DDukeActor* proj) spawned->spr.xrepeat = spawned->spr.yrepeat = proj->spr.xrepeat >> 1; if (coll.type == kHitSector) { - if (proj->int_zvel() < 0) + if (proj->float_zvel() < 0) { spawned->spr.cstat |= CSTAT_SPRITE_YFLIP; spawned->spr.pos.Z += 72; @@ -2401,7 +2401,7 @@ static void greenslime(DDukeActor *actor) if (actor->spr.xrepeat > 8) actor->spr.xrepeat -= 4; if (actor->int_zvel() > -(2048 + 1024)) actor->add_int_zvel(- 348); - actor->add_int_z(actor->int_zvel()); + actor->spr.pos.Z += actor->float_zvel(); if (actor->spr.pos.Z < actor->ceilingz + 16) { actor->spr.pos.Z = actor->ceilingz + 16; @@ -2517,7 +2517,7 @@ static void flamethrowerflame(DDukeActor *actor) else if (coll.type == kHitSector) { SetActor(actor, dapos); - if (actor->int_zvel() < 0) + if (actor->float_zvel() < 0) fi.checkhitceiling(actor->sector()); } @@ -3591,7 +3591,7 @@ void move_d(DDukeActor *actor, int playernum, int xvel) } else { - if (actor->int_zvel() > 0) + if (actor->float_zvel() > 0) { double f = getflorzofslopeptrf(actor->sector(), actor->spr.pos.X, actor->spr.pos.Y); actor->floorz = f; @@ -3612,9 +3612,9 @@ void move_d(DDukeActor *actor, int playernum, int xvel) } else if (actor->spr.picnum != ORGANTIC) { - if (actor->int_zvel() > 0 && actor->floorz < actor->spr.pos.Z) + if (actor->float_zvel() > 0 && actor->floorz < actor->spr.pos.Z) actor->spr.pos.Z = actor->floorz; - if (actor->int_zvel() < 0) + if (actor->float_zvel() < 0) { double c = getceilzofslopeptrf(actor->sector(), actor->spr.pos.X, actor->spr.pos.Y); if (actor->spr.pos.Z < c + 66) diff --git a/source/games/duke/src/actors_r.cpp b/source/games/duke/src/actors_r.cpp index 006d8b272..a535298c4 100644 --- a/source/games/duke/src/actors_r.cpp +++ b/source/games/duke/src/actors_r.cpp @@ -1135,7 +1135,7 @@ bool weaponhitsector(DDukeActor *proj, const DVector3& oldpos) guts_r(proj, RABBITJIBC, 2, myconnectindex); } - if (proj->int_zvel() < 0) + if (proj->float_zvel() < 0) { if (proj->sector()->ceilingstat & CSTAT_SECTOR_SKY) if (proj->sector()->ceilingpal == 0) @@ -1305,7 +1305,7 @@ static void weaponcommon_r(DDukeActor *proj) spawned->spr.xrepeat = spawned->spr.yrepeat = proj->spr.xrepeat >> 1; if (coll.type == kHitSector) { - if (proj->int_zvel() < 0) + if (proj->float_zvel() < 0) { spawned->spr.cstat |= CSTAT_SPRITE_YFLIP; spawned->spr.pos.Z += 72; @@ -3639,7 +3639,7 @@ void move_r(DDukeActor *actor, int pnum, int xvel) { if (actor->spr.picnum == DRONE && actor->spr.extra > 0) { - if (actor->int_zvel() > 0) + if (actor->float_zvel() > 0) { double dist = isRRRA() ? 28 : 30; double f = getflorzofslopeptrf(actor->sector(), actor->spr.pos.X, actor->spr.pos.Y); @@ -3658,9 +3658,9 @@ void move_r(DDukeActor *actor, int pnum, int xvel) } } } - if (actor->int_zvel() > 0 && actor->floorz < actor->spr.pos.Z) + if (actor->float_zvel() > 0 && actor->floorz < actor->spr.pos.Z) actor->spr.pos.Z = actor->floorz; - if (actor->int_zvel() < 0) + if (actor->float_zvel() < 0) { double c = getceilzofslopeptrf(actor->sector(), actor->spr.pos.X, actor->spr.pos.Y); if (actor->spr.pos.Z < c + 66) diff --git a/source/games/exhumed/src/move.cpp b/source/games/exhumed/src/move.cpp index 63ef3ff54..20195dd49 100644 --- a/source/games/exhumed/src/move.cpp +++ b/source/games/exhumed/src/move.cpp @@ -585,17 +585,17 @@ void Gravity(DExhumedActor* pActor) } else { - if (pActor->int_zvel() > 0) + if (pActor->float_zvel() > 0) { pActor->add_int_zvel(- 64); - if (pActor->int_zvel() < 0) { + if (pActor->float_zvel() < 0) { pActor->clear_zvel(); } } - else if (pActor->int_zvel() < 0) + else if (pActor->float_zvel() < 0) { pActor->add_int_zvel( 64); - if (pActor->int_zvel() > 0) { + if (pActor->float_zvel() > 0) { pActor->clear_zvel(); } } diff --git a/source/games/exhumed/src/spider.cpp b/source/games/exhumed/src/spider.cpp index da0f4a8d5..3442e9402 100644 --- a/source/games/exhumed/src/spider.cpp +++ b/source/games/exhumed/src/spider.cpp @@ -281,7 +281,7 @@ void AISpider::Tick(RunListEvent* ev) return; if (nMov.exbits & kHitAux1 - && spp->int_zvel() < 0 + && spp->float_zvel() < 0 && hiHit.type != kHitSprite && !((spp->sector()->ceilingstat) & CSTAT_SECTOR_SKY)) { diff --git a/source/games/sw/src/jweapon.cpp b/source/games/sw/src/jweapon.cpp index aa039d9e6..0e1838a63 100644 --- a/source/games/sw/src/jweapon.cpp +++ b/source/games/sw/src/jweapon.cpp @@ -265,18 +265,18 @@ int DoWallBloodDrip(DSWActor* actor) if (actor->spr.pos.Z > actor->user.pos.Y && actor->spr.pos.Z < actor->user.pos.Z) { actor->add_int_zvel( 300); - actor->add_int_z(actor->int_zvel()); + actor->spr.pos.Z += actor->float_zvel(); } else { actor->set_int_zvel((300+RandomRange(2300)) >> 1); - actor->add_int_z(actor->int_zvel()); + actor->spr.pos.Z += actor->float_zvel(); } } else { actor->set_int_zvel((300+RandomRange(2300)) >> 1); - actor->add_int_z(actor->int_zvel()); + actor->spr.pos.Z += actor->float_zvel(); } if (actor->spr.pos.Z >= actor->user.loz) @@ -1188,7 +1188,7 @@ int SpawnRadiationCloud(DSWActor* actor) int DoRadiationCloud(DSWActor* actor) { actor->spr.pos.XY() += actor->user.change; - actor->add_int_z(-actor->int_zvel()); + actor->spr.pos.Z -= actor->float_zvel(); if (actor->user.ID) { diff --git a/source/games/sw/src/weapon.cpp b/source/games/sw/src/weapon.cpp index 6beefe7dd..50b96a1ca 100644 --- a/source/games/sw/src/weapon.cpp +++ b/source/games/sw/src/weapon.cpp @@ -16654,13 +16654,13 @@ DSWActor* SpawnBubble(DSWActor* actor) int DoVehicleSmoke(DSWActor* actor) { actor->spr.pos.XY() += actor->user.change.XY(); - actor->add_int_z(-actor->int_zvel()); + actor->spr.pos.Z -= actor->float_zvel(); return false; } int DoWaterSmoke(DSWActor* actor) { - actor->add_int_z(-actor->int_zvel()); + actor->spr.pos.Z -= actor->float_zvel(); return false; } @@ -16718,7 +16718,7 @@ int SpawnSmokePuff(DSWActor* actor) int DoBubble(DSWActor* actor) { - actor->add_int_z(-actor->int_zvel()); + actor->spr.pos.Z -= actor->float_zvel(); actor->add_int_zvel( 32); if (actor->int_zvel() > 768)