From 99cd93ae22e8130ec14fd7082c610f86881febbe Mon Sep 17 00:00:00 2001
From: Marc Di Luzio <mdiluzio@feralinteractive.com>
Date: Tue, 16 Dec 2014 13:13:02 +0000
Subject: [PATCH] Turn on all warnings, except reorder, and fix remaining
 warnings

---
 CMakeLists.txt  | 2 +-
 game/game.cpp   | 7 +++++++
 game/orders.cpp | 2 +-
 game/unit.cpp   | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 014ed35..7666aaa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required( VERSION 2.8.7 )
 
-set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11" )
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -Wall -Wno-reorder" )
 
 if( CMAKE_BUILD_TYPE MATCHES "Debug" )
 	set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g" )
diff --git a/game/game.cpp b/game/game.cpp
index aff5fb8..e9d5544 100644
--- a/game/game.cpp
+++ b/game/game.cpp
@@ -73,6 +73,9 @@ uvector2 CTTRTSGame::GetNewPosition( const OrderUnitPair& pair ) const
     {
     case order_c::F:
         return pair.unit.getInFront();
+        break;
+    default:
+        break;
     }
 
     return { ucoord_invalid,ucoord_invalid };
@@ -118,6 +121,8 @@ int CTTRTSGame::SimulateToNextTurn()
                 }
             }
             break;
+        default:
+            break;
         }
     }
 
@@ -160,6 +165,8 @@ int CTTRTSGame::SimulateToNextTurn()
                 pair.order = COrder();
             }
             break;
+        default:
+            break;
         }
     }
 
diff --git a/game/orders.cpp b/game/orders.cpp
index 96606e9..5be3dda 100644
--- a/game/orders.cpp
+++ b/game/orders.cpp
@@ -19,7 +19,7 @@ COrder GetOrderFromString( const std::string& _order )
 	std::string order = _order;
 	COrder ret;
 
-	int pos = order.find(ORDER_DELIMITER);
+    size_t pos = order.find(ORDER_DELIMITER);
 	if( pos != std::string::npos )
 	{
 		const std::string order_unit = order.substr(0, pos);
diff --git a/game/unit.cpp b/game/unit.cpp
index 3d8af12..7eead1a 100644
--- a/game/unit.cpp
+++ b/game/unit.cpp
@@ -33,8 +33,8 @@ namespace
 CUnit::CUnit()
 : unit_id 	( get_unique_unit_id() )
 , team_id 	( team_id_invalid )
-, player_id ( player_id_invalid )
 , unit_vis 	( unitVis_invalid )
+, player_id ( player_id_invalid )
 , dir 		( dir_t::S )
 , pos 		( { ucoord_invalid, ucoord_invalid } )
 {