diff options
| author | pasky <pasky@openttd.org> | 2005-03-08 00:26:30 +0000 |
|---|---|---|
| committer | pasky <pasky@openttd.org> | 2005-03-08 00:26:30 +0000 |
| commit | 99499094a9793224858362b31ce82644193d51a5 (patch) | |
| tree | f7cfb6cb5df317b1657a3179faf1cb2fc4ccc74c | |
| parent | 2002aaead1f9c32bc9bde991d25d9a3d7d2fe0e2 (diff) | |
| download | openttd-99499094a9793224858362b31ce82644193d51a5.tar.xz | |
(svn r1958) GenerateStationName() tidyup.
| -rw-r--r-- | station_cmd.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/station_cmd.c b/station_cmd.c index dd65ba0c8..bfce8d403 100644 --- a/station_cmd.c +++ b/station_cmd.c @@ -304,12 +304,12 @@ static int CountMapSquareAround(uint tile, byte type, byte min, byte max) { static bool GenerateStationName(Station *st, uint tile, int flag) { static const uint32 _gen_station_name_bits[] = { - 0, /* 0 */ - 1 << M(STR_SV_STNAME_AIRPORT), /* 1 */ - 1 << M(STR_SV_STNAME_OILFIELD), /* 2 */ - 1 << M(STR_SV_STNAME_DOCKS), /* 3 */ - 0x1FF << M(STR_SV_STNAME_BUOY_1), /* 4 */ - 1 << M(STR_SV_STNAME_HELIPORT), /* 5 */ + 0, /* 0 */ + 1 << M(STR_SV_STNAME_AIRPORT), /* 1 */ + 1 << M(STR_SV_STNAME_OILFIELD), /* 2 */ + 1 << M(STR_SV_STNAME_DOCKS), /* 3 */ + 0x1FF << M(STR_SV_STNAME_BUOY_1), /* 4 */ + 1 << M(STR_SV_STNAME_HELIPORT), /* 5 */ }; Town *t = st->town; @@ -344,12 +344,12 @@ static bool GenerateStationName(Station *st, uint tile, int flag) if (HASBIT(free_names, M(STR_SV_STNAME_MINES))) { if (CountMapSquareAround(tile, MP_INDUSTRY, 0, 6) >= 2 || CountMapSquareAround(tile, MP_INDUSTRY, 0x64, 0x73) >= 2 || - CountMapSquareAround(tile, MP_INDUSTRY, 0x2F, 0x33) >= 2 || - CountMapSquareAround(tile, MP_INDUSTRY, 0x48, 0x58) >= 2 || - CountMapSquareAround(tile, MP_INDUSTRY, 0x5B, 0x63) >= 2) { - found = M(STR_SV_STNAME_MINES); - goto done; - } + CountMapSquareAround(tile, MP_INDUSTRY, 0x2F, 0x33) >= 2 || + CountMapSquareAround(tile, MP_INDUSTRY, 0x48, 0x58) >= 2 || + CountMapSquareAround(tile, MP_INDUSTRY, 0x5B, 0x63) >= 2) { + found = M(STR_SV_STNAME_MINES); + goto done; + } } /* check close enough to town to get central as name? */ @@ -362,19 +362,19 @@ static bool GenerateStationName(Station *st, uint tile, int flag) } /* Check lakeside */ - if (HASBIT(free_names, M(STR_SV_STNAME_LAKESIDE)) && - DistanceFromEdge(tile) < 20 && - CountMapSquareAround(tile, MP_WATER, 0, 0) >= 5) { - found = M(STR_SV_STNAME_LAKESIDE); - goto done; - } + if (HASBIT(free_names, M(STR_SV_STNAME_LAKESIDE)) + && DistanceFromEdge(tile) < 20 + && CountMapSquareAround(tile, MP_WATER, 0, 0) >= 5) { + found = M(STR_SV_STNAME_LAKESIDE); + goto done; + } /* Check woods */ - if (HASBIT(free_names, M(STR_SV_STNAME_WOODS)) && ( - CountMapSquareAround(tile, MP_TREES, 0, 255) >= 8 || - CountMapSquareAround(tile, MP_INDUSTRY, 0x10, 0x11) >= 2 )) { - found = (_opt.landscape==LT_DESERT) ? M(STR_SV_STNAME_FOREST) : M(STR_SV_STNAME_WOODS); - goto done; + if (HASBIT(free_names, M(STR_SV_STNAME_WOODS)) && + (CountMapSquareAround(tile, MP_TREES, 0, 255) >= 8 || + CountMapSquareAround(tile, MP_INDUSTRY, 0x10, 0x11) >= 2)) { + found = (_opt.landscape==LT_DESERT) ? M(STR_SV_STNAME_FOREST) : M(STR_SV_STNAME_WOODS); + goto done; } /* check elevation compared to town */ |