Fix some bugs

Fix a case where game folder existed in verious forms
Fix bug where game would not correctly end at draw state
Fix bug where the team order file was looked for in the wrong directory
Extract gamestate function and properly handle game ending scenarios
Stop hitting yourselves

Fixed bug where units would not move forward because they were hitting themselves
This commit is contained in:
mdiluzio 2014-12-20 15:35:18 +00:00
parent f4109e7b36
commit fa7aa15ccd
2 changed files with 71 additions and 23 deletions

View file

@ -144,7 +144,10 @@ int CTTRTSGame::SimulateToNextTurn()
// If any unit is in this spot, or moving unit moving to said spot, reject this
for ( const OrderUnitPair& pair2 : m_OrderUnitPairs )
{
if( GetNewPosition(pair2) != newpos )
// Skip myself
if( pair.unit.getID() == pair2.unit.getID() ) continue;
if( GetNewPosition(pair2) == newpos )
{
possible = false;
break;