From cea437df98ca2108203256b3a3fc12ef266a24bc Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Fri, 9 Sep 2022 19:29:11 +0200
Subject: [PATCH] - lots of set_int_vel.
---
source/games/exhumed/src/bubbles.cpp | 2 +-
source/games/exhumed/src/fish.cpp | 2 +-
source/games/exhumed/src/grenade.cpp | 2 +-
source/games/exhumed/src/lion.cpp | 4 ++--
source/games/exhumed/src/object.cpp | 2 +-
source/games/exhumed/src/queen.cpp | 14 +++++++-------
source/games/exhumed/src/set.cpp | 4 ++--
source/games/exhumed/src/spider.cpp | 6 +++---
source/games/exhumed/src/wasp.cpp | 2 +-
9 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/source/games/exhumed/src/bubbles.cpp b/source/games/exhumed/src/bubbles.cpp
index 786e20318..dc53d141d 100644
--- a/source/games/exhumed/src/bubbles.cpp
+++ b/source/games/exhumed/src/bubbles.cpp
@@ -55,7 +55,7 @@ DExhumedActor* BuildBubble(const DVector3& pos, sectortype* pSector)
pActor->spr.angle = inita;
pActor->vel.X = 0;
pActor->vel.Y = 0;
- pActor->set_int_zvel(-1200);
+ pActor->vel.Z = -1200 / 256.;
pActor->spr.hitag = -1;
pActor->spr.extra = -1;
pActor->spr.lotag = runlist_HeadRun() + 1;
diff --git a/source/games/exhumed/src/fish.cpp b/source/games/exhumed/src/fish.cpp
index a278bda10..8ba382296 100644
--- a/source/games/exhumed/src/fish.cpp
+++ b/source/games/exhumed/src/fish.cpp
@@ -57,7 +57,7 @@ void BuildFishLimb(DExhumedActor* pActor, int anim)
pChunkActor->spr.yrepeat = 64;
pChunkActor->spr.xoffset = 0;
pChunkActor->spr.yoffset = 0;
- pChunkActor->set_int_zvel((-(RandomByte() + 512)) * 2);
+ pChunkActor->vel.Z = ((-(RandomByte() + 512)) * 2) / 256.;
seq_GetSeqPicnum(kSeqFish, pChunkActor->nCount, 0);
diff --git a/source/games/exhumed/src/grenade.cpp b/source/games/exhumed/src/grenade.cpp
index 15cb993f6..fa45aad65 100644
--- a/source/games/exhumed/src/grenade.cpp
+++ b/source/games/exhumed/src/grenade.cpp
@@ -85,7 +85,7 @@ void ThrowGrenade(int nPlayer, int, int, int ecx, int push1)
else
{
pActor->nTurn = 0;
- pActor->set_int_zvel(pPlayerActor->int_zvel());
+ pActor->vel.Z = pPlayerActor->vel.Z;
}
pActor->x = bcos(nAngle, -4) * pActor->nTurn;
diff --git a/source/games/exhumed/src/lion.cpp b/source/games/exhumed/src/lion.cpp
index 2ef1e8829..79612193f 100644
--- a/source/games/exhumed/src/lion.cpp
+++ b/source/games/exhumed/src/lion.cpp
@@ -370,7 +370,7 @@ void AILion::Tick(RunListEvent* ev)
pActor->nCount--;
if (pActor->nCount <= 0)
{
- pActor->set_int_zvel(-4000);
+ pActor->vel.Z = -4000 / 256.;
pActor->nCount = 0;
double nCheckDist = 0x7FFFFFFF;
@@ -465,7 +465,7 @@ void AILion::Tick(RunListEvent* ev)
pActor->spr.angle += RandomAngle9() + DAngle45 + DAngle90;
}
- pActor->set_int_zvel(-1000);
+ pActor->vel.Z = -1000 / 256.;
pActor->nAction = 6;
pActor->vel.XY() = pActor->spr.angle.ToVector() * (1024 - 128);
diff --git a/source/games/exhumed/src/object.cpp b/source/games/exhumed/src/object.cpp
index 3025ad4e2..5b5411321 100644
--- a/source/games/exhumed/src/object.cpp
+++ b/source/games/exhumed/src/object.cpp
@@ -1432,7 +1432,7 @@ void AISpark::Tick(RunListEvent* ev)
return;
}
- pActor->add_int_zvel( 128);
+ pActor->vel.Z += 0.5;
auto nMov = movesprite(pActor, pActor->vel, 4096, 2560, -2560, CLIPMASK1);
if (!nMov.type && !nMov.exbits) {
diff --git a/source/games/exhumed/src/queen.cpp b/source/games/exhumed/src/queen.cpp
index ee99f825e..1c2cb210d 100644
--- a/source/games/exhumed/src/queen.cpp
+++ b/source/games/exhumed/src/queen.cpp
@@ -441,7 +441,7 @@ void BuildQueenEgg(int nQueen, int nVal)
pActor2->spr.xrepeat = 30;
pActor2->spr.yrepeat = 30;
pActor2->vel.XY() = pActor2->spr.angle.ToVector() * 1024;
- pActor2->set_int_zvel(-6000);
+ pActor2->vel.Z = -6000 / 256.;
pActor2->spr.cstat = 0;
}
else
@@ -450,7 +450,7 @@ void BuildQueenEgg(int nQueen, int nVal)
pActor2->spr.yrepeat = 60;
pActor2->vel.X = 0;
pActor2->vel.Y = 0;
- pActor2->set_int_zvel(-2000);
+ pActor2->vel.Z = -2000 / 256.;
pActor2->spr.cstat = CSTAT_SPRITE_BLOCK_ALL;
}
@@ -598,7 +598,7 @@ void AIQueenEgg::Tick(RunListEvent* ev)
case kHitWall:
pActor->spr.angle = DAngle45 + DAngle90 + RandomAngle9();
pActor->VelFromAngle(-3);
- pActor->set_int_zvel(-RandomSize(5));
+ pActor->vel.Z = (-RandomSize(5)) / 256.;
break;
}
@@ -611,7 +611,7 @@ void AIQueenEgg::Tick(RunListEvent* ev)
if (nMov.exbits & kHitAux2)
{
- pActor->set_int_zvel(-(pActor->int_zvel() - 256));
+ pActor->vel.Z = -(pActor->vel.Z - 1);
if (pActor->vel.Z < -2)
{
pActor->vel.Z = 0;
@@ -693,7 +693,7 @@ void BuildQueenHead(int nQueen)
nVelShift = 2;
SetHeadVel(pActor2);
- pActor2->set_int_zvel(-8192);
+ pActor2->vel.Z = -32;
pActor2->spr.lotag = runlist_HeadRun() + 1;
pActor2->spr.hitag = 0;
pActor2->spr.extra = -1;
@@ -789,7 +789,7 @@ void AIQueenHead::Tick(RunListEvent* ev)
}
else if (nMov.exbits == kHitAux2)
{
- pActor->set_int_zvel(-(pActor->int_zvel() >> 1));
+ pActor->vel.Z *= -0.5;
if (pActor->vel.Z > -1)
{
@@ -877,7 +877,7 @@ void AIQueenHead::Tick(RunListEvent* ev)
pActor->spr.angle += DAngle45 + DAngle90 + RandomAngle9();
pActor->norm_ang();
- pActor->set_int_zvel((-20) - RandomSize(6));
+ pActor->vel.Z = ((-20) - RandomSize(6)) / 256.;
SetHeadVel(pActor);
}
diff --git a/source/games/exhumed/src/set.cpp b/source/games/exhumed/src/set.cpp
index 17fd442a5..de03b9465 100644
--- a/source/games/exhumed/src/set.cpp
+++ b/source/games/exhumed/src/set.cpp
@@ -107,7 +107,7 @@ void BuildSoul(DExhumedActor* pSet)
pActor->set_int_ang(RandomSize(11));
pActor->vel.X = 0;
pActor->vel.Y = 0;
- pActor->set_int_zvel((-256) - RandomSize(10));
+ pActor->vel.Z = -1 - RandomSize(10) / 256.;
pActor->spr.pos = DVector3(pSet->spr.pos.XY(), RandomSize(8) + 32 + pActor->sector()->ceilingz - GetActorHeightF(pActor));
//pActor->spr.hitag = nSet;
@@ -508,7 +508,7 @@ void AISet::Tick(RunListEvent* ev)
{
if (pActor->nIndex)
{
- pActor->set_int_zvel(-10000);
+ pActor->vel.Z = -10000 / 256.;
}
else
{
diff --git a/source/games/exhumed/src/spider.cpp b/source/games/exhumed/src/spider.cpp
index c380baccd..347034e32 100644
--- a/source/games/exhumed/src/spider.cpp
+++ b/source/games/exhumed/src/spider.cpp
@@ -179,7 +179,7 @@ void AISpider::Tick(RunListEvent* ev)
if (pSector->ceilingstat & CSTAT_SECTOR_SKY)
{
spp->spr.cstat ^= CSTAT_SPRITE_YFLIP;
- spp->set_int_zvel(1);
+ spp->vel.Z = 1./256.;
spp->nAction = 3;
spp->nFrame = 0;
@@ -205,12 +205,12 @@ void AISpider::Tick(RunListEvent* ev)
if (spp->spr.cstat & CSTAT_SPRITE_YFLIP)
{
spp->spr.cstat ^= CSTAT_SPRITE_YFLIP;
- spp->set_int_zvel(1);
+ spp->vel.Z = 1./256.;
spp->spr.pos.Z = spp->sector()->ceilingz+ GetActorHeightF(spp);
}
else
{
- spp->set_int_zvel(-5120);
+ spp->vel.Z = -20;
}
spp->nAction = 3;
diff --git a/source/games/exhumed/src/wasp.cpp b/source/games/exhumed/src/wasp.cpp
index 5f71537dd..c6484b77c 100644
--- a/source/games/exhumed/src/wasp.cpp
+++ b/source/games/exhumed/src/wasp.cpp
@@ -160,7 +160,7 @@ void AIWasp::Damage(RunListEvent* ev)
pActor->nVel = 3000;
- pActor->set_int_zvel((-20) - RandomSize(6));
+ pActor->vel.Z = -1.25 - RandomSize(6) / 256.;
}
else
{