More style tweaks

client/mapHandler.cpp

@@ -172,7 +172,6 @@ void CMapHandler::initTerrainGraphics()
 		}
 	};
 	
-	//TODO: use id as a key
 	std::map<std::string, std::string> terrainFiles;
 	std::map<std::string, std::string> riverFiles;
 	std::map<std::string, std::string> roadFiles;

lib/CHeroHandler.cpp

@@ -346,9 +346,9 @@ CHeroHandler::~CHeroHandler() = default;
 CHeroHandler::CHeroHandler()
 {
 	loadTerrains();
-	for(int i = 0; i < VLC->terrainTypeHandler->terrains().size(); ++i)
+	for(const auto & terrain : VLC->terrainTypeHandler->terrains())
 	{
-		VLC->modh->identifiers.registerObject("core", "terrain", VLC->terrainTypeHandler->terrains()[i].name, i);
+		VLC->modh->identifiers.registerObject("core", "terrain", terrain.name, terrain.id);
 	}
 	loadBallistics();
 	loadExperience();

lib/mapObjects/CObjectClassesHandler.cpp

@@ -486,15 +486,15 @@ void AObjectTypeHandler::init(const JsonNode & input, boost::optional<std::strin
 
 	for (auto entry : input["templates"].Struct())
 	{
+		entry.second.setType(JsonNode::JsonType::DATA_STRUCT);
+		JsonUtils::inherit(entry.second, base);
+
+		auto tmpl = new ObjectTemplate;
+		tmpl->id = Obj(type);
+		tmpl->subid = subtype;
+		tmpl->stringID = entry.first; // FIXME: create "fullID" - type.object.template?
 		try
 		{
-			entry.second.setType(JsonNode::JsonType::DATA_STRUCT);
-			JsonUtils::inherit(entry.second, base);
-
-			auto tmpl = new ObjectTemplate;
-			tmpl->id = Obj(type);
-			tmpl->subid = subtype;
-			tmpl->stringID = entry.first; // FIXME: create "fullID" - type.object.template?
 			tmpl->readJson(entry.second);
 			templates.push_back(std::shared_ptr<const ObjectTemplate>(tmpl));
 		}

lib/mapping/CMap.cpp

@@ -128,9 +128,9 @@ CCastleEvent::CCastleEvent() : town(nullptr)
 TerrainTile::TerrainTile():
 	terType(nullptr),
 	terView(0),
-	riverType(const_cast<RiverType*>(&VLC->terrainTypeHandler->rivers()[0])),
+	riverType(const_cast<RiverType*>(&VLC->terrainTypeHandler->rivers()[River::NO_RIVER])),
 	riverDir(0),
-	roadType(const_cast<RoadType*>(&VLC->terrainTypeHandler->roads()[0])),
+	roadType(const_cast<RoadType*>(&VLC->terrainTypeHandler->roads()[Road::NO_ROAD])),
 	roadDir(0),
 	extTileFlags(0),
 	visitable(false),