From abdd807e7fdfbc5978b7de4e9a9d26df852377e7 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Tue, 26 Nov 2019 19:10:24 +0100
Subject: [PATCH] - fixed merge errors.

---
 source/rr/src/screens.cpp |  1 -
 source/sw/src/border.cpp  |  3 ---
 source/sw/src/game.cpp    | 14 ++------------
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/source/rr/src/screens.cpp b/source/rr/src/screens.cpp
index 87bbf83ba..1cb208e5e 100644
--- a/source/rr/src/screens.cpp
+++ b/source/rr/src/screens.cpp
@@ -753,7 +753,6 @@ FString GameInterface::statFPS()
 
 GameStats GameInterface::getStats()
 {
-	GameStats stats;
 	DukePlayer_t* p = g_player[myconnectindex].ps;
 	return { p->actors_killed, p->max_actors_killed, p->secret_rooms, p->max_secret_rooms, p->player_par / REALGAMETICSPERSEC };
 }
diff --git a/source/sw/src/border.cpp b/source/sw/src/border.cpp
index 5f042d291..33398e44b 100644
--- a/source/sw/src/border.cpp
+++ b/source/sw/src/border.cpp
@@ -24,9 +24,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
 #include "ns.h"
-// Added improved crosshair accuracy
-// Added UsingMenus for fragbar
-//
 
 #include "build.h"
 
diff --git a/source/sw/src/game.cpp b/source/sw/src/game.cpp
index 2c0ee37fe..fde75d0b1 100644
--- a/source/sw/src/game.cpp
+++ b/source/sw/src/game.cpp
@@ -105,13 +105,6 @@ signed char MNU_InputString(char*, short);
 SWBOOL IsCommand(const char* str);
 SWBOOL MNU_StartNetGame(void);
 
-#ifdef _WIN32
-# include "winbits.h"
-#endif
-
-const char* AppProperName = "VoidSW";
-const char* AppTechnicalName = "voidsw";
-
 
 #if DEBUG
 #define BETA 0
@@ -4072,9 +4065,6 @@ void getinput(SW_PACKET *loc)
     int32_t keymove;
     constexpr int const analogExtent = 32767; // KEEPINSYNC sdlayer.cpp
 
-	svel -= info.dx * keyMove / analogExtent;
-	vel -= info.dz * keyMove / analogExtent;
-
     if (running)
     {
         if (pp->sop_control)
@@ -4110,12 +4100,12 @@ void getinput(SW_PACKET *loc)
         angvel += info.dyaw * (turnamount << 1) / analogExtent;
     }
 
-    if (aimMode)
+    if (true)//aimMode)
         aimvel = -info.mousey / 64;
     else
         vel = -(info.mousey >> 6);
 
-    if (!in_mouseflip)
+    if (in_mouseflip)
         aimvel = -aimvel;
 
     aimvel -= info.dpitch * turnamount / analogExtent;