From b8cfa94568b85e4ed51c558f09734ede794ad988 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Wed, 22 Apr 2020 01:04:26 +0200
Subject: [PATCH] - fixed merge errors in SW.

---
 source/sw/src/draw.cpp | 2 +-
 source/sw/src/game.cpp | 2 +-
 source/sw/src/interp.h | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/source/sw/src/draw.cpp b/source/sw/src/draw.cpp
index 51bf06773..7aa9cb915 100644
--- a/source/sw/src/draw.cpp
+++ b/source/sw/src/draw.cpp
@@ -2009,7 +2009,7 @@ drawscreen(PLAYERp pp)
     tx = camerapp->oposx + mulscale16(camerapp->posx - camerapp->oposx, smoothratio);
     ty = camerapp->oposy + mulscale16(camerapp->posy - camerapp->oposy, smoothratio);
     tz = camerapp->oposz + mulscale16(camerapp->posz - camerapp->oposz, smoothratio);
-    if (PEDANTIC_MODE || pp->sop_control ||
+    if (/*PEDANTIC_MODE ||*/ pp->sop_control ||
         pp == Player+myconnectindex && TEST(pp->Flags, PF_DEAD))
     {
         tq16ang = camerapp->q16ang;
diff --git a/source/sw/src/game.cpp b/source/sw/src/game.cpp
index c8c421b98..4f74082c2 100644
--- a/source/sw/src/game.cpp
+++ b/source/sw/src/game.cpp
@@ -953,7 +953,7 @@ void InitLevelGlobals(void)
     sumowasseen = FALSE;
     zillawasseen = FALSE;
     memset(BossSpriteNum,-1,sizeof(BossSpriteNum));
-    InterpolateSectObj = !CommEnabled && !PedanticMode;
+    InterpolateSectObj = !CommEnabled;// && !PedanticMode;
 }
 
 void InitLevelGlobals2(void)
diff --git a/source/sw/src/interp.h b/source/sw/src/interp.h
index 3347d1283..9ee3a2fe3 100644
--- a/source/sw/src/interp.h
+++ b/source/sw/src/interp.h
@@ -23,7 +23,6 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
-BEGIN_SW_NS
 
 #ifndef INTERP_H
 
@@ -31,6 +30,8 @@ BEGIN_SW_NS
 
 #include "build.h"
 
+BEGIN_SW_NS
+
 #define SHORT_MAXINTERPOLATIONS 256
 extern short short_numinterpolations, short_startofdynamicinterpolations;
 extern short short_oldipos[SHORT_MAXINTERPOLATIONS];
@@ -54,5 +55,6 @@ void togglespriteinterpolation(spritetype *sp, int set);
 static void FORCE_INLINE setspriteinterpolation(spritetype *sp) { togglespriteinterpolation(sp, 1); }
 static void FORCE_INLINE stopspriteinterpolation(spritetype *sp) { togglespriteinterpolation(sp, 0); }
 
-#endif
 END_SW_NS
+
+#endif