Ivan Savenko 4 månader sedan
förälder
incheckning
b48afe0580
2 ändrade filer med 4 tillägg och 7 borttagningar
  1. 2 5
      client/adventureMap/CMinimap.cpp
  2. 2 2
      lib/campaign/CampaignHandler.cpp

+ 2 - 5
client/adventureMap/CMinimap.cpp

@@ -49,11 +49,8 @@ ColorRGBA CMinimapInstance::getTileColor(const int3 & pos) const
 		if(player == PlayerColor::NEUTRAL)
 			return graphics->neutralColor;
 
-		if (settings["adventure"]["minimapShowHeroes"].Bool())
-		{
-			if (obj->ID == MapObjectID::HERO)
-				continue;
-		}
+		if (settings["adventure"]["minimapShowHeroes"].Bool() && obj->ID == MapObjectID::HERO)
+			continue;
 
 		if (player.isValidPlayer())
 			return graphics->playerColors[player.getNum()];

+ 2 - 2
lib/campaign/CampaignHandler.cpp

@@ -299,10 +299,10 @@ CampaignTravel CampaignHandler::readScenarioTravelFromJson(JsonNode & reader)
 		try {
 			ret.bonusesToChoose.emplace_back(bjson, ret.startOptions);
 		}
-		catch (const std::exception & e)
+		catch (const std::exception &)
 		{
 			logGlobal->error("Failed to parse campaign bonus: %s", bjson.toCompactString());
-			throw e;
+			throw;
 		}
 	}