More style tweaks

client/battle/CBattleInterface.cpp

@@ -456,8 +456,8 @@ CBattleInterface::~CBattleInterface()
 
 	if (adventureInt && adventureInt->selection)
 	{
-		const auto * terrain = LOCPLINT->cb->getTile(adventureInt->selection->visitablePos())->terType;
-		CCS->musich->playMusicFromSet("terrain", terrain->name, true);
+		const auto & terrain = *(LOCPLINT->cb->getTile(adventureInt->selection->visitablePos())->terType);
+		CCS->musich->playMusicFromSet("terrain", terrain.name, true);
 	}
 	animsAreDisplayed.setn(false);
 }

lib/mapping/CMap.cpp

@@ -126,14 +126,14 @@ CCastleEvent::CCastleEvent() : town(nullptr)
 TerrainTile::TerrainTile():
 	terType(nullptr),
 	terView(0),
+	riverType(VLC->terrainTypeHandler->rivers()[0]),
 	riverDir(0),
+	roadType(VLC->terrainTypeHandler->roads()[0]),
 	roadDir(0),
 	extTileFlags(0),
 	visitable(false),
 	blocked(false)
 {
-	riverType = VLC->terrainTypeHandler->rivers()[0];
-	roadType = VLC->terrainTypeHandler->roads()[0];
 }
 
 bool TerrainTile::entrableTerrain(const TerrainTile * from) const