Merge lp:~widelands-dev/widelands/bug-1805508-burning-military-sites into lp:widelands

Proposed by GunChleoc
Status: Merged
Merged at revision: 9023
Proposed branch: lp:~widelands-dev/widelands/bug-1805508-burning-military-sites
Merge into: lp:widelands
Diff against target: 11 lines (+0/-1)
1 file modified
src/logic/editor_game_base.cc (+0/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1805508-burning-military-sites
Reviewer Review Type Date Requested Status
hessenfarmer Approve
Review via email: mp+364665@code.launchpad.net

Commit message

When a medium military building is conquered, small military buildings very close to it burn down without a fight. When multiple small military buildings are burned down at once, the game crashes due to a failed assertion (when releasing the area of the small sites) when the areas to conquer overlap, and part of it has already been conquered. Removed this assertion.

To post a comment you must log in.
Revision history for this message
GunChleoc (gunchleoc) wrote :

@bunnybot merge

Revision history for this message
GunChleoc (gunchleoc) wrote :

CMake failure on OSX; everything else is green.

@bunnybot merge force

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

another try

@bunnybot merge force

Revision history for this message
hessenfarmer (stephan-lutz) :
review: Approve
8938. By hessenfarmer

merged trunk

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4618. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/508632426.
Appveyor build 4405. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1805508_burning_military_sites-4405.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 4618. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/508632426.

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

transient failures only

@bunnybot merge force

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/logic/editor_game_base.cc'
2--- src/logic/editor_game_base.cc 2019-02-23 11:00:49 +0000
3+++ src/logic/editor_game_base.cc 2019-03-19 21:35:23 +0000
4@@ -660,7 +660,6 @@
5 assert(0 < player_area.player_number);
6 assert(player_area.player_number <= map().get_nrplayers());
7 assert(preferred_player <= map().get_nrplayers());
8- assert(preferred_player != player_area.player_number);
9 assert(!conquer || !preferred_player);
10 Player* conquering_player = get_player(player_area.player_number);
11 MapRegion<Area<FCoords>> mr(map(), player_area);

Subscribers

People subscribed via source and target branches

to status/vote changes: