From 574a24aded9d5e458ce2a803f33c04f8f55bf2a2 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Wed, 31 Aug 2022 22:28:10 +0200
Subject: [PATCH] - some simple stuff

---
 source/games/sw/src/coolie.cpp |  2 +-
 source/games/sw/src/sprite.cpp | 10 ++++------
 source/games/sw/src/weapon.cpp |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/source/games/sw/src/coolie.cpp b/source/games/sw/src/coolie.cpp
index d3988265f..70144eed7 100644
--- a/source/games/sw/src/coolie.cpp
+++ b/source/games/sw/src/coolie.cpp
@@ -455,7 +455,7 @@ void EnemyDefaults(DSWActor* actor, ACTOR_ACTION_SET* action, PERSONALITY* perso
 
     if (depth && abs(actor->spr.pos.Z - actor->user.loz) < 8)
     {
-        actor->add_int_z(Z(depth));
+        actor->spr.pos.Z += depth;
         actor->user.loz = actor->spr.pos.Z;
         actor->backupz();
     }
diff --git a/source/games/sw/src/sprite.cpp b/source/games/sw/src/sprite.cpp
index db44b5903..41aa235ae 100644
--- a/source/games/sw/src/sprite.cpp
+++ b/source/games/sw/src/sprite.cpp
@@ -1401,7 +1401,6 @@ void PreMapCombineFloors(void)
     const int MAX_FLOORS = 32;
     int i, j, k;
     int base_offset;
-    int dx, dy;
     short pnum;
 
     struct BOUND_LIST
@@ -1439,8 +1438,7 @@ void PreMapCombineFloors(void)
             continue;
         }
 
-        dx = BoundList[base_offset].offset->int_pos().X - BoundList[i].offset->int_pos().X;
-        dy = BoundList[base_offset].offset->int_pos().Y - BoundList[i].offset->int_pos().Y;
+        DVector2 dv = BoundList[base_offset].offset->spr.pos.XY() - BoundList[i].offset->spr.pos.XY();
 
         BFSSectorSearch search(BoundList[i].offset->sector());
         while (auto dasect = search.GetNext())
@@ -1448,12 +1446,12 @@ void PreMapCombineFloors(void)
             SWSectIterator it2(dasect);
             while (auto jActor = it2.Next())
             {
-                jActor->add_int_pos({ dx, dy, 0 });
+                jActor->spr.pos += dv;
             }
 
             for (auto& wal : wallsofsector(dasect))
             {
-                wal.movexy(wal.wall_int_pos().X + dx, wal.wall_int_pos().Y + dy);
+                wal.move(wal.pos + dv);
 
                 if (wal.twoSided())
                     search.Add(wal.nextSector());
@@ -1469,7 +1467,7 @@ void PreMapCombineFloors(void)
             {
                 if (itsect == dasect)
                 {
-                    pp->add_int_ppos_XY({ dx, dy });
+                    pp->pos += dv;
                     pp->opos.XY() = pp->oldpos.XY() = pp->pos.XY();
                     break;
                 }
diff --git a/source/games/sw/src/weapon.cpp b/source/games/sw/src/weapon.cpp
index 0013216ee..9f6eea75a 100644
--- a/source/games/sw/src/weapon.cpp
+++ b/source/games/sw/src/weapon.cpp
@@ -3760,7 +3760,7 @@ AutoShrap:
 
             if (shrap_rand_zamt)
             {
-                actor->add_int_z(Z(RandomRange(shrap_rand_zamt) - (shrap_rand_zamt/2)));
+                actor->spr.pos.Z += RandomRange(shrap_rand_zamt) - (shrap_rand_zamt/2);
             }
 
             actor->spr.pal = actor->user.spal = uint8_t(shrap_pal);