From 4cb214f3ab580b8419ec0b24ff92fd882066fcae Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 11 Sep 2022 19:28:45 +0200
Subject: [PATCH] - int_vel stuff with constants.

---
 source/games/duke/src/player.cpp   | 2 +-
 source/games/duke/src/player_d.cpp | 4 ++--
 source/games/duke/src/player_r.cpp | 6 +++---
 source/games/duke/src/player_w.cpp | 2 +-
 source/games/duke/src/spawn_d.cpp  | 6 +++---
 source/games/duke/src/spawn_r.cpp  | 6 +++---
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/source/games/duke/src/player.cpp b/source/games/duke/src/player.cpp
index c73ac6052..10aa3a670 100644
--- a/source/games/duke/src/player.cpp
+++ b/source/games/duke/src/player.cpp
@@ -618,7 +618,7 @@ void playerisdead(int snum, int psectlotag, int fz, int cz)
 		else
 		{
 			actor->spr.pos.Z -= 2;
-			actor->set_int_zvel(-348);
+			actor->vel.Z = -348 / 256.;
 		}
 
 		Collision coll;
diff --git a/source/games/duke/src/player_d.cpp b/source/games/duke/src/player_d.cpp
index 91e0db81b..c84fcd0ab 100644
--- a/source/games/duke/src/player_d.cpp
+++ b/source/games/duke/src/player_d.cpp
@@ -743,7 +743,7 @@ static void shootrpg(DDukeActor *actor, int p, int sx, int sy, int sz, int sa, i
 		spawned->spr.yint = gs.numfreezebounces;
 		spawned->spr.xrepeat >>= 1;
 		spawned->spr.yrepeat >>= 1;
-		spawned->add_int_zvel(- (2 << 4));
+		spawned->vel.Z -= 0.25;
 	}
 
 	if (p == -1)
@@ -2387,7 +2387,7 @@ static void operateweapon(int snum, ESyncBits actions)
 					if (j)
 					{
 						j->spr.angle += DAngle180;
-						j->add_int_xvel( 32);
+						j->vel.X += 2.;
 						j->spr.pos.Z += 3;
 						ssp(j, CLIPMASK0);
 					}
diff --git a/source/games/duke/src/player_r.cpp b/source/games/duke/src/player_r.cpp
index 7b8715e61..df33eea8b 100644
--- a/source/games/duke/src/player_r.cpp
+++ b/source/games/duke/src/player_r.cpp
@@ -677,7 +677,7 @@ static void shootrpg(DDukeActor* actor, int p, int sx, int sy, int sz, int sa, i
 		if (atwith == RRTILE1790)
 		{
 			spawned->spr.extra = 10;
-			spawned->set_int_zvel(-(10 << 8));
+			spawned->vel.Z = -10;
 		}
 		else if (atwith == RPG2)
 		{
@@ -695,7 +695,7 @@ static void shootrpg(DDukeActor* actor, int p, int sx, int sy, int sz, int sa, i
 		spawned->spr.yint = gs.numfreezebounces;
 		spawned->spr.xrepeat >>= 1;
 		spawned->spr.yrepeat >>= 1;
-		spawned->add_int_zvel(- (2 << 4));
+		spawned->vel.Z -= 0.125;
 	}
 
 	if (p == -1)
@@ -2978,7 +2978,7 @@ static void operateweapon(int snum, ESyncBits actions, sectortype* psectp)
 					{
 
 						j->set_int_ang((j->int_ang() + 1024) & 2047);
-						j->add_int_xvel( 32);
+						j->vel.X += 2.;
 						j->spr.pos.Z += 3;
 						ssp(j, CLIPMASK0);
 					}
diff --git a/source/games/duke/src/player_w.cpp b/source/games/duke/src/player_w.cpp
index 1074d3938..046333081 100644
--- a/source/games/duke/src/player_w.cpp
+++ b/source/games/duke/src/player_w.cpp
@@ -126,7 +126,7 @@ void DoSpawn(player_struct *p, int snum)
 	{
 		// like chaingun shells
 		j->set_int_ang((j->int_ang() + 1024) & 2047);
-		j->add_int_xvel( 32);
+		j->vel.X += 2.;
 		j->spr.pos.Z += 3;
 		ssp(j,CLIPMASK0);
 	}
diff --git a/source/games/duke/src/spawn_d.cpp b/source/games/duke/src/spawn_d.cpp
index b39d3d024..793db8f94 100644
--- a/source/games/duke/src/spawn_d.cpp
+++ b/source/games/duke/src/spawn_d.cpp
@@ -517,8 +517,8 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
 	case HELECOPT:
 		act->spr.cstat = 0;
 		act->spr.extra = 1;
-		act->set_int_xvel(292);
-		act->set_int_zvel(360);
+		act->vel.X = 292 / 16.;
+		act->vel.Z = 360 / 256.;
 		[[fallthrough]];
 	case RESPAWNMARKERRED:
 	case BLIMP:
@@ -1000,7 +1000,7 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
 		{
 			act->spr.lotag = 0;
 			act->spr.pos.Z -= 32;
-			act->set_int_zvel(-1024);
+			act->vel.Z = -4;
 			ssp(act, CLIPMASK0);
 			if (krand() & 4) act->spr.cstat |= CSTAT_SPRITE_XFLIP;
 		}
diff --git a/source/games/duke/src/spawn_r.cpp b/source/games/duke/src/spawn_r.cpp
index 5351a56d4..2587fe30e 100644
--- a/source/games/duke/src/spawn_r.cpp
+++ b/source/games/duke/src/spawn_r.cpp
@@ -547,8 +547,8 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
 		}
 		act->spr.cstat = 0;
 		act->spr.extra = 1;
-		act->set_int_xvel(292);
-		act->set_int_zvel(360);
+		act->vel.X = 292 / 16.;
+		act->vel.Z = 360 / 256.;
 		[[fallthrough]];
 	case RESPAWNMARKERRED:
 		if (act->spr.picnum == RESPAWNMARKERRED)
@@ -1156,7 +1156,7 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
 			if (act->spr.picnum != BOWLINGBALLSPRITE)
 			{
 				act->spr.pos.Z -= 32;
-				act->set_int_zvel(-(4 << 8));
+				act->vel.Z = -4;
 			}
 			else
 			{