Fix compiler warnings

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

Author: ceeac

src/simutrans/builder/fabrikbauer.cc

@@ -376,7 +376,6 @@ bool factory_builder_t::check_construction_site(koord pos, koord size, factory_d
 koord3d factory_builder_t::find_random_construction_site(koord pos, int radius, koord size, factory_desc_t::site_t site, const building_desc_t *desc, bool ignore_climates, uint32 max_iterations)
 {
 	bool is_factory = desc->get_type()==building_desc_t::factory;
-	bool wasser = site == factory_desc_t::Water;
 
 	climate_bits climates = !ignore_climates ? desc->get_allowed_climate_bits() : ALL_CLIMATES;
 	if (ignore_climates  &&  site != factory_desc_t::Water) {

src/simutrans/descriptor/building_desc.cc

@@ -157,6 +157,7 @@ void building_desc_t::calc_checksum(checksum_t *chk) const
 		case city_com:
 		case city_ind:
 			if(extra_data) PAKSET_INFO("clusters=","%d",extra_data);
+			// fallthrough
 		case attraction_land:
 		case factory:
 			if(preservation_year_month!=DEFAULT_RETIRE_YEAR*12) {
@@ -186,6 +187,7 @@ void building_desc_t::calc_checksum(checksum_t *chk) const
 			if(enables&2) PAKSET_INFO("enables_post=","1");
 			if(enables&4) PAKSET_INFO("enables_ware=","1");
 			if(allow_underground) PAKSET_INFO("allow_underground=","1");
+			// fallthrough
 		case depot:
 			PAKSET_INFO("waytype=","%s",weg_t::waytype_to_string((waytype_t)extra_data));
 			break;

src/simutrans/simhalt.cc

@@ -307,11 +307,14 @@ void haltestelle_t::recalc_basis_pos()
 	uint64 level_sum;
 	level_sum = 0;
 	bool has_above = false;
+
 	for (tile_t const& i : tiles) {
-		if (has_above = !i.grund->ist_im_tunnel()) {
+		has_above = !i.grund->ist_im_tunnel();
+		if (has_above) {
 			break;
 		}
 	}
+
 	for (tile_t const& i : tiles) {
 		if (has_above && i.grund->ist_im_tunnel()) {
 			// use overground tiles only for center calculation unless its all tunnel
@@ -326,6 +329,7 @@ void haltestelle_t::recalc_basis_pos()
 			level_sum += lv;
 		}
 	}
+
 	koord3d cent;
 	cent = koord3d((sint16)(cent_x / level_sum), (sint16)(cent_y / level_sum), (sint8)(cent_z / level_sum));
 	if (!welt->lookup(cent)) {

src/simutrans/tool/simtool.cc

@@ -8565,8 +8565,8 @@ bool tool_recolour_t::init(player_t *)
 					return false;
 				}
 			}
-			// fallthrough
 		}
+		// fallthrough
 
 		default:
 			dbg->error( "tool_recolour_t::init", "Illegal request for player colour change! (%s)", default_param );

src/simutrans/vehicle/road_vehicle.cc

@@ -331,7 +331,7 @@ bool road_vehicle_t::can_enter_tile(const grund_t *gr, sint32 &restart_speed, ui
 		// first: check roadsigns
 		const roadsign_t* rs = NULL;
 		if(  str->has_sign()  ) {
-			if(rs = gr->find<roadsign_t>(1)) {
+			if((rs = gr->find<roadsign_t>(1)) != NULL) {
 				route_t const& r = *cnv->get_route();
 
 				if(  route_index + 1u < r.get_count()  ) {

src/simutrans/vehicle/simroadtraffic.cc

@@ -496,7 +496,7 @@ bool private_car_t::can_enter_tile(grund_t *gr)
 		if(ribi_t::is_threeway(str->get_ribi_unmasked())) {
 			// but leaving from railroad crossing is more important
 			if (grund_t* gr_current = welt->lookup(get_pos())) {
-				if (crossing_t* cr = gr_current->get_crossing()) {
+				if (gr_current->get_crossing() != NULL) {
 					return true;
 				}
 			}

src/simutrans/world/simcity.cc

@@ -3067,8 +3067,6 @@ int stadt_t::orient_city_building(const koord k, const building_desc_t *h, koord
 	}
 
 	// if we arrive here, we have an asymmetric multitile building
-	int rotation = -1;
-
 	int max_layout = h->get_all_layouts()-1;
 	if (max_layout) {
 
@@ -3219,12 +3217,13 @@ bool stadt_t::check_ground_tile_for_house(grund_t *gr, sint8 zpos) const
 gebaeude_t* stadt_t::build_city_house(koord3d base_pos, const building_desc_t* h, uint8 rotation, uint32 cl, vector_tpl<const building_desc_t *> *exclude_desc)
 {
 	bool recalc_foundations = false;;
-	gebaeude_t* org = NULL;
 
 	koord min_size(0, 0);
 	sint16 level = 1;
 	grund_t* gr = welt->lookup_kartenboden_nocheck(base_pos.get_2d());
-	if (org = gr->find<gebaeude_t>()) {
+	gebaeude_t* org = gr->find<gebaeude_t>();
+
+	if (org) {
 		min_size = org->get_tile()->get_desc()->get_size(org->get_tile()->get_layout());
 		level = org->get_tile()->get_desc()->get_level();
 	}
@@ -3240,6 +3239,7 @@ gebaeude_t* stadt_t::build_city_house(koord3d base_pos, const building_desc_t* h
 					case building_desc_t::city_res: won -= oldgb->get_tile()->get_desc()->get_level() * 10; break;
 					case building_desc_t::city_com: arb -= oldgb->get_tile()->get_desc()->get_level() * 20; break;
 					case building_desc_t::city_ind: arb -= oldgb->get_tile()->get_desc()->get_level() * 20; break;
+					default: assert(false); break;
 				}
 				// exchange building; try to face it to street in front
 				oldgb->mark_images_dirty();
@@ -3268,6 +3268,7 @@ gebaeude_t* stadt_t::build_city_house(koord3d base_pos, const building_desc_t* h
 				case building_desc_t::city_res: won += h->get_level() * 10; break;
 				case building_desc_t::city_com: arb += h->get_level() * 20; break;
 				case building_desc_t::city_ind: arb += h->get_level() * 20; break;
+				default: assert(false); break;
 			}
 		}
 	}
@@ -3302,33 +3303,38 @@ gebaeude_t* stadt_t::build_city_house(koord3d base_pos, const building_desc_t* h
 			grund_t* gr = welt->lookup_kartenboden_nocheck(kpos);
 			gebaeude_t* oldgb = gr->find<gebaeude_t>();
 			const building_desc_t* hr = NULL;
+
 			switch (oldgb->get_tile()->get_desc()->get_type()) {
-			case building_desc_t::city_res:
-				won -= level * 10;
-				hr = hausbauer_t::get_residential(level, welt->get_timeline_year_month(), welt->get_climate(kpos), cl, 1, 1, exclude_desc);
-				won += hr->get_level();
-				break;
-			case building_desc_t::city_com:
-				arb -= level * 20;
-				hr = hausbauer_t::get_commercial(level, welt->get_timeline_year_month(), welt->get_climate(kpos), cl, 1, 1, exclude_desc);
-				arb += hr->get_level() * 20;
-				break;
-			case building_desc_t::city_ind:
-				arb -= level * 20;
-				hr = hausbauer_t::get_industrial(level, welt->get_timeline_year_month(), welt->get_climate(kpos), cl, 1, 1, exclude_desc);
-				arb += hr->get_level() * 20;
-				break;
+				case building_desc_t::city_res:
+					won -= level * 10;
+					hr = hausbauer_t::get_residential(level, welt->get_timeline_year_month(), welt->get_climate(kpos), cl, 1, 1, exclude_desc);
+					won += hr->get_level();
+					break;
+				case building_desc_t::city_com:
+					arb -= level * 20;
+					hr = hausbauer_t::get_commercial(level, welt->get_timeline_year_month(), welt->get_climate(kpos), cl, 1, 1, exclude_desc);
+					arb += hr->get_level() * 20;
+					break;
+				case building_desc_t::city_ind:
+					arb -= level * 20;
+					hr = hausbauer_t::get_industrial(level, welt->get_timeline_year_month(), welt->get_climate(kpos), cl, 1, 1, exclude_desc);
+					arb += hr->get_level() * 20;
+					break;
+
+				default:
+					assert(false);
+					break;
 			}
 			// for now we just remove it to avoid half buildings left
 			exclude_desc->append(hr);
 			oldgb->set_tile(hr->get_tile(0), true);
 			gr->calc_image();
 			update_gebaeude_from_stadt(oldgb);
 			switch (hr->get_type()) {
-			case building_desc_t::city_res: won += hr->get_level() * 10; break;
-			case building_desc_t::city_com: arb += hr->get_level() * 20; break;
-			case building_desc_t::city_ind: arb += hr->get_level() * 20; break;
-			default: break;
+				case building_desc_t::city_res: won += hr->get_level() * 10; break;
+				case building_desc_t::city_com: arb += hr->get_level() * 20; break;
+				case building_desc_t::city_ind: arb += hr->get_level() * 20; break;
+				default: break;
 			}
 		}
 	}
@@ -3447,7 +3453,6 @@ void stadt_t::renovate_city_building(gebaeude_t *gb)
 	}
 
 	const koord3d base_pos = gb->get_pos();
-	const koord min_size = gb_desc->get_size(gb->get_tile()->get_layout());
 
 	// Divide unemployed by 4, because it counts towards commercial and industrial,
 	// and both of those count 'double' for population relative to residential.