openttd-mini: comparison town

equal deleted inserted replaced

-:0811adaec525
+:eeaefdabfdfd
 		/* Else draw regular ground */
 		DrawGroundSprite(dcts->sprite_1);
 	}
 	/* Add a house on top of the ground? */
-	if ((image = dcts->sprite_2) != 0) {
+	image = dcts->sprite_2;
-		if (_display_opt & DO_TRANS_BUILDINGS)
+	if (image != 0) {
-			MAKE_TRANSPARENT(image);
+		if (_display_opt & DO_TRANS_BUILDINGS) MAKE_TRANSPARENT(image);
 		AddSortableSpriteToDraw(image,
 			ti->x + dcts->subtile_x,
 			ti->y + dcts->subtile_y,
 			dcts->width + 1,
 			dcts->height + 1,
 			dcts->dz,
 			z);
-		if (_display_opt & DO_TRANS_BUILDINGS)
+		if (_display_opt & DO_TRANS_BUILDINGS) return;
-			return;
 	}
 	{
-		int proc;
+		int proc = dcts->proc - 1;
-		if ((proc=dcts->proc-1) >= 0 )
-			_town_draw_tile_procs[proc](ti);
+		if (proc >= 0) _town_draw_tile_procs[proc](ti);
 	}
 }
 static uint GetSlopeZ_Town(const TileInfo* ti)
 {
 }
 static void AnimateTile_Town(TileIndex tile)
 {
 	int old;
-	int i;
 	int a,b;
-	if (_tick_counter & 3)
+	if (_tick_counter & 3) return;
-		return;
 	// If the house is not one with a lift anymore, then stop this animating.
 	// Not exactly sure when this happens, but probably when a house changes.
 	// Before this was just a return...so it'd leak animated tiles..
 	// That bug seems to have been here since day 1??
 		DeleteAnimatedTile(tile);
 		return;
 	}
 	if (!((old = _m[tile].m1) & 0x80)) {
+		int i;
 		_m[tile].m1 |= 0x80;
 		do {
-			i = (Random()&7) - 1;
+			i = (Random() & 7) - 1;
-		} while (i < 0 || i == 1 || i*6==old);
+		} while (i < 0 || i == 1 || i * 6 == old);
 		SB(_m[tile].m5, 0, 6, i);
 	}
 	a = GB(_m[tile].m1, 0, 7);
 static bool IsCloseToTown(TileIndex tile, uint dist)
 {
 	const Town* t;
 	FOR_ALL_TOWNS(t) {
-		if (t->xy != 0 && DistanceManhattan(tile, t->xy) < dist)
+		if (t->xy != 0 && DistanceManhattan(tile, t->xy) < dist) return true;
-			return true;
 	}
 	return false;
 }
 static void MarkTownSignDirty(Town *t)
 {
 	uint32 pop;
 	const Town* t;
 	pop = 0;
-	FOR_ALL_TOWNS(t) {
+	FOR_ALL_TOWNS(t) pop += t->population;
-			pop += t->population;
-	}
 	return pop;
 }
 static void MakeSingleHouseBigger(TileIndex tile)
 {
 	AB(_m[tile].m5, 0, 3, 1);
 	if (GB(_m[tile].m5, 0, 3) != 0) return;
 	_m[tile].m3 = _m[tile].m3 + 0x40;
-	if ( (_m[tile].m3 & 0xC0) == 0xC0) {
+	if ((_m[tile].m3 & 0xC0) == 0xC0) {
 		ChangePopulation(GetTown(_m[tile].m2), _housetype_population[_m[tile].m4]);
 	}
 	MarkTileDirtyByTile(tile);
 }
 	}
 	house = _m[tile].m4;
 	if (_housetype_extra_flags[house] & 0x20 &&
 			!(_m[tile].m5 & 0x80) &&
-			CHANCE16(1,2) &&
+			CHANCE16(1, 2) &&
 			AddAnimatedTile(tile)) {
-		_m[tile].m5 = (_m[tile].m5 & 0x40)|0x80;
+		_m[tile].m5 = (_m[tile].m5 & 0x40) | 0x80;
 	}
 	t = GetTown(_m[tile].m2);
 	r = Random();
 		t->new_max_mail += amt;
 		moved = MoveGoodsToStation(tile, 1, 1, CT_MAIL, amt);
 		t->new_act_mail += moved;
 	}
