cpp/openttd-patchpack/source Changeset - r14616:85f59b4f8898

Changeset - r14616:85f59b4f8898

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

smatz - 14 years ago 2010-02-22 16:02:37
smatz@openttd.org

(svn r19203) -Codechange: silence some gcc warnings

2 files changed with 2 insertions and 5 deletions:

src/newgrf_airporttiles.cpp

src/water_cmd.cpp

0 comments (0 inline, 0 general)

src/newgrf_airporttiles.cpp

➞

Show inline comments

@@ @@ -38,13 +38,13 @@ AirportTileOverrideManager _airporttile_ @@
  * Retrieve airport tile spec for the given airport tile
  * @param gfx index of airport tile
  * @return A pointer to the corresponding AirportTileSpec
  */
 /* static */ const AirportTileSpec *AirportTileSpec::Get(StationGfx gfx)
+{
 	assert(gfx < lengthof(AirportTileSpec::tiles));
+	assert((size_t)gfx < lengthof(AirportTileSpec::tiles));
 	return &AirportTileSpec::tiles[gfx];
+}
 /**
  * This function initializes the tile array of AirportTileSpec
  */
@@ @@ -85,13 +85,13 @@ void AirportTileOverrideManager::SetEnti @@
  * Do airporttile gfx ID translation for NewGRFs.
  * @param gfx the type to get the override for.
  * @return the gfx to actually work with.
  */
 StationGfx GetTranslatedAirportTileID(StationGfx gfx)
+{
 	assert(gfx < NUM_AIRPORTTILES);
+	assert((size_t)gfx < NUM_AIRPORTTILES);
 	const AirportTileSpec *it = AirportTileSpec::Get(gfx);
 	return it->grf_prop.override == INVALID_AIRPORTTILE ? gfx : it->grf_prop.override;
+}
 static const SpriteGroup *AirportTileResolveReal(const ResolverObject *object, const RealSpriteGroup *group)
@@ @@ -397,13 +397,11 @@ void AirportTileAnimationTrigger(Station @@
+}
 void AirportAnimationTrigger(Station *st, AirpAnimationTrigger trigger, CargoID cargo_type)
+{
 	if (st->airport.tile == INVALID_TILE) return;
 	const AirportSpec *as = st->GetAirportSpec();
 	TILE_AREA_LOOP(tile, st->airport) {
 		if (st->TileBelongsToAirport(tile)) AirportTileAnimationTrigger(st, tile, trigger, cargo_type);
+	}
+}

src/water_cmd.cpp

➞

Show inline comments

@@ @@ -723,13 +723,12 @@ static Vehicle *FloodVehicleProc(Vehicle @@
 static void FloodVehicles(TileIndex tile)
+{
 	byte z = 0;
 	if (IsAirportTile(tile)) {
 		const Station *st = Station::GetByTile(tile);
 		const AirportSpec *as = st->GetAirportSpec();
 		z = 1 + st->Airport()->delta_z;
 		TILE_AREA_LOOP(tile, st->airport) {
 			if (st->TileBelongsToAirport(tile)) FindVehicleOnPos(tile, &z, &FloodVehicleProc);
+		}
 		/* No vehicle could be flooded on this airport anymore */

0 comments (0 inline, 0 general)