- cleanup, part 2.

ZDoom · Aug 9, 2022 · 27fe199 · 27fe199
1 parent 5f60fcc
commit 27fe199
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/source/games/duke/src/actors_d.cpp b/source/games/duke/src/actors_d.cpp
@@ -1828,12 +1828,13 @@ void movetransports_d(void)
 						if ((ps[p].jetpack_on == 0) || (ps[p].jetpack_on && (PlayerInput(p, SB_JUMP))) ||
 							(ps[p].jetpack_on && PlayerInput(p, SB_CROUCH)))
 						{
-							ps[p].player_add_int_xy(Owner->int_pos().vec2 - act->int_pos().vec2);
+							ps[p].pos.X += Owner->spr.pos.X - act->spr.pos.X;
+							ps[p].pos.Y += Owner->spr.pos.Y - act->spr.pos.Y;
 							ps[p].backupxy();
 
 							if (ps[p].jetpack_on && (PlayerInput(p, SB_JUMP) || ps[p].jetpack_on < 11))
-								ps[p].player_set_int_z(Owner->int_pos().Z - 6144);
-							else ps[p].player_set_int_z(Owner->int_pos().Z + 6144);
+								ps[p].pos.Z = Owner->spr.pos.Z - 24;
+							else ps[p].pos.Z = Owner->spr.pos.Z + 24;
 							ps[p].backupz();
 
 							auto pa = ps[p].GetActor();
@@ -1857,7 +1858,7 @@ void movetransports_d(void)
 						}
 						if (ps[p].GetActor()->spr.extra > 0)
 							S_PlayActorSound(DUKE_UNDERWATER, act2);
-						ps[p].player_set_int_z(Owner->sector()->int_ceilingz() + (7 << 8));
+						ps[p].pos.Z = Owner->sector()->ceilingz + 7;
 						ps[p].backupz();
 
 						ps[p].vel.X = 4096 - (krand() & 8192);
@@ -1875,7 +1876,7 @@ void movetransports_d(void)
 						}
 						S_PlayActorSound(DUKE_GASP, act2);
 
-						ps[p].player_set_int_z(Owner->sector()->int_floorz() - (7 << 8));
+						ps[p].pos.Z = Owner->sector()->floorz - 7;
 						ps[p].backupz();
 
 						ps[p].jumping_toggle = 1;
@@ -1884,15 +1885,16 @@ void movetransports_d(void)
 
 					if (k == 1)
 					{
-						ps[p].player_add_int_xy(Owner->int_pos().vec2 - act->int_pos().vec2);
+						ps[p].pos.X += Owner->spr.pos.X - act->spr.pos.X;
+						ps[p].pos.Y += Owner->spr.pos.Y - act->spr.pos.Y;
 						ps[p].backupxy();
 
 						if (!Owner || Owner->GetOwner() != Owner)
 							ps[p].transporter_hold = -2;
 						ps[p].setCursector(Owner->sector());
 
 						ChangeActorSect(act2, Owner->sector());
-						SetActor(ps[p].GetActor(), vec3_t(ps[p].player_int_pos().X, ps[p].player_int_pos().Y, ps[p].player_int_pos().Z + gs.int_playerheight ));
+						SetActor(ps[p].GetActor(), ps[p].pos.plusZ(gs.playerheight));
 
 						if ((krand() & 255) < 32)
 							spawn(act2, WATERSPLASH2);

diff --git a/source/games/duke/src/actors_r.cpp b/source/games/duke/src/actors_r.cpp
@@ -1475,12 +1475,13 @@ void movetransports_r(void)
 						if ((ps[p].jetpack_on == 0) || (ps[p].jetpack_on && PlayerInput(p, SB_JUMP)) ||
 							(ps[p].jetpack_on && PlayerInput(p, SB_CROUCH)))
 						{
-							ps[p].player_add_int_xy(Owner->int_pos().vec2 - act->int_pos().vec2);
+							ps[p].pos.X += Owner->spr.pos.X - act->spr.pos.X;
+							ps[p].pos.Y += Owner->spr.pos.Y - act->spr.pos.Y;
 							ps[p].backupxy();
 
 							if (ps[p].jetpack_on && (PlayerInput(p, SB_JUMP) || ps[p].jetpack_on < 11))
-								ps[p].player_set_int_z(Owner->int_pos().Z - 6144);
-							else ps[p].player_set_int_z(Owner->int_pos().Z + 6144);
+								ps[p].pos.Z = Owner->spr.pos.Z - 24;
+							else ps[p].pos.Z = Owner->spr.pos.Z + 24;
 							ps[p].backupz();
 
 							ChangeActorSect(act2, Owner->sector());
@@ -1496,15 +1497,15 @@ void movetransports_r(void)
 						if (onfloorz && sectlotag == 160 && ps[p].player_int_pos().Z > (sectp->int_floorz() - (48 << 8)))
 						{
 							k = 2;
-							ps[p].player_set_int_z(Owner->sector()->int_ceilingz() + (7 << 8));
+							ps[p].pos.Z = Owner->sector()->ceilingz + 7;
 							ps[p].backupz();
 						}
 
 						if (onfloorz && sectlotag == 161 && ps[p].player_int_pos().Z < (sectp->int_ceilingz() + (6 << 8)))
 						{
 							k = 2;
 							if (ps[p].GetActor()->spr.extra <= 0) break;
-							ps[p].player_set_int_z(Owner->sector()->int_floorz() - (49 << 8));
+							ps[p].pos.Z = Owner->sector()->floorz - 49;
 							ps[p].backupz();
 						}
 					}
@@ -1519,8 +1520,8 @@ void movetransports_r(void)
 							FX_StopAllSounds();
 						}
 						S_PlayActorSound(DUKE_UNDERWATER, ps[p].GetActor());
-						ps[p].player_set_int_z(Owner->sector()->int_ceilingz() + (7 << 8));
-							ps[p].backupz();
+						ps[p].pos.Z = Owner->sector()->ceilingz + 7;
+						ps[p].backupz();
 						if (ps[p].OnMotorcycle)
 							ps[p].moto_underwater = 1;
 					}
@@ -1535,13 +1536,14 @@ void movetransports_r(void)
 						}
 						S_PlayActorSound(DUKE_GASP, ps[p].GetActor());
 
-						ps[p].player_set_int_z(Owner->sector()->int_floorz() - (7 << 8));
+						ps[p].pos.Z = Owner->sector()->floorz - 7;
 						ps[p].backupz();
 					}
 
 					if (k == 1)
 					{
-						ps[p].player_add_int_xy(Owner->int_pos().vec2 - act->int_pos().vec2);
+						ps[p].pos.X += Owner->spr.pos.X - act->spr.pos.X;
+						ps[p].pos.Y += Owner->spr.pos.Y - act->spr.pos.Y;
 						ps[p].backupxy();
 
 						if (Owner->GetOwner() != Owner)
@@ -1555,7 +1557,8 @@ void movetransports_r(void)
 					}
 					else if (isRRRA() && k == 2)
 					{
-						ps[p].player_add_int_xy(Owner->int_pos().vec2 - act->int_pos().vec2);
+						ps[p].opos.X = ps[p].pos.X += Owner->spr.pos.X - act->spr.pos.X;
+						ps[p].opos.Y = ps[p].pos.Y += Owner->spr.pos.Y - act->spr.pos.Y;
 						ps[p].backupxy();
 
 						if (Owner->GetOwner() != Owner)