mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r19208) -Codechange: fix a gcc warning

release/1.1
yexo 2010-02-22 16:32:50 +00:00
parent b1151645c0
commit beec6fa9e2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/newgrf_airporttiles.cpp
View File

@ -41,7 +41,9 @@ AirportTileOverrideManager _airporttile_mngr(NEW_AIRPORTTILE_OFFSET, NUM_AIRPORT
*/ */
/* static */ const AirportTileSpec *AirportTileSpec::Get(StationGfx gfx) /* static */ const AirportTileSpec *AirportTileSpec::Get(StationGfx gfx)
{ {
assert((size_t)gfx < lengthof(AirportTileSpec::tiles)); /* should be assert(gfx < lengthof(tiles)), but that gives compiler warnings
* since it's always true if the following holds: */
assert_compile(MAX_UVALUE(StationGfx) + 1 == lengthof(tiles));
return &AirportTileSpec::tiles[gfx]; return &AirportTileSpec::tiles[gfx];
} }
@ -88,7 +90,6 @@ void AirportTileOverrideManager::SetEntitySpec(const AirportTileSpec *airpts)
*/ */
StationGfx GetTranslatedAirportTileID(StationGfx gfx) StationGfx GetTranslatedAirportTileID(StationGfx gfx)
{ {
assert((size_t)gfx < NUM_AIRPORTTILES);
const AirportTileSpec *it = AirportTileSpec::Get(gfx); const AirportTileSpec *it = AirportTileSpec::Get(gfx);
return it->grf_prop.override == INVALID_AIRPORTTILE ? gfx : it->grf_prop.override; return it->grf_prop.override == INVALID_AIRPORTTILE ? gfx : it->grf_prop.override;
} }