← Back to branch summary

~widelands-dev/widelands/trunk

« back to all changes in this revision

Viewing changes to src/logic/map_objects/bob.cc

  • Committer: The Widelands Bunnybot
  • Date: 2020-11-20 16:33:59 UTC
  • Revision ID: bunnybot@widelands.org-20201120163359-3s4pwfsasq6vj3ld
'src/editor/editorinteractive.h' was automatically formatted.

(by bunnybot)
a3ffba3181694baedb531fd0636e14661752ad05

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/logic/map_objects/bob.cc
645
645
        if (static_cast<Path::StepVector::size_type>(state.ivar1) >= path->get_nsteps()) {
646
646
                assert(position_ == path->get_end());
647
647
                return pop_task(game);  //  success
648
 
        } else if (state.ivar1 == state.ivar3) {
 
648
        }
 
649
        if (state.ivar1 == state.ivar3) {
649
650
                // We have stepped all steps that we were asked for.
650
651
                // This is some kind of success, though we do not are were we wanted
651
652
                // to go
704
705
        if (walkend_ <= game.get_gametime()) {
705
706
                end_walk();
706
707
                return pop_task(game);
707
 
        } else {
708
 
                //  Only end the task once we've actually completed the step
709
 
                // Ignore signals until then
710
 
                return schedule_act(game, walkend_ - game.get_gametime());
711
708
        }
 
709
        //  Only end the task once we've actually completed the step
 
710
        // Ignore signals until then
 
711
        return schedule_act(game, walkend_ - game.get_gametime());
712
712
}
713
713
 
714
714
// Calculates the actual position to draw on from the base node position. This