diff --git a/source/games/sw/src/game.h b/source/games/sw/src/game.h
index 783713ba1..a5286daab 100644
--- a/source/games/sw/src/game.h
+++ b/source/games/sw/src/game.h
@@ -1964,9 +1964,9 @@ inline bool SectorIsUnderwaterArea(sectortype* sect)
     return sect ? sect->extra & (SECTFX_UNDERWATER | SECTFX_UNDERWATER2) : false;
 }
 
-inline bool PlayerFacingRange(PLAYER* pp, DSWActor* a, int range)
+inline bool PlayerFacingRange(PLAYER* pp, DSWActor* a, DAngle range)
 {
-    return (abs(getincangle(getangle(a->spr.pos - pp->pos), (pp)->angle.ang.Buildang())) < (range));
+    return absangle(VecToAngle(a->spr.pos - pp->pos), pp->angle.ang) < range;
 }
 
 inline bool FacingRange(DSWActor* a1, DSWActor* a2, DAngle range)
diff --git a/source/games/sw/src/weapon.cpp b/source/games/sw/src/weapon.cpp
index e953bd90c..cf131b8b0 100644
--- a/source/games/sw/src/weapon.cpp
+++ b/source/games/sw/src/weapon.cpp
@@ -12265,7 +12265,8 @@ int InitSwordAttack(PLAYER* pp)
 {
     DSWActor* plActor = pp->actor;
     unsigned stat;
-    short reach, face;
+    short reach;
+    DAngle face;
 
     PlaySound(DIGI_SWORDSWOOSH, pp, v3df_dontpan | v3df_doppler);
 
@@ -12313,7 +12314,7 @@ int InitSwordAttack(PLAYER* pp)
             double dist = (pp->pos.XY() - itActor->spr.pos.XY()).Length();
 
             reach = 1000; // !JIM! was 800
-            face = 200;
+            face = DAngle::fromBuild(200);
 
             if (dist < CloseRangeDist(itActor, plActor, reach) && PlayerFacingRange(pp, itActor, face))
             {
@@ -12432,7 +12433,8 @@ int InitFistAttack(PLAYER* pp)
 {
     DSWActor* plActor = pp->actor;
     unsigned stat;
-    short reach,face;
+    short reach;
+    DAngle face;
 
     PlaySound(DIGI_STAR, pp, v3df_dontpan|v3df_doppler);
 
@@ -12477,22 +12479,22 @@ int InitFistAttack(PLAYER* pp)
 
             if (pp->InventoryActive[2]) // Shadow Bombs give you demon fist
             {
-                face = 190;
+                face = DAngle::fromBuild(190);
                 reach = 2300;
             }
             else
             {
                 reach = 1000;
-                face = 200;
+                face = DAngle::fromBuild(200);
             }
 
             if (dist < CloseRangeDist(itActor, plActor, reach) && PlayerFacingRange(pp, itActor, face))
             {
-                if (SpriteOverlapZ(pp->actor, itActor, 20) || face == 190)
+                if (SpriteOverlapZ(pp->actor, itActor, 20) || reach == 2300)
                 {
                     if (FAFcansee(ActorVectOfMiddle(itActor), itActor->sector(), ActorVectOfMiddle(plActor), plActor->sector()))
                         DoDamage(itActor, plActor);
-                    if (face == 190)
+                    if (reach == 2300)
                     {
                         SpawnDemonFist(itActor);
                     }