diff options
| author | alberth <alberth@openttd.org> | 2009-10-31 19:46:51 +0000 |
|---|---|---|
| committer | alberth <alberth@openttd.org> | 2009-10-31 19:46:51 +0000 |
| commit | 44aacfc59f06106acc492dda7b514db5c7f082ca (patch) | |
| tree | c1502b47e5712f3dbe7b0542e88312bec676751e /src/settings.cpp | |
| parent | 4ce1f5f0a0af73f618a1116b9e4cc25035caead5 (diff) | |
| download | openttd-44aacfc59f06106acc492dda7b514db5c7f082ca.tar.xz | |
(svn r17928) -Codechange: ShowErrorMessage() now takes the summary string before the details string.
Gentlemen, swap your string parameters.
Diffstat (limited to 'src/settings.cpp')
| -rw-r--r-- | src/settings.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/settings.cpp b/src/settings.cpp index 9dfac0e32..25f95645c 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -813,7 +813,7 @@ static bool DifficultyChange(int32) { if (_game_mode == GM_MENU) { if (_settings_newgame.difficulty.diff_level != 3) { - ShowErrorMessage(INVALID_STRING_ID, STR_WARNING_DIFFICULTY_TO_CUSTOM, 0, 0); + ShowErrorMessage(STR_WARNING_DIFFICULTY_TO_CUSTOM, INVALID_STRING_ID, 0, 0); _settings_newgame.difficulty.diff_level = 3; } SetWindowClassesDirty(WC_SELECT_GAME); @@ -888,14 +888,14 @@ static bool CheckFreeformEdges(int32 p1) Ship *s; FOR_ALL_SHIPS(s) { if (TileX(s->tile) == 0 || TileY(s->tile) == 0) { - ShowErrorMessage(INVALID_STRING_ID, STR_CONFIG_SETTING_EDGES_NOT_EMPTY, 0, 0); + ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_EMPTY, INVALID_STRING_ID, 0, 0); return false; } } Station *st; FOR_ALL_STATIONS(st) { if (TileX(st->xy) == 0 || TileY(st->xy) == 0) { - ShowErrorMessage(INVALID_STRING_ID, STR_CONFIG_SETTING_EDGES_NOT_EMPTY, 0, 0); + ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_EMPTY, INVALID_STRING_ID, 0, 0); return false; } } @@ -904,25 +904,25 @@ static bool CheckFreeformEdges(int32 p1) } else { for (uint i = 0; i < MapMaxX(); i++) { if (TileHeight(TileXY(i, 1)) != 0) { - ShowErrorMessage(INVALID_STRING_ID, STR_CONFIG_SETTING_EDGES_NOT_WATER, 0, 0); + ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_WATER, INVALID_STRING_ID, 0, 0); return false; } } for (uint i = 1; i < MapMaxX(); i++) { if (!IsTileType(TileXY(i, MapMaxY() - 1), MP_WATER) || TileHeight(TileXY(1, MapMaxY())) != 0) { - ShowErrorMessage(INVALID_STRING_ID, STR_CONFIG_SETTING_EDGES_NOT_WATER, 0, 0); + ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_WATER, INVALID_STRING_ID, 0, 0); return false; } } for (uint i = 0; i < MapMaxY(); i++) { if (TileHeight(TileXY(1, i)) != 0) { - ShowErrorMessage(INVALID_STRING_ID, STR_CONFIG_SETTING_EDGES_NOT_WATER, 0, 0); + ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_WATER, INVALID_STRING_ID, 0, 0); return false; } } for (uint i = 1; i < MapMaxY(); i++) { if (!IsTileType(TileXY(MapMaxX() - 1, i), MP_WATER) || TileHeight(TileXY(MapMaxX(), i)) != 0) { - ShowErrorMessage(INVALID_STRING_ID, STR_CONFIG_SETTING_EDGES_NOT_WATER, 0, 0); + ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_WATER, INVALID_STRING_ID, 0, 0); return false; } } @@ -951,7 +951,7 @@ static bool ChangeDynamicEngines(int32 p1) const Vehicle *v; FOR_ALL_VEHICLES(v) { if (IsCompanyBuildableVehicleType(v)) { - ShowErrorMessage(INVALID_STRING_ID, STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES, 0, 0); + ShowErrorMessage(STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES, INVALID_STRING_ID, 0, 0); return false; } } |