Merge pull request #31 from AC159/bug_fix

Revert "Changed iterator loop to range based"

Author: AC159

GameEngine/GameEngine.cpp

@@ -360,7 +360,8 @@ bool GameEngine::executeOrdersPhase() {
     bool doneDeploying = false;
 
     while (ordersRemain()) {
-        for (const auto &player: playersList) {
+        for (auto it = playersList.begin(); it < playersList.end(); it++) {
+            Players::Player *player = *it;
             Orders::Order *topOrder = player->orders->element(0);
 
             //deployment is confirmed to be completed once every player's top order was found to not be of deploy type
@@ -391,7 +392,7 @@ bool GameEngine::executeOrdersPhase() {
 
                 //player is eliminated if their last territory was taken
                 if (targetPlayerIt != playersList.end() && (*targetPlayerIt)->territories.empty()
-                    && *targetPlayerIt != player) {
+                    && targetPlayerIt != it) {
                     cout << " → " << (*targetPlayerIt)->getName() << " is eliminated." << endl;
                     delete *targetPlayerIt;
                     playersList.erase(targetPlayerIt);

Player/Player.cpp

@@ -215,7 +215,7 @@ void Player::issueOrder(Cards::Deck *deck, Graph::Map *map) {
                     dynamic_cast<Cards::Bomb *>(card)->play(this, deck, toAttack(mapEdges).begin()->second, map);
                 } else if (type == "reinforcement") {
                     dynamic_cast<Cards::Reinforcement *>(card)->play(this, deck, defend.begin()->second);
-                } else if (type == "blockade") {
+                } else if (type == "blockade" && territories.size() != 1) { // avoid self-elimination
                     dynamic_cast<Cards::Blockade *>(card)->play(this, deck, defend.begin()->second);
                 } else if (type == "diplomacy") {
                     vector<Territory *> adjacent = defend.begin()->second->adjacentEnemyTerritories(mapEdges);