upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-20 16:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned string to number conversions in replay.cpp to use lexical_cast_default

Browse Source
This commit is contained in:
Pauli Nieminen 2008-01-25 16:23:30 +00:00
parent 9cbbca0e18
commit ef76f66a58
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/playturn.cpp
View File

@ -75,7 +75,7 @@ turn_info::PROCESS_DATA_RESULT turn_info::process_network_data(const config& cfg
{ {
if (cfg.child("message")) { if (cfg.child("message")) {
const config& cmessage = *cfg.child("message"); const config& cmessage = *cfg.child("message");
const int side = lexical_cast_default<int>(cmessage["side"].c_str(),0); const int side = lexical_cast_default<int>(cmessage["side"],0);
gui_.add_chat_message(time(NULL), cmessage["sender"], side, gui_.add_chat_message(time(NULL), cmessage["sender"], side,
cmessage["message"], game_display::MESSAGE_PUBLIC, cmessage["message"], game_display::MESSAGE_PUBLIC,
preferences::message_bell()); preferences::message_bell());

14
src/replay.cpp
View File

@ -61,7 +61,7 @@ static void verify(const unit_map& units, const config& cfg) {
std::stringstream errbuf; std::stringstream errbuf;
LOG_REPLAY << "verifying unit structure...\n"; LOG_REPLAY << "verifying unit structure...\n";
const size_t nunits = atoi(cfg["num_units"].c_str()); const size_t nunits = lexical_cast_default<size_t>(cfg["num_units"]);
if(nunits != units.size()) { if(nunits != units.size()) {
errbuf << "SYNC VERIFICATION FAILED: number of units from data source differ: " errbuf << "SYNC VERIFICATION FAILED: number of units from data source differ: "
<< nunits << " according to data source. " << units.size() << " locally\n"; << nunits << " according to data source. " << units.size() << " locally\n";
@ -813,7 +813,7 @@ bool do_replay_handle(game_display& disp, const gamemap& map, const game_data& g
//if (!preferences::show_lobby_join(speaker_name, message)) return; //if (!preferences::show_lobby_join(speaker_name, message)) return;
bool is_whisper = (speaker_name.find("whisper: ") == 0); bool is_whisper = (speaker_name.find("whisper: ") == 0);
if (!get_replay_source().is_skipping() || is_whisper) { if (!get_replay_source().is_skipping() || is_whisper) {
const int side = lexical_cast_default<int>((*child)["side"].c_str(),0); const int side = lexical_cast_default<int>((*child)["side"],0);
disp.add_chat_message(time(NULL), speaker_name, side, message, disp.add_chat_message(time(NULL), speaker_name, side, message,
(team_name == "" ? game_display::MESSAGE_PUBLIC (team_name == "" ? game_display::MESSAGE_PUBLIC
: game_display::MESSAGE_PRIVATE), : game_display::MESSAGE_PRIVATE),
@ -869,7 +869,7 @@ bool do_replay_handle(game_display& disp, const gamemap& map, const game_data& g
else if((child = cfg->child("recruit")) != NULL) { else if((child = cfg->child("recruit")) != NULL) {
const std::string& recruit_num = (*child)["value"]; const std::string& recruit_num = (*child)["value"];
const int val = atoi(recruit_num.c_str()); const int val = lexical_cast_default<int>(recruit_num);
gamemap::location loc(*child, game_events::get_state_of_game()); gamemap::location loc(*child, game_events::get_state_of_game());
@ -927,7 +927,7 @@ bool do_replay_handle(game_display& disp, const gamemap& map, const game_data& g
sort_units(player->available_units); sort_units(player->available_units);
const std::string& recall_num = (*child)["value"]; const std::string& recall_num = (*child)["value"];
const int val = atoi(recall_num.c_str()); const int val = lexical_cast_default<int>(recall_num);
gamemap::location loc(*child, game_events::get_state_of_game()); gamemap::location loc(*child, game_events::get_state_of_game());
@ -952,7 +952,7 @@ bool do_replay_handle(game_display& disp, const gamemap& map, const game_data& g
sort_units(player->available_units); sort_units(player->available_units);
const std::string& unit_num = (*child)["value"]; const std::string& unit_num = (*child)["value"];
const int val = atoi(unit_num.c_str()); const int val = lexical_cast_default<int>(unit_num);
if(val >= 0 && val < int(player->available_units.size())) { if(val >= 0 && val < int(player->available_units.size())) {
player->available_units.erase(player->available_units.begin()+val); player->available_units.erase(player->available_units.begin()+val);
@ -1092,7 +1092,7 @@ bool do_replay_handle(game_display& disp, const gamemap& map, const game_data& g
const gamemap::location dst(*destination, game_events::get_state_of_game()); const gamemap::location dst(*destination, game_events::get_state_of_game());
const std::string& weapon = (*child)["weapon"]; const std::string& weapon = (*child)["weapon"];
const int weapon_num = atoi(weapon.c_str()); const int weapon_num = lexical_cast_default<int>(weapon);
const std::string& def_weapon = (*child)["defender_weapon"]; const std::string& def_weapon = (*child)["defender_weapon"];
int def_weapon_num = -1; int def_weapon_num = -1;
@ -1100,7 +1100,7 @@ bool do_replay_handle(game_display& disp, const gamemap& map, const game_data& g
// Let's not gratuitously destroy backwards compat. // Let's not gratuitously destroy backwards compat.
ERR_REPLAY << "Old data, having to guess weapon\n"; ERR_REPLAY << "Old data, having to guess weapon\n";
} else { } else {
def_weapon_num = atoi(def_weapon.c_str()); def_weapon_num = lexical_cast_default<int>(def_weapon);
} }
unit_map::iterator u = units.find(src); unit_map::iterator u = units.find(src);