mdiluz/ttrts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Turn on all warnings, except reorder, and fix remaining warnings

Browse source
This commit is contained in:
Marc Di Luzio 2014-12-16 13:13:02 +00:00
parent 50ed84c1bd
commit 99cd93ae22
4 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -1,6 +1,6 @@
cmake_minimum_required( VERSION 2.8.7 ) 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" ) if( CMAKE_BUILD_TYPE MATCHES "Debug" )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g" )

7
game/game.cpp
View file

@ -73,6 +73,9 @@ uvector2 CTTRTSGame::GetNewPosition( const OrderUnitPair& pair ) const
{ {
case order_c::F: case order_c::F:
return pair.unit.getInFront(); return pair.unit.getInFront();
break;
default:
break;
} }
return { ucoord_invalid,ucoord_invalid }; return { ucoord_invalid,ucoord_invalid };
@ -118,6 +121,8 @@ int CTTRTSGame::SimulateToNextTurn()
} }
} }
break; break;
default:
break;
} }
} }
@ -160,6 +165,8 @@ int CTTRTSGame::SimulateToNextTurn()
pair.order = COrder(); pair.order = COrder();
} }
break; break;
default:
break;
} }
} }

2
game/orders.cpp
View file

@ -19,7 +19,7 @@ COrder GetOrderFromString( const std::string& _order )
std::string order = _order; std::string order = _order;
COrder ret; COrder ret;
int pos = order.find(ORDER_DELIMITER); size_t pos = order.find(ORDER_DELIMITER);
if( pos != std::string::npos ) if( pos != std::string::npos )
{ {
const std::string order_unit = order.substr(0, pos); const std::string order_unit = order.substr(0, pos);

2
game/unit.cpp
View file

@ -33,8 +33,8 @@ namespace
CUnit::CUnit() CUnit::CUnit()
: unit_id ( get_unique_unit_id() ) : unit_id ( get_unique_unit_id() )
, team_id ( team_id_invalid ) , team_id ( team_id_invalid )
, player_id ( player_id_invalid )
, unit_vis ( unitVis_invalid ) , unit_vis ( unitVis_invalid )
, player_id ( player_id_invalid )
, dir ( dir_t::S ) , dir ( dir_t::S )
, pos ( { ucoord_invalid, ucoord_invalid } ) , pos ( { ucoord_invalid, ucoord_invalid } )
{ {