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

fallback to default values when loading the game config

Browse source
This commit is contained in:
Gunter Labes 2007-11-28 21:57:01 +00:00
parent 06913aa7c8
commit ceeda7b228
2 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/game_config.cpp
View file

@ -126,28 +126,28 @@ namespace game_config
const config& v = *cfg;
base_income = atoi(v["base_income"].c_str());
village_income = atoi(v["village_income"].c_str());
poison_amount = atoi(v["poison_amount"].c_str());
rest_heal_amount = atoi(v["rest_heal_amount"].c_str());
recall_cost = atoi(v["recall_cost"].c_str());
kill_experience = atoi(v["kill_experience"].c_str());
lobby_refresh = static_cast<unsigned>(atoi(v["lobby_refresh"].c_str()));
base_income = lexical_cast_default<int>(v["base_income"], 2);
village_income = lexical_cast_default<int>(v["village_income"], 1);
poison_amount = lexical_cast_default<int>(v["poison_amount"], 8);
rest_heal_amount = lexical_cast_default<int>(v["rest_heal_amount"], 2);
recall_cost = lexical_cast_default<int>(v["recall_cost"], 20);
kill_experience = lexical_cast_default<int>(v["kill_experience"], 8);
lobby_refresh = lexical_cast_default<unsigned>(v["lobby_refresh"], 2000);
game_icon = v["icon"];
game_title = v["title"];
game_logo = v["logo"];
title_music = v["title_music"];
title_logo_x = atoi(v["logo_x"].c_str());
title_logo_y = atoi(v["logo_y"].c_str());
title_buttons_x = atoi(v["buttons_x"].c_str());
title_buttons_y = atoi(v["buttons_y"].c_str());
title_buttons_padding = atoi(v["buttons_padding"].c_str());
title_logo_x = lexical_cast_default<int>(v["logo_x"]);
title_logo_y = lexical_cast_default<int>(v["logo_y"]);
title_buttons_x = lexical_cast_default<int>(v["buttons_x"]);
title_buttons_y = lexical_cast_default<int>(v["buttons_y"]);
title_buttons_padding = lexical_cast_default<int>(v["buttons_padding"]);
title_tip_x = atoi(v["tip_x"].c_str());
title_tip_width = atoi(v["tip_width"].c_str());
title_tip_padding = atoi(v["tip_padding"].c_str());
title_tip_x = lexical_cast_default<int>(v["tip_x"]);
title_tip_width = lexical_cast_default<int>(v["tip_width"]);
title_tip_padding = lexical_cast_default<int>(v["tip_padding"]);
energy_image = v["energy_image"];
@ -327,4 +327,4 @@ bool operator!=(const struct game_version& a, const struct game_version& b)
return a.full != b.full;
}
}
} // game_config

17
src/game_config.hpp
View file

@ -51,17 +51,18 @@ namespace game_config
struct server_info {
server_info() : name(""), address("") { }
std::string name;
std::string address; //may include ':' followed by port number
std::string address; //!< may include ':' followed by port number
};
extern std::vector<server_info> server_list;
extern std::string game_icon, game_title, game_logo, title_music,
moved_ball_image, unmoved_ball_image, partmoved_ball_image,
enemy_ball_image, ally_ball_image, energy_image,
flag_image, flag_icon_image, cross_image,
terrain_mask_image, grid_image, unreachable_image, linger_image,
observer_image, tod_bright_image,
checked_menu_image, unchecked_menu_image, wml_menu_image, level_image, ellipsis_image, tome_title;
moved_ball_image, unmoved_ball_image, partmoved_ball_image,
enemy_ball_image, ally_ball_image, energy_image,
flag_image, flag_icon_image, cross_image,
terrain_mask_image, grid_image, unreachable_image, linger_image,
observer_image, tod_bright_image,
checked_menu_image, unchecked_menu_image, wml_menu_image, level_image,
ellipsis_image, tome_title;
extern std::string flag_rgb;
extern std::vector<Uint32> defense_color_scale;
@ -74,7 +75,7 @@ namespace game_config
extern std::map<std::string, t_string> team_rgb_name;
extern std::map<std::string, std::vector<Uint32> > team_rgb_colors;
// observer team name used for observer team chat
//! observer team name used for observer team chat
extern const std::string observer_team_name;
namespace sounds {