diff options
author | smatz <smatz@openttd.org> | 2010-02-24 14:46:15 +0000 |
---|---|---|
committer | smatz <smatz@openttd.org> | 2010-02-24 14:46:15 +0000 |
commit | f051066bc451479a0c2ff44e2554941628a62f6a (patch) | |
tree | 239197109c12b15a24e9ae8ab70a7549e34d4a8b /src/settings.cpp | |
parent | c1e2bc90cd3751dfa316519cfe2f558aa2697b2c (diff) | |
download | openttd-f051066bc451479a0c2ff44e2554941628a62f6a.tar.xz |
(svn r19224) -Codechange: change parameters passed to ShowErrorMessage() a bit
Diffstat (limited to 'src/settings.cpp')
-rw-r--r-- | src/settings.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/settings.cpp b/src/settings.cpp index 9c9dd1f37..901860848 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -857,7 +857,7 @@ static bool DifficultyChange(int32) { if (_game_mode == GM_MENU) { if (_settings_newgame.difficulty.diff_level != 3) { - ShowErrorMessage(STR_WARNING_DIFFICULTY_TO_CUSTOM, INVALID_STRING_ID, 0, 0); + ShowErrorMessage(STR_WARNING_DIFFICULTY_TO_CUSTOM, INVALID_STRING_ID, WL_WARNING); _settings_newgame.difficulty.diff_level = 3; } SetWindowClassesDirty(WC_SELECT_GAME); @@ -870,7 +870,7 @@ static bool DifficultyChange(int32) AI::GetInfoList()->size() == 0 && #endif /* ENABLE_AI */ (!_networking || _network_server)) { - ShowErrorMessage(STR_WARNING_NO_SUITABLE_AI, INVALID_STRING_ID, 0, 0, true); + ShowErrorMessage(STR_WARNING_NO_SUITABLE_AI, INVALID_STRING_ID, WL_CRITICAL); } /* If we are a network-client, update the difficult setting (if it is open). @@ -925,14 +925,14 @@ static bool CheckFreeformEdges(int32 p1) Ship *s; FOR_ALL_SHIPS(s) { if (TileX(s->tile) == 0 || TileY(s->tile) == 0) { - ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_EMPTY, INVALID_STRING_ID, 0, 0); + ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_EMPTY, INVALID_STRING_ID, WL_ERROR); return false; } } Station *st; FOR_ALL_STATIONS(st) { if (TileX(st->xy) == 0 || TileY(st->xy) == 0) { - ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_EMPTY, INVALID_STRING_ID, 0, 0); + ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_EMPTY, INVALID_STRING_ID, WL_ERROR); return false; } } @@ -941,25 +941,25 @@ static bool CheckFreeformEdges(int32 p1) } else { for (uint i = 0; i < MapMaxX(); i++) { if (TileHeight(TileXY(i, 1)) != 0) { - ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_WATER, INVALID_STRING_ID, 0, 0); + ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_WATER, INVALID_STRING_ID, WL_ERROR); return false; } } for (uint i = 1; i < MapMaxX(); i++) { if (!IsTileType(TileXY(i, MapMaxY() - 1), MP_WATER) || TileHeight(TileXY(1, MapMaxY())) != 0) { - ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_WATER, INVALID_STRING_ID, 0, 0); + ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_WATER, INVALID_STRING_ID, WL_ERROR); return false; } } for (uint i = 0; i < MapMaxY(); i++) { if (TileHeight(TileXY(1, i)) != 0) { - ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_WATER, INVALID_STRING_ID, 0, 0); + ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_WATER, INVALID_STRING_ID, WL_ERROR); return false; } } for (uint i = 1; i < MapMaxY(); i++) { if (!IsTileType(TileXY(MapMaxX() - 1, i), MP_WATER) || TileHeight(TileXY(MapMaxX(), i)) != 0) { - ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_WATER, INVALID_STRING_ID, 0, 0); + ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_WATER, INVALID_STRING_ID, WL_ERROR); return false; } } @@ -988,7 +988,7 @@ static bool ChangeDynamicEngines(int32 p1) const Vehicle *v; FOR_ALL_VEHICLES(v) { if (IsCompanyBuildableVehicleType(v)) { - ShowErrorMessage(STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES, INVALID_STRING_ID, 0, 0); + ShowErrorMessage(STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES, INVALID_STRING_ID, WL_ERROR); return false; } } |