[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1783878_editor_random_map_tribe into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1783878_editor_random_map_tribe into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1783878_editor_random_map_tribe/+merge/352943 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1783878_editor_random_map_tribe. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1783878_editor_random_map_tribe into lp:widelands
Continuous integration builds have changed state: Travis build 3850. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/421503400. Appveyor build 3648. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1783878_editor_random_map_tribe-3648. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1783878_editor_random_map_tribe/+merge/352943 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1783878_editor_random_map_tribe. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped into lp:widelands
About half of the Calvisson map filled up by 4 AIs. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/353514 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped into lp:widelands
How big was the economy while testing? Because that is the crucial factor. The more productionsites the more a possible effect could add up. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/353514 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-858292-military-influence into lp:widelands
Continuous integration builds have changed state: Travis build 3848. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/421441892. Appveyor build 3646. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_858292_military_influence-3646. -- https://code.launchpad.net/~widelands-dev/widelands/bug-858292-military-influence/+merge/353834 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-858292-military-influence into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1783878_editor_random_map_tribe into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1783878_editor_random_map_tribe/+merge/352943 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1783878_editor_random_map_tribe. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1776603_map_info_memory_leak into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1776603_map_info_memory_leak into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1776603_map_info_memory_leak/+merge/353140 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1776603_map_info_memory_leak. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped into lp:widelands
I ran this and trunk at the same time for a bit, both on autospeed. The speed for both instances fluctuated around the same values, so performance should be OK. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-10s-return-skipped/+merge/353514 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-858292-military-influence into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-858292-military-influence into lp:widelands.
Commit message:
Increase the area where the map is recalculated after conquering by 1. This
prevents buildings from sitting between borders.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #858292 in widelands: "building will burn down after upgrading and moving
soldiers inside"
https://bugs.launchpad.net/widelands/+bug/858292
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-858292-military-influence/+merge/353834
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-858292-military-influence into lp:widelands.
=== modified file 'src/logic/editor_game_base.cc'
--- src/logic/editor_game_base.cc 2018-04-27 06:11:05 +
+++ src/logic/editor_game_base.cc 2018-08-28 07:08:04 +
@@ -467,19 +467,6 @@
// step 1: unconquer area of this building
do_conquer_area(player_area, false, destroying_player);
-
- // step 5: deal with player immovables in the lost area
- // Players are not allowed to have their immovables on their borders.
- // Therefore the area must be enlarged before calling
- // cleanup_playerimmovables_area, so that those new border locations are
- // covered.
- // TODO(SirVer): In the editor, no buildings should burn down when a military
- // building is removed. Check this again though
- if (is_a(Game, this)) {
- ++player_area.radius;
- player_area.player_number = destroying_player;
- cleanup_playerimmovables_area(player_area);
- }
}
/// This conquers a given area because of a new (military) building that is set
@@ -496,13 +483,6 @@
assert(player_area.player_number <= map().get_nrplayers());
do_conquer_area(player_area, true, 0, conquer_guarded_location);
-
- // Players are not allowed to have their immovables on their borders.
- // Therefore the area must be enlarged before calling
- // cleanup_playerimmovables_area, so that those new border locations are
- // covered.
- ++player_area.radius;
- cleanup_playerimmovables_area(player_area);
}
void EditorGameBase::change_field_owner(const FCoords& fc, PlayerNumber const new_owner) {
@@ -623,8 +603,19 @@
// This must reach one step beyond the conquered area to adjust the borders
// of neighbour players.
- ++player_area.radius;
+ player_area.radius += 2;
map_.recalc_for_field_area(world(), player_area);
+
+ // Deal with player immovables in the lost area
+ // Players are not allowed to have their immovables on their borders.
+ // Therefore the area must be enlarged before calling
+ // cleanup_playerimmovables_area, so that those new border locations are
+ // covered.
+ // TODO(SirVer): In the editor, no buildings should burn down when a military
+ // building is removed. Check this again though
+ if (is_a(Game, this)) {
+ cleanup_playerimmovables_area(player_area);
+ }
}
/// Makes sure that buildings cannot exist outside their owner's territory.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1776603_map_info_memory_leak into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1776603_map_info_memory_leak/+merge/353140 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1776603_map_info_memory_leak. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
