Again stronger clustering even on the same level

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@11711 8aca7d54-2c30-db11-9de9-000461428c89

Author: prissi

Simutrans.sln

@@ -21,6 +21,7 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{0621B295-BEB7-4767-82F1-F27995610323}.Debug|x64.ActiveCfg = Debug|x64
+		{0621B295-BEB7-4767-82F1-F27995610323}.Debug|x64.Build.0 = Debug|x64
 		{0621B295-BEB7-4767-82F1-F27995610323}.Debug|x86.ActiveCfg = Debug|Win32
 		{0621B295-BEB7-4767-82F1-F27995610323}.Debug|x86.Build.0 = Debug|Win32
 		{0621B295-BEB7-4767-82F1-F27995610323}.Release|x64.ActiveCfg = Release|x64
@@ -31,7 +32,6 @@ Global
 		{0621B295-BEB7-4767-82F1-F27995610323}.Stable|x86.ActiveCfg = Stable|Win32
 		{0621B295-BEB7-4767-82F1-F27995610323}.Stable|x86.Build.0 = Stable|Win32
 		{E74757E8-C2FD-44AD-87BD-3D55F4709484}.Debug|x64.ActiveCfg = Debug|x64
-		{E74757E8-C2FD-44AD-87BD-3D55F4709484}.Debug|x64.Build.0 = Debug|x64
 		{E74757E8-C2FD-44AD-87BD-3D55F4709484}.Debug|x86.ActiveCfg = Debug|Win32
 		{E74757E8-C2FD-44AD-87BD-3D55F4709484}.Release|x64.ActiveCfg = Release|x64
 		{E74757E8-C2FD-44AD-87BD-3D55F4709484}.Release|x64.Build.0 = Release|x64

src/simutrans/builder/hausbauer.cc

@@ -147,9 +147,9 @@ bool hausbauer_t::successfully_loaded()
 			if (desc->get_size().x > 3 || desc->get_size().y > 3) {
 				dbg->fatal("hausbauer_t::successfully_loaded()", "maximum city building size (3x3) but %s is (%ix%i)", desc->get_name(), desc->get_x(), desc->get_y());
 			}
-			if (largest_city_building_area < desc->is_city_building()) {
+			if (largest_city_building_area < desc->get_area()) {
 				dbg->message("hausbauer_t::successfully_loaded()", "so far largest city building %s is (%ix%i)", desc->get_name(), desc->get_x(), desc->get_y());
-				largest_city_building_area = desc->is_city_building();
+				largest_city_building_area = desc->get_area();
 			}
 		}
 

src/simutrans/world/simcity.cc

@@ -3087,12 +3087,12 @@ int stadt_t::orient_city_building(const koord k, const building_desc_t *h, koord
 		}
 
 		sint16 street_counter_ew = 0;
+		sint16 street_counter_ew_ns = 0;
 		sint16 roads_ew = 0;
 		if (fit0) {
-			// 1 or 3 => east or west => counting along y
 			roads_ew++;
-			sint16 extra_offset = h->get_x(0);
-			for (int offset = -1; offset <= h->get_y(0); offset++) {
+			sint16 extra_offset = h->get_x(1);
+			for (int offset = -1; offset <= h->get_y(1); offset++) {
 				gr = welt->lookup_kartenboden(k + koord(extra_offset, offset));
 				if (gr && gr->hat_weg(road_wt)) {
 					street_counter_ew++; // east
@@ -3105,15 +3105,28 @@ int stadt_t::orient_city_building(const koord k, const building_desc_t *h, koord
 					roads_ew++;
 				}
 			}
+			extra_offset = h->get_y(1);
+			for (int offset = 0; offset < h->get_x(1); offset++) {
+				gr = welt->lookup_kartenboden(k + koord(offset, extra_offset));
+				if (gr && gr->hat_weg(road_wt)) {
+					street_counter_ew_ns++; // south
+					roads_ew++;
+				}
+				gr = welt->lookup_kartenboden(k + koord(offset,-1));
+				if (gr && gr->hat_weg(road_wt)) {
+					street_counter_ew_ns--; // south
+					roads_ew++;
+				}
+			}
 		}
 
 		sint16 street_counter_ns = 0;
+		sint16 street_counter_ns_ew = 0;
 		sint16 roads_ns = 0;
 		if (fit1) {
-			// 0 or 2 => south or north
 			roads_ns++;
-			sint16 extra_offset = h->get_y(1);
-			for (int offset = -1; offset <= h->get_x(1); offset++) {
+			sint16 extra_offset = h->get_y(0);
+			for (int offset = -1; offset <= h->get_x(0); offset++) {
 				gr = welt->lookup_kartenboden(k + koord(offset, extra_offset));
 				if (gr && gr->hat_weg(road_wt)) {
 					street_counter_ns++; // south
@@ -3125,6 +3138,19 @@ int stadt_t::orient_city_building(const koord k, const building_desc_t *h, koord
 					roads_ns++;
 				}
 			}
+			extra_offset = h->get_x(0);
+			for (int offset = 0; offset < h->get_y(0); offset++) {
+				gr = welt->lookup_kartenboden(k + koord(extra_offset, offset));
+				if (gr && gr->hat_weg(road_wt)) {
+					street_counter_ns_ew++; // south
+					roads_ns++;
+				}
+				gr = welt->lookup_kartenboden(k + koord(-1,offset));
+				if (gr && gr->hat_weg(road_wt)) {
+					street_counter_ns_ew--; // south
+					roads_ns++;
+				}
+			}
 		}
 
 		if (roads_ns > roads_ew) {
@@ -3138,7 +3164,7 @@ int stadt_t::orient_city_building(const koord k, const building_desc_t *h, koord
 		else if (roads_ns < roads_ew) {
 			// more EW roads
 			if (street_counter_ew) {
-				return RC((street_counter_ew > 0 ? 1 : 3) & max_layout);
+				return RC((street_counter_ew > 0 ? 3 : 1) & max_layout);
 			}
 			return RC((simrand(2) * 2 + 1) & max_layout);
 		}
@@ -3485,13 +3511,13 @@ void stadt_t::renovate_city_building(gebaeude_t *gb)
 		}
 	}
 
-	if (h == NULL  ||  exclude_desc.is_contained(h)) {
+	if (h == NULL) {
 		// no matching building found ...
 		return;
 	}
 
 	// only renovate, if there is a change in level
-	if (h->get_level() <= gb_desc->get_level()  &&  h->get_type() == gb_desc->get_type()) {
+	if (h->get_level() < gb_desc->get_level()  &&  h->get_type() == gb_desc->get_type()) {
 		// same level, no reason to replace
 		return;
 	}