← Back to branch summary

~widelands-dev/widelands/trunk

« back to all changes in this revision

Viewing changes to src/logic/player.cc

  • Committer: Wideland's Bunnybot
  • Date: 2017-01-31 11:17:14 UTC
  • mfrom: (8268.1.2 bug-1637386)
  • Revision ID: bunnybot@widelands.org-20170131111714-2kvi2ziprak9no3y
Merged lp:~widelands-dev/widelands/bug-1637386:
Make sure that soldier visiting other territory is not presented as an aggressor to a militarysite that belongs to an ally.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/logic/player.cc
453
453
                log("Clearing for road at (%i, %i)\n", c.x, c.y);
454
454
 
455
455
                //  Make sure that the player owns the area around.
456
 
                dynamic_cast<Game&>(egbase()).conquer_area_no_building(
457
 
                   PlayerArea<Area<FCoords>>(player_number(), Area<FCoords>(c, 1)));
 
456
                dynamic_cast<Game&>(egbase())
 
457
                   .conquer_area_no_building(PlayerArea<Area<FCoords>>(player_number(), Area<FCoords>(c, 1)));
458
458
 
459
459
                if (BaseImmovable* const immovable = c.field->get_immovable()) {
460
460
                        assert(immovable != &start);