widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1805508-burning-military-sites into lp:widelands.

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.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1805508 in widelands: "Crash when burning enemies military sites"
  https://bugs.launchpad.net/widelands/+bug/1805508

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1805508-burning-military-sites/+merge/364665
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1805508-burning-military-sites into lp:widelands.

=== modified file 'src/logic/editor_game_base.cc'
--- src/logic/editor_game_base.cc	2019-02-23 11:00:49 +0000
+++ src/logic/editor_game_base.cc	2019-03-18 10:48:11 +0000
@@ -660,7 +660,6 @@
 	assert(0 < player_area.player_number);
 	assert(player_area.player_number <= map().get_nrplayers());
 	assert(preferred_player <= map().get_nrplayers());
-	assert(preferred_player != player_area.player_number);
 	assert(!conquer || !preferred_player);
 	Player* conquering_player = get_player(player_area.player_number);
 	MapRegion<Area<FCoords>> mr(map(), player_area);