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

(svn r22297) -Fix [FS#4580]: the 'freeform edges' setting could be enabled when there were buoys on the northern border (adf88)

release/1.2
smatz 2011-04-07 15:48:13 +00:00
parent d52dbc714a
commit a8862eb77f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/settings.cpp
View File

@ -1071,13 +1071,15 @@ static bool CheckFreeformEdges(int32 p1)
if (p1 != 0) { if (p1 != 0) {
Ship *s; Ship *s;
FOR_ALL_SHIPS(s) { FOR_ALL_SHIPS(s) {
/* Check if there is a ship on the northern border. */
if (TileX(s->tile) == 0 || TileY(s->tile) == 0) { if (TileX(s->tile) == 0 || TileY(s->tile) == 0) {
ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_EMPTY, INVALID_STRING_ID, WL_ERROR); ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_EMPTY, INVALID_STRING_ID, WL_ERROR);
return false; return false;
} }
} }
Station *st; BaseStation *st;
FOR_ALL_STATIONS(st) { FOR_ALL_BASE_STATIONS(st) {
/* Check if there is a buoy on the northern border. */
if (TileX(st->xy) == 0 || TileY(st->xy) == 0) { if (TileX(st->xy) == 0 || TileY(st->xy) == 0) {
ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_EMPTY, INVALID_STRING_ID, WL_ERROR); ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_EMPTY, INVALID_STRING_ID, WL_ERROR);
return false; return false;