0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added some more deprecated messages,

Browse source 
...also avoid the message to be shown on the startup map. It contained
a single 1 which is deemed the old format due to the fact it contains
no comma. Now it's an empty map and avoid to show the message on an
empty map.
This commit is contained in:
Mark de Wever 2007-03-11 16:25:03 +00:00
parent cc898dcea1
commit d369bfa867
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game.cpp
View file

@ -269,7 +269,7 @@ display& game_controller::disp()
static unit_map dummy_umap;
static config dummy_cfg;
static gamemap dummy_map(dummy_cfg, "1");
static gamemap dummy_map(dummy_cfg, "");
static gamestatus dummy_status(dummy_cfg, 0);
static std::vector<team> dummy_teams;
disp_.assign(new display(dummy_umap, video_, dummy_map, dummy_status,

2
src/map.cpp
View file

@ -532,7 +532,7 @@ bool gamemap::terrain_matches_filter(const gamemap::location& loc, const config&
*/
#ifdef TERRAIN_TRANSLATION_COMPATIBLE
if(terrain_format == 0 || terrain_format == -1 && !cfg["terrain"].empty()) {
std::cerr << "Warning deprecated terrain format in filter_location \n";
lg::wml_error << "Warning deprecated terrain format in filter_location, support will be removed in version 1.3.3\n";
const std::string& terrain = cfg["terrain"];
// Any of these may be a CSV
std::string terrain_letter;

11
src/terrain_translation.cpp
View file

@ -270,14 +270,20 @@ std::string write_list(const t_list& list)
t_map read_game_map(const std::string& str, std::map<int, coordinate>& starting_positions)
{
t_map result;
#ifdef TERRAIN_TRANSLATION_COMPATIBLE
// the test here is too avoid deprecated warning
if(str.empty()) {
return result;
}
// process the data, polls for the format. NOTE we test for a comma
// so an empty map or a map with 1 letter is doomed to be the old
// format. Shouldn't hurt
if(str.find(',') == std::string::npos) {
//old format
ERR_G << "Using the single letter map format is deprecated\n";
lg::wml_error << "Using the single letter map format is deprecated, support will be removed in version 1.3.3\n";
map_format_ = 1;
return read_game_map_old_(str, starting_positions);
}
@ -289,7 +295,6 @@ t_map read_game_map(const std::string& str, std::map<int, coordinate>& starting_
size_t offset = 0;
size_t x = 0, y = 0, width = 0;
t_map result;
// skip the leading newlines
while(offset < str.length() && utils::isnewline(str[offset])) {
@ -976,7 +981,7 @@ t_letter string_to_number_(std::string str, int& start_position)
#ifndef TERRAIN_TRANSLATION_COMPATIBLE
if(result == OBSOLETE_KEEP) {
ERR_G << "Using _K for a keep is deprecated, support will be removed shortly\n";
lg::wml_error << "Using _K for a keep is deprecated, support will be removed in version 1.3.5\n";
result = HUMAN_KEEP;
}
#endif