-	if (_house_more_flags[house]&8 && (t->flags12&1) && --t->time_until_rebuild == 0) {
+	if (_house_more_flags[house] & 8 && (t->flags12 & 1) && --t->time_until_rebuild == 0) {
 		t->time_until_rebuild = GB(r, 16, 6) + 130;
 		_current_player = OWNER_TOWN;
 		ClearTownHouse(t, tile);
 	return cost;
 }
 static void GetAcceptedCargo_Town(TileIndex tile, AcceptedCargo ac)
 {
-	int type = _m[tile].m4;
+	byte type = _m[tile].m4;
 	ac[CT_PASSENGERS] = _housetype_cargo_passengers[type];
-	ac[CT_MAIL] = _housetype_cargo_mail[type];
+	ac[CT_MAIL]       = _housetype_cargo_mail[type];
-	ac[CT_GOODS] = _housetype_cargo_goods[type];
+	ac[CT_GOODS]      = _housetype_cargo_goods[type];
-	ac[CT_FOOD] = _housetype_cargo_food[type];
+	ac[CT_FOOD]       = _housetype_cargo_food[type];
 }
 static void GetTileDesc_Town(TileIndex tile, TileDesc *td)
 {
 	td->str = _town_tile_names[_m[tile].m4];
 	UpdateTownRadius(t);
 }
 void OnTick_Town(void)
 {
-	if (_game_mode == GM_EDITOR)
+	if (_game_mode == GM_EDITOR) return;
-		return;
 	/* Make sure each town's tickhandler invocation frequency is about the
 	 * same - TOWN_GROWTH_FREQUENCY - independent on the number of towns. */
 	for (_cur_town_iter += GetTownPoolSize();
 	     _cur_town_iter >= TOWN_GROWTH_FREQUENCY;
 		if (++_cur_town_ctr >= GetTownPoolSize())
 			_cur_town_ctr = 0;
 		t = GetTown(i);
-		if (t->xy != 0)
+		if (t->xy != 0) TownTickHandler(t);
-			TownTickHandler(t);
 	}
 }
 static byte GetTownRoadMask(TileIndex tile)
 {
 	byte b = GetRoadBitsByTile(tile);
-	byte r=0;
+	byte r = 0;
-	if (b&1) r|=10;
-	if (b&2) r|=5;
+	if (b & 0x01) r |= 10;
-	if (b&4) r|=9;
+	if (b & 0x02) r |=  5;
-	if (b&8) r|=6;
+	if (b & 0x04) r |=  9;
-	if (b&16) r|=3;
+	if (b & 0x08) r |=  6;
-	if (b&32) r|=12;
+	if (b & 0x10) r |=  3;
+	if (b & 0x20) r |= 12;
 	return r;
 }
 static bool IsRoadAllowedHere(TileIndex tile, int dir)
 {
 	// If this assertion fails, it might be because the world contains
 	//  land at the edges. This is not ok.
 	TILE_ASSERT(tile);
-	for(;;) {
+	for (;;) {
 		// Check if there already is a road at this point?
 		if (GetRoadBitsByTile(tile) == 0) {
 			// No, try to build one in the direction.
 			// if that fails clear the land, and if that fails exit.
 			// This is to make sure that we can build a road here later.
 		// If the tile is not a slope in the right direction, then
 		// maybe terraform some.
 		if ((k = (dir&1)?0xC:0x9) != slope && (k^0xF) != slope) {
 			uint32 r = Random();
-			if (CHANCE16I(1,8, r) && !_generating_world) {
+			if (CHANCE16I(1, 8, r) && !_generating_world) {
 				int32 res;
-				if (CHANCE16I(1,16,r))
+				if (CHANCE16I(1, 16, r)) {
 					res = DoCommandByTile(tile, slope, 0, DC_EXEC | DC_AUTO | DC_NO_WATER,
 					                      CMD_TERRAFORM_LAND);
-				else
+				} else {
 					res = DoCommandByTile(tile, slope^0xF, 1, DC_EXEC | DC_AUTO | DC_NO_WATER,
 					                      CMD_TERRAFORM_LAND);
+				}
 				if (res == CMD_ERROR && CHANCE16I(1,3,r))
 					// We can consider building on the slope, though.
 					goto no_slope;
 			}
 			return false;
 		}
-		/* Can somebody explain for what this is needed? :s */
-		// tile = TILE_ADD(tile, _roadblock_tileadd[dir]);
 		return true;
 	}
 }
 static bool TerraformTownTile(TileIndex tile, int edges, int dir)
 	TILE_ASSERT(tile);
 	// Don't terraform if land is plain or if there's a house there.
 	FindLandscapeHeightByTile(&ti, tile);
-	if (ti.tileh == 0 || ti.type == MP_HOUSE)
+	if (ti.tileh == 0 || ti.type == MP_HOUSE) return;
-		return;
 	// First try up, then down
 	if (!TerraformTownTile(tile, ~ti.tileh & 0xF, 1)) {
 		TerraformTownTile(tile, ti.tileh & 0xF, 0);
 	}
 		// Remove hills etc
 		LevelTownLand(tile);
 		// Is a road allowed here?
-		if (!IsRoadAllowedHere(tile, block))
+		if (!IsRoadAllowedHere(tile, block)) return;
-			return;
 		// Randomize new road block numbers
 		a = block;
 		b = block ^ 2;
 		if (CHANCE16(1, 4)) {
 		}
 		if (!IsRoadAllowedHere(TILE_ADD(tile, ToTileIndexDiff(_roadblock_tileadd[a])), a)) {
 			// A road is not allowed to continue the randomized road,
 			//   return if the road we're trying to build is curved.
-			if ( a != (b^2))
+			if (a != (b ^ 2)) return;
-				return;
 			// Return if neither side of the new road is a house
 			if (!IsTileType(TILE_ADD(tile, ToTileIndexDiff(_roadblock_tileadd[a + 1])), MP_HOUSE) &&
 					!IsTileType(TILE_ADD(tile, ToTileIndexDiff(_roadblock_tileadd[a + 3])), MP_HOUSE))
 				return;
 	} else if (block < 5 && !HASBIT(mask,block^2)) {
 		// Continue building on a partial road.
 		// Always OK.
 		_grow_town_result = 0;
-		rcmd = 1 << (block^2);
+		rcmd = 1 << (block ^ 2);
 	} else {
 		// Reached a tunnel? Then continue at the other side of it.
 		if (IsTileType(tile, MP_TUNNELBRIDGE) && (_m[tile].m5& ~3) == 4) {
 			FindLengthOfTunnelResult flotr = FindLengthOfTunnel(tile, GB(_m[tile].m5, 0, 2));
 			*tile_ptr = flotr.tile;
 			return;
 		}
 		// For any other kind of tunnel/bridge, bail out.
-		if (IsTileType(tile, MP_TUNNELBRIDGE))
+		if (IsTileType(tile, MP_TUNNELBRIDGE)) return;
-			return;
 		// Possibly extend the road in a direction.
 		// Randomize a direction and if it has a road, bail out.
 		i = GB(Random(), 0, 2);
-		if (HASBIT(mask, i))
+		if (HASBIT(mask, i)) return;
-			return;
 		// This is the tile we will reach if we extend to this direction.
 		tmptile = TILE_ADD(tile, ToTileIndexDiff(_roadblock_tileadd[i]));
 		// Don't do it if it reaches to water.
-		if (IS_WATER_TILE(tmptile))
+		if (IS_WATER_TILE(tmptile)) return;
-			return;
 		// Build a house at the edge. 60% chance or
 		//  always ok if no road allowed.
-		if (!IsRoadAllowedHere(tmptile, i) || CHANCE16(6,10)) {
+		if (!IsRoadAllowedHere(tmptile, i) || CHANCE16(6, 10)) {
 			// But not if there already is a house there.
 			if (!IsTileType(tmptile, MP_HOUSE)) {
 				// Level the land if possible
 				LevelTownLand(tmptile);
 				// And build a house.
 				// Set result to -1 if we managed to build it.
-				if (BuildTownHouse(t1, tmptile))
+				if (BuildTownHouse(t1, tmptile)) _grow_town_result = -1;
-					_grow_town_result = -1;
 			}
 			return;
 		}
 		_grow_town_result = 0;
 	}
 	FindLandscapeHeightByTile(&ti, tile);
 	// Return if a water tile
-	if (ti.type == MP_WATER && ti.map5==0)
+	if (ti.type == MP_WATER && ti.map5 == 0) return;
-		return;
 	// Determine direction of slope,
 	//  and build a road if not a special slope.
 	if ((i=0,ti.tileh != 3) &&
 			(i++,ti.tileh != 9) &&
 	tile = t->xy;
 	for (ptr = _town_coord_mod; ptr != endof(_town_coord_mod); ++ptr) {
 		FindLandscapeHeightByTile(&ti, tile);
 		// Only work with plain land that not already has a house with map5=0
-		if (ti.tileh == 0 && !(ti.type==MP_HOUSE && ti.map5==0)) {
+		if (ti.tileh == 0 && (ti.type != MP_HOUSE || ti.map5 != 0)) {
 			if (DoCommandByTile(tile, 0, 0, DC_AUTO, CMD_LANDSCAPE_CLEAR) != CMD_ERROR) {
 				DoCommandByTile(tile, GenRandomRoadBits(), t->index, DC_EXEC | DC_AUTO, CMD_BUILD_ROAD);
 				_current_player = old_player;
 				return true;
 			}
 		SetDParam(0, r);
 		GetString(buf1, townnametype);
 		// Check size and width
-		if (strlen(buf1) >= 31 || GetStringWidth(buf1) > 130)
+		if (strlen(buf1) >= 31 || GetStringWidth(buf1) > 130) continue;
-			continue;
 		FOR_ALL_TOWNS(t2) {
 			if (t2->xy != 0) {
 				// We can't just compare the numbers since
 				// several numbers may map to a single name.
 				SetDParam(0, t2->index);
 				GetString(buf2, STR_TOWN);
 				if (strcmp(buf1, buf2) == 0) {
-					if (tries-- < 0)
+					if (tries-- < 0) return false;
-						return false;
 					goto restart;
 				}
 			}
 		}
 		*townnameparts = r;
 	TileInfo ti;
 	PlayerID old;
 	int32 r;
 	FindLandscapeHeightByTile(&ti, tile);
-	if (ti.tileh != 0)
+	if (ti.tileh != 0) return false;
-		return false;
 	if (ti.type != MP_HOUSE && ti.type != MP_CLEAR && ti.type != MP_TREES)
 		return false;
 	const TileIndexDiffC *p;
 	SETBIT(t->statues, _current_player);
 	for (p = _statue_tiles; p != endof(_statue_tiles); ++p) {
-		if (DoBuildStatueOfCompany(tile))
+		if (DoBuildStatueOfCompany(tile)) return;
-			return;
 		tile = TILE_ADD(tile, ToTileIndexDiff(*p));
 	}
 }
 static void TownActionFundBuildings(Town *t, int action)
 void ChangeTownRating(Town *t, int add, int max)
 {
 	int rating;
 	//	if magic_bulldozer cheat is active, town doesn't penaltize for removing stuff
-	if (t == NULL || _current_player >= MAX_PLAYERS || (_cheats.magic_bulldozer.value && add < 0)	)
+	if (t == NULL ||
+			_current_player >= MAX_PLAYERS ||
+			(_cheats.magic_bulldozer.value && add < 0)) {
 		return;
+	}
 	SETBIT(t->have_ratings, _current_player);
 	rating = t->ratings[_current_player];

changeset 2639	eeaefdabfdfd
parent 2637	722dae65c4a8
child 2646	c01dfbc7b7e3