From 728635c1c0fd049148d44daef96297ed55d478d3 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Wed, 20 Nov 2019 23:29:13 +0100
Subject: [PATCH] - correct application of in_mouseflip flag.

---
 source/audiolib/src/multivoc.cpp | 2 +-
 source/sw/src/game.cpp           | 3 ++-
 source/sw/src/player.cpp         | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/source/audiolib/src/multivoc.cpp b/source/audiolib/src/multivoc.cpp
index d5435d9e0..7144d38ed 100644
--- a/source/audiolib/src/multivoc.cpp
+++ b/source/audiolib/src/multivoc.cpp
@@ -278,7 +278,7 @@ static VoiceNode *MV_GetVoice(int handle)
 {
     if (handle < MV_MINVOICEHANDLE || handle > MV_MaxVoices)
     {
-        MV_Printf("MV_GetVoice(): bad handle (%d)!\n", handle);
+        //MV_Printf("MV_GetVoice(): bad handle (%d)!\n", handle);
         return nullptr;
     }
 
diff --git a/source/sw/src/game.cpp b/source/sw/src/game.cpp
index b591a8074..7ae7c0378 100644
--- a/source/sw/src/game.cpp
+++ b/source/sw/src/game.cpp
@@ -4090,10 +4090,11 @@ void getinput(SW_PACKET *loc)
 
 	aimvel = fix16_div(fix16_from_int(info.mousey), F16(64));
 
-    if (in_mouseflip)
+    if (!in_mouseflip)	// SW's mouse is inverted by default.
         aimvel = -aimvel;
 
 	aimvel -= fix16_from_int(info.dpitch) / analogExtent * analogTurnAmount;
+	aimvel >>= 15;
 
 	svel -= info.dx * keyMove / analogExtent;
 	vel -= info.dz * keyMove / analogExtent;
diff --git a/source/sw/src/player.cpp b/source/sw/src/player.cpp
index 5da897c09..cebf9ffd6 100644
--- a/source/sw/src/player.cpp
+++ b/source/sw/src/player.cpp
@@ -1877,7 +1877,8 @@ DoPlayerHorizon(PLAYERp pp)
 //    MONO_PRINT(ds);
 
 	// Fixme: This should probably be made optional.
-    PlayerAutoLook(pp);
+	if (cl_slopetilting)
+		PlayerAutoLook(pp);
 
     if (pp->input.aimvel)
     {