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

(svn r27186) -Codechange: Rename AlwaysDrawUnpavedRoads() to better reflect what it does.

release/1.5
michi_cc 2015-03-14 14:27:07 +00:00
parent 06d7d63216
commit 67242d2269
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/road_cmd.cpp
View File

@ -1156,16 +1156,15 @@ const byte _road_sloped_sprites[14] = {
}; };
/** /**
* Whether to draw unpaved roads regardless of the town zone. * Should the road be drawn as a unpaved snow/desert road?
* By default, OpenTTD always draws roads as unpaved if they are on a desert * By default, roads are always drawn as unpaved if they are on desert or
* tile or above the snowline. Newgrf files, however, can set a bit that allows * above the snow line, but NewGRFs can override this for desert.
* paved roads to be built on desert tiles as they would be on grassy tiles.
* *
* @param tile The tile the road is on * @param tile The tile the road is on
* @param roadside What sort of road this is * @param roadside What sort of road this is
* @return True if the road should be drawn unpaved regardless of the roadside. * @return True if snow/desert road sprites should be used.
*/ */
static bool AlwaysDrawUnpavedRoads(TileIndex tile, Roadside roadside) static bool DrawRoadAsSnowDesert(TileIndex tile, Roadside roadside)
{ {
return (IsOnSnow(tile) && return (IsOnSnow(tile) &&
!(_settings_game.game_creation.landscape == LT_TROPIC && HasGrfMiscBit(GMB_DESERT_PAVED_ROADS) && !(_settings_game.game_creation.landscape == LT_TROPIC && HasGrfMiscBit(GMB_DESERT_PAVED_ROADS) &&
@ -1245,7 +1244,7 @@ static void DrawRoadBits(TileInfo *ti)
Roadside roadside = GetRoadside(ti->tile); Roadside roadside = GetRoadside(ti->tile);
if (AlwaysDrawUnpavedRoads(ti->tile, roadside)) { if (DrawRoadAsSnowDesert(ti->tile, roadside)) {
image += 19; image += 19;
} else { } else {
switch (roadside) { switch (roadside) {
@ -1328,7 +1327,7 @@ static void DrawTile_Road(TileInfo *ti)
Roadside roadside = GetRoadside(ti->tile); Roadside roadside = GetRoadside(ti->tile);
if (AlwaysDrawUnpavedRoads(ti->tile, roadside)) { if (DrawRoadAsSnowDesert(ti->tile, roadside)) {
road += 19; road += 19;
} else { } else {
switch (roadside) { switch (roadside) {
@ -1354,7 +1353,7 @@ static void DrawTile_Road(TileInfo *ti)
Roadside roadside = GetRoadside(ti->tile); Roadside roadside = GetRoadside(ti->tile);
if (AlwaysDrawUnpavedRoads(ti->tile, roadside)) { if (DrawRoadAsSnowDesert(ti->tile, roadside)) {
image += 8; image += 8;
} else { } else {
switch (roadside) { switch (roadside) {