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

don't give OOS error on invalid unit rename

Browse source 
And fix some comments and error message strings.
This commit is contained in:
gfgtdf 2015-03-02 18:08:55 +01:00
parent 9df349d646
commit bfcd2695f2
2 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/playturn.cpp
View file

@ -98,7 +98,7 @@ turn_info::PROCESS_DATA_RESULT turn_info::handle_turn(const config& t)
assert(t.all_children_count() == 1);
/** @todo FIXME: Check what commands we execute when it's our turn! */
//note, that this function might call itself recursively: do_replay -> ... -> persist_var -> ... -> handle_generic_event -> sync_network -> handle_turn
//note, that this function might call itself recursively: do_replay -> ... -> get_user_choice -> ... -> playmp_controller::pull_remote_choice -> sync_network -> handle_turn
recorder.add_config(t, replay::MARK_AS_SENT);
PROCESS_DATA_RESULT retv = replay_to_process_data_result(do_replay());
return retv;

31
src/replay.cpp
View file

@ -705,7 +705,13 @@ REPLAY_RETURN do_replay(bool one_move)
update_locker lock_update(resources::screen->video(), resources::controller->is_skipping_replay());
return do_replay_handle(one_move);
}
/**
@returns:
if we expect a user choice and found something that prevents us from moving on we return REPLAY_FOUND_DEPENDENT (even if it is not a dependent command)
else if we found an [end_turn] we return REPLAY_FOUND_END_TURN
else if we found a player action and one_move=true we return REPLAY_FOUND_END_MOVE
else (<=> we reached the end of the replay) we return REPLAY_RETURN_AT_END
*/
REPLAY_RETURN do_replay_handle(bool one_move)
{
@ -774,21 +780,17 @@ REPLAY_RETURN do_replay_handle(bool one_move)
const std::string &name = child["name"];
unit_map::iterator u = resources::units->find(loc);
if (u.valid()) {
if (u->unrenamable()) {
std::stringstream errbuf;
errbuf << "renaming unrenamable unit " << u->id() << '\n';
replay::process_error(errbuf.str());
continue;
}
if (u.valid() && !u->unrenamable()) {
u->rename(name);
} else {
// Users can rename units while it's being killed at another machine.
// Users can rename units while it's being killed or at another machine.
// This since the player can rename units when it's not his/her turn.
// There's not a simple way to prevent that so in that case ignore the
// rename instead of throwing an OOS.
// The same way it is possible that an unrenamable unit moves to a
// hex where previously a renamable unit was.
WRN_REPLAY << "attempt to rename unit at location: "
<< loc << ", where none exists (anymore).\n";
<< loc << (u.valid() ? ", which is unrenamable" : ", where none exists (anymore)") << "\n";
}
}
@ -797,9 +799,8 @@ REPLAY_RETURN do_replay_handle(bool one_move)
if(is_synced)
{
replay::process_error("found init_side in replay while is_synced=true\n" );
replay::process_error("found side initialization in replay expecting a user choice\n" );
get_replay_source().revert_action();
//fits better than the other options, and should have the desired effect.
return REPLAY_FOUND_DEPENDENT;
}
else
@ -813,9 +814,8 @@ REPLAY_RETURN do_replay_handle(bool one_move)
{
if(is_synced)
{
replay::process_error("found end_turn in replay while is_synced=true\n" );
replay::process_error("found turn end in replay while expecting a user choice\n" );
get_replay_source().revert_action();
//fits better than the other options, and should have the desired effect.
return REPLAY_FOUND_DEPENDENT;
}
else
@ -868,9 +868,8 @@ REPLAY_RETURN do_replay_handle(bool one_move)
if(is_synced)
{
replay::process_error("found " + commandname + " command in replay while is_synced=true\n" );
replay::process_error("found [" + commandname + "] command in replay expecting a user choice\n" );
get_replay_source().revert_action();
//fits better than the other options, and should have the desired effect.
return REPLAY_FOUND_DEPENDENT;
}
else