From 80990f23174bc9435395a3d511da3eef1c094c84 Mon Sep 17 00:00:00 2001
From: Daniel Gibson <metalcaedes@gmail.com>
Date: Mon, 18 Apr 2016 19:10:52 +0200
Subject: [PATCH] Fix some more warnings, Warning about supressed warnings in
 cmake

---
 Sources/CMakeLists.txt                | 1 +
 Sources/Engine/Graphics/ImageInfo.cpp | 2 ++
 Sources/GameMP/Controls.cpp           | 5 +++--
 Sources/SeriousSam/Menu.cpp           | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt
index c247388..974f325 100644
--- a/Sources/CMakeLists.txt
+++ b/Sources/CMakeLists.txt
@@ -114,6 +114,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     add_definitions(-Wno-tautological-undefined-compare)
     add_definitions(-Wno-c++11-compat-deprecated-writable-strings)
     add_definitions(-Wno-logical-op-parentheses)
+    MESSAGE(WARNING "reenable -Wlogical-op-parentheses some day!")
 endif()
 
 # !!! FIXME: you currently need this, but I'd like to flip this to not use
diff --git a/Sources/Engine/Graphics/ImageInfo.cpp b/Sources/Engine/Graphics/ImageInfo.cpp
index 7dbbff3..b15d1c4 100644
--- a/Sources/Engine/Graphics/ImageInfo.cpp
+++ b/Sources/Engine/Graphics/ImageInfo.cpp
@@ -75,6 +75,7 @@ static __forceinline CTStream &operator>>(CTStream &strm, PCXHeader &t) {
   strm>>t.HscreenSize;
   strm>>t.VscreenSize;
   strm.Read_t(t.Filler, sizeof (t.Filler));
+  return strm;
 }
 
 static __forceinline CTStream &operator<<(CTStream &strm, const PCXHeader &t) {
@@ -96,6 +97,7 @@ static __forceinline CTStream &operator<<(CTStream &strm, const PCXHeader &t) {
   strm<<t.HscreenSize;
   strm<<t.VscreenSize;
   strm.Write_t(t.Filler, sizeof (t.Filler));
+  return strm;
 }
 
 // TARGA header structure
diff --git a/Sources/GameMP/Controls.cpp b/Sources/GameMP/Controls.cpp
index b6c4df4..fa0df01 100644
--- a/Sources/GameMP/Controls.cpp
+++ b/Sources/GameMP/Controls.cpp
@@ -227,9 +227,10 @@ void CControls::Load_t( CTFileName fnFile)
       achrActionName[ 0] = 0;
       FLOAT fSensitivity = 50;
       FLOAT fDeadZone = 0;
-      // FIXME DG: gcc and clang say the followign has too many arguments for the given format
+      // FIXME DG: if achrIfSmooth should be read, add another %1024s - but it seems like achrIfSmooth
+      //           is unused - below achrIfRelative is compared to "Smooth"?!
       sscanf( achrLine, "%*[^\"]\"%1024[^\"]\"%*[^\"]\"%1024[^\"]\" %g %g %1024s %1024s",
-              achrActionName, achrAxis, &fSensitivity, &fDeadZone,   achrIfInverted, achrIfRelative, achrIfSmooth);
+              achrActionName, achrAxis, &fSensitivity, &fDeadZone, achrIfInverted, achrIfRelative /*, achrIfSmooth*/);
       // find action axis
       INDEX iActionAxisNo = -1;
       {for( INDEX iAxis=0; iAxis<AXIS_ACTIONS_CT; iAxis++){
diff --git a/Sources/SeriousSam/Menu.cpp b/Sources/SeriousSam/Menu.cpp
index 31448a6..74be8fb 100644
--- a/Sources/SeriousSam/Menu.cpp
+++ b/Sources/SeriousSam/Menu.cpp
@@ -1187,7 +1187,7 @@ void JoinNetworkGame(void)
       _pNetwork->ga_strRequiredMod.ScanF("%250[^\\]\\%s", &strModName, &strModURL);
       _fnmModSelected = CTString(strModName);
       _strModURLSelected = strModURL;
-      if (_strModURLSelected="") { // FIXME DG: not == ?
+      if (_strModURLSelected=="") {
         _strModURLSelected = "http://www.croteam.com/mods/Old";
       }
       _strModServerSelected.PrintF("%s:%s", (const char *) _pGame->gam_strJoinAddress, (const char *) _pShell->GetValue("net_iPort"));