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

Temporary fix for bug #19856

Browse source 
This will fix replays in the most common cases, but there are still
some less common cases not handled well.
This commit is contained in:
J. Tyne 2012-06-28 18:50:46 +00:00
parent 259276c040
commit e56275e703
2 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/actions.cpp
View file

@ -2822,7 +2822,10 @@ public:
void feedback() const;
/// After checking expected movement, this is the expected path.
std::vector<map_location> expected_path() const { return std::vector<map_location>(begin_, expected_end_); }
std::vector<map_location> expected_path() const
{ return std::vector<map_location>(begin_, expected_end_); }
std::vector<map_location> path_of_record() const
{ return std::vector<map_location>(begin_, real_end_ + (report_extra_hex_ ? 1 : 0)); }
/// After moving, this is the final hex reached.
const map_location & final_hex() const { return (real_end_ == begin_) ? *begin_ : *(real_end_-1); }
/// After moving, this indicates if any units were seen.
@ -2913,6 +2916,7 @@ public:
bool fog_changed_;
bool sighted_;
bool teleport_failed_;
bool report_extra_hex_;
std::string ambush_string_;
std::map<map_location, int> jamming_;
std::deque<int> moves_left_; // The front value is what the moving unit's remaining moves should be set to after the next step through the route.
@ -2959,6 +2963,7 @@ public:
fog_changed_(false),
sighted_(false),
teleport_failed_(false),
report_extra_hex_(false),
ambush_string_(),
jamming_(),
moves_left_(),
@ -3465,9 +3470,12 @@ public:
}
// Already accounted for: ZoC
// Already accounted for: movement cost
if ( fire_hex_event(exit_hex_str, step_from, real_end_) )
if ( fire_hex_event(exit_hex_str, step_from, real_end_) ) {
report_extra_hex_ = true;
break;
}
if ( real_end_ == obstructed_ ) {
report_extra_hex_ = true;
obstructed_stop = true;
break;
}
@ -3739,11 +3747,17 @@ size_t move_unit(move_unit_spectator *move_spectator,
return 0;
if ( move_recorder )
// Record the expected movement, so that replays trigger the same events.
// (Recorded here in case an exception occurs during movement.)
move_recorder->add_movement(mover.expected_path());
// Attempt moving.
// (This is broken into pieces so that the individual functions are more manageble.)
mover.try_actual_movement(show_move);
if ( move_recorder ) {
// Replace expected movement with actual movement in the record.
move_recorder->undo();
move_recorder->add_movement(mover.path_of_record());
}
mover.post_move(undo_stack);
if ( show_move )
mover.feedback();

22
src/replay.cpp
View file

@ -1036,15 +1036,19 @@ bool do_replay_handle(int side_num, const std::string &do_untill)
continue;
}
unit_map::iterator u = find_visible_unit(dst, current_team);
if (u.valid()) {
std::stringstream errbuf;
errbuf << "destination already occupied: "
<< dst << '\n';
replay::process_error(errbuf.str());
continue;
}
u = resources::units->find(src);
// The current implementation of enter/exit hex events means that
// movement can end in an occupied hex.
// Just commenting this out for now, since this implementation
// might change.
//unit_map::iterator u = find_visible_unit(dst, current_team);
//if (u.valid()) {
// std::stringstream errbuf;
// errbuf << "destination already occupied: "
// << dst << '\n';
// replay::process_error(errbuf.str());
// continue;
//}
unit_map::iterator u = resources::units->find(src);
if (!u.valid()) {
std::stringstream errbuf;
errbuf << "unfound location for source of movement: "