[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/official_posts into lp:widelands-website

2019-03-24 Thread noreply
The proposal to merge lp:~widelands-dev/widelands-website/official_posts into 
lp:widelands-website has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/official_posts/+merge/364989
-- 
Your team Widelands Developers is subscribed to branch lp:widelands-website.

___
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-website/official_posts into lp:widelands-website

2019-03-24 Thread kaputtnik
Thanks :-), merged and deployed
-- 
https://code.launchpad.net/~widelands-dev/widelands-website/official_posts/+merge/364989
Your team Widelands Developers is subscribed to branch lp:widelands-website.

___
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/ferry into lp:widelands

2019-03-24 Thread GunChleoc
The overlays look fine now, thank you.

I have pushed a commit with a code review. Check the "NOCOM" comments.

Some notes that are not in the review commit:

- Ferry yard needs an economy check, just like the Ox Farm etc. Otherwise, it 
will just keep producing en masse.

- switch is faster than if/else, so use that for distinguishing ware/worker 
cases if it keeps the code still readable

- And ASan is not happy. I built a ferry yard, then a waterway. Connected a 
construction site with a separate flag to the other end of the waterway and 
waited a bit. Only then did I connect the worker economy -> boom


TI(2857): destination appears to have become split from current location -> fail
=
==32501==ERROR: AddressSanitizer: heap-use-after-free on address 0x61100075fb38 
at pc 0x55b7a7a1a6e7 bp 0x7ffcd58678f0 sp 0x7ffcd58678e0
READ of size 8 at 0x61100075fb38 thread T0
#0 0x55b7a7a1a6e6 in __gnu_cxx::__normal_iterator > 
>::__normal_iterator(Widelands::Ferry** const&) 
/usr/include/c++/7/bits/stl_iterator.h:780
#1 0x55b7a7a127c5 in std::vector >::begin() 
/usr/include/c++/7/bits/stl_vector.h:564
#2 0x55b7a7a079d2 in 
Widelands::Fleet::cancel_ferry_request(Widelands::Game&, Widelands::Waterway*) 
../src/economy/fleet.cc:533
#3 0x55b7a7a5b870 in 
Widelands::Waterway::cleanup(Widelands::EditorGameBase&) 
../src/economy/waterway.cc:227
#4 0x55b7a7084ea7 in 
Widelands::MapObject::remove(Widelands::EditorGameBase&) 
../src/logic/map_objects/map_object.cc:434
#5 0x55b7a7081626 in 
Widelands::ObjectManager::cleanup(Widelands::EditorGameBase&) 
../src/logic/map_objects/map_object.cc:162
#6 0x55b7a6ccb2d7 in Widelands::EditorGameBase::cleanup_objects() 
../src/logic/editor_game_base.h:170
#7 0x55b7a6f6dd40 in Widelands::Game::run(UI::ProgressWindow*, 
Widelands::Game::StartGameType, std::__cxx11::basic_string, std::allocator > const&, bool, 
std::__cxx11::basic_string, std::allocator > 
const&) ../src/logic/game.cc:554
#8 0x55b7a6c6cef0 in WLApplication::new_game() ../src/wlapplication.cc:1320
#9 0x55b7a6c6b29c in WLApplication::mainmenu_singleplayer() 
../src/wlapplication.cc:1177
#10 0x55b7a6c6a3d3 in WLApplication::mainmenu() ../src/wlapplication.cc:1082
#11 0x55b7a6c61699 in WLApplication::run() ../src/wlapplication.cc:454
#12 0x55b7a6c5dbee in main ../src/main.cc:44
#13 0x7f0401bfbb96 in __libc_start_main 
(/lib/x86_64-linux-gnu/libc.so.6+0x21b96)
#14 0x55b7a6c5da69 in _start 
(/media/cuideigin/Linux/sources/widelands/ferry/widelands+0xd94a69)

-- 
https://code.launchpad.net/~widelands-dev/widelands/ferry/+merge/351880
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/ferry 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


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1821506-new-scenario-crash into lp:widelands

2019-03-24 Thread GunChleoc
GunChleoc has proposed merging 
lp:~widelands-dev/widelands/bug-1821506-new-scenario-crash into lp:widelands.

Commit message:
Allow random player tribes in scenarios.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1821506 in widelands: "New scenarios crash on load"
  https://bugs.launchpad.net/widelands/+bug/1821506

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1821506-new-scenario-crash/+merge/365002

This is for Build 20, because Widelands will crash if somebody creates a 
scenario and forgets to assign a tribename to a player.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1821506-new-scenario-crash into lp:widelands.
=== modified file 'src/logic/game.cc'
--- src/logic/game.cc	2019-03-09 10:55:24 +
+++ src/logic/game.cc	2019-03-24 12:05:15 +
@@ -232,7 +232,14 @@
 	loader_ui.step(_("Creating players"));
 	PlayerNumber const nr_players = map().get_nrplayers();
 	iterate_player_numbers(p, nr_players) {
-		add_player(p, 0, map().get_scenario_player_tribe(p), map().get_scenario_player_name(p));
+		// If tribe name is empty, pick a random tribe
+		std::string tribe = map().get_scenario_player_tribe(p);
+		if (tribe.empty()) {
+			log("Setting random tribe for Player %d\n", static_cast(p));
+			const DescriptionIndex random = std::rand() % tribes().nrtribes();
+			tribe = tribes().get_tribe_descr(random)->name();
+		}
+		add_player(p, 0, tribe, map().get_scenario_player_name(p));
 		get_player(p)->set_ai(map().get_scenario_player_ai(p));
 	}
 	win_condition_displayname_ = "Scenario";

=== modified file 'src/logic/map_objects/tribes/tribe_descr.cc'
--- src/logic/map_objects/tribes/tribe_descr.cc	2019-02-23 11:00:49 +
+++ src/logic/map_objects/tribes/tribe_descr.cc	2019-03-24 12:05:15 +
@@ -251,7 +251,7 @@
 	return wares_.count(index) == 1;
 }
 bool TribeDescr::has_worker(const DescriptionIndex& index) const {
-	return workers_.count(index) == 1;
+	return workers_.count(index) == 1; // NOCOM here
 }
 bool TribeDescr::has_immovable(const DescriptionIndex& index) const {
 	return immovables_.count(index) == 1;

=== modified file 'src/logic/playersmanager.cc'
--- src/logic/playersmanager.cc	2019-02-23 11:00:49 +
+++ src/logic/playersmanager.cc	2019-03-24 12:05:15 +
@@ -75,8 +75,12 @@
 			number_of_players_--;
 		}
 	}
+	const TribeDescr* player_tribe = egbase_.tribes().get_tribe_descr(egbase_.tribes().tribe_index(tribe));
+	if (player_tribe == nullptr) {
+		throw wexception("Tribe '%s' for player %d '%s' does not exist!", tribe.c_str(), static_cast(player_number), name.c_str());
+	}
 	p = new Player(egbase_, player_number, initialization_index,
-	   *egbase_.tribes().get_tribe_descr(egbase_.tribes().tribe_index(tribe)), name);
+	   *player_tribe, name);
 	p->set_team_number(team);
 	if (player_number <= UserSettings::highest_playernum()) {
 		number_of_players_++;

___
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/vector-float-warnings into lp:widelands

2019-03-24 Thread GunChleoc
GunChleoc has proposed merging 
lp:~widelands-dev/widelands/vector-float-warnings into lp:widelands.

Commit message:
Replace equality operator in MapView with near functions for float arithmetic.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1818494 in widelands: "Crash on "Reset zoom" bzr9005-201903031251 
(Release)"
  https://bugs.launchpad.net/widelands/+bug/1818494

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/vector-float-warnings/+merge/365003

I did not notice the compiler warnings in r9024, and they need to be fixed.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/vector-float-warnings into lp:widelands.
=== modified file 'src/wui/mapview.cc'
--- src/wui/mapview.cc	2019-03-12 08:23:51 +
+++ src/wui/mapview.cc	2019-03-24 12:42:06 +
@@ -387,7 +387,7 @@
 	const Transition transition = animate_map_panning_ ? passed_transition : Transition::Jump;
 	switch (transition) {
 	case Transition::Jump: {
-		if (view_ == target_view) {
+		if (view_.near(target_view)) {
 			// We're already there
 			return;
 		}
@@ -398,7 +398,7 @@
 	}
 
 	case Transition::Smooth: {
-		if (!view_plans_.empty() && view_plans_.back().back().view == target_view) {
+		if (!view_plans_.empty() && view_plans_.back().back().view.near(target_view)) {
 			// We're already there
 			return;
 		}
@@ -517,7 +517,7 @@
 	const TimestampedView current = animation_target_view();
 	switch (transition) {
 	case Transition::Jump: {
-		if (view_.zoom == new_zoom) {
+		if (view_.zoom_near(new_zoom)) {
 			// We're already there
 			return;
 		}
@@ -530,7 +530,7 @@
 	}
 
 	case Transition::Smooth: {
-		if (!view_plans_.empty() && view_plans_.back().back().view.zoom == new_zoom) {
+		if (!view_plans_.empty() && view_plans_.back().back().view.zoom_near(new_zoom)) {
 			// We're already there
 			return;
 		}

=== modified file 'src/wui/mapview.h'
--- src/wui/mapview.h	2019-03-12 08:23:51 +
+++ src/wui/mapview.h	2019-03-24 12:42:06 +
@@ -75,8 +75,16 @@
 		View() : View(Vector2f::zero(), 1.0f) {
 		}
 
-		bool operator==(const View& other) const {
-			return (zoom == other.zoom) && (viewpoint == other.viewpoint);
+		bool zoom_near(float other_zoom) const {
+			constexpr float epsilon = 1e-5;
+			return std::abs(zoom - other_zoom) < epsilon;
+		}
+
+		bool near(const View& other) const {
+			constexpr float epsilon = 1e-5;
+			return zoom_near(other.zoom) &&
+	std::abs(viewpoint.x - other.viewpoint.x) < epsilon &&
+	std::abs(viewpoint.y - other.viewpoint.y) < epsilon;
 		}
 
 		// Mappixel of top-left pixel of this MapView.

___
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-1819311-port-spaces-heap-use-after-free into lp:widelands

2019-03-24 Thread GunChleoc
GunChleoc has proposed merging 
lp:~widelands-dev/widelands/bug-1819311-port-spaces-heap-use-after-free into 
lp:widelands.

Commit message:
Use temporary container in cleanup_port_spaces to prevent invalid iterators.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1819311 in widelands: "heap-use-after-free cleanup_port_spaces"
  https://bugs.launchpad.net/widelands/+bug/1819311

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1819311-port-spaces-heap-use-after-free/+merge/365004
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1819311-port-spaces-heap-use-after-free into 
lp:widelands.
=== modified file 'src/logic/map.cc'
--- src/logic/map.cc	2019-03-11 11:42:03 +
+++ src/logic/map.cc	2019-03-24 13:14:51 +
@@ -411,7 +411,6 @@
 	background_ = std::string();
 
 	objectives_.clear();
-
 	port_spaces_.clear();
 	allows_seafaring_ = false;
 
@@ -522,7 +521,6 @@
 		new_port_spaces.insert(temp);
 	}
 	port_spaces_ = new_port_spaces;
-	log("Map origin was shifted by (%d, %d)\n", new_origin.x, new_origin.y);
 }
 
 /*
@@ -2175,12 +2173,16 @@
 }
 
 void Map::cleanup_port_spaces(const World& world) {
+	// Temporary set to avoid problems with concurrent container operations
+	PortSpacesSet clean_me_up;
 	for (const Coords& c : get_port_spaces()) {
 		if (!is_port_space_allowed(world, get_fcoords(c))) {
-			set_port_space(world, c, false);
-			continue;
+			clean_me_up.insert(c);
 		}
 	}
+	for (const Coords& c : clean_me_up) {
+		set_port_space(world, c, false);
+	}
 	recalculate_allows_seafaring();
 }
 

=== modified file 'src/logic/map.h'
--- src/logic/map.h	2019-03-11 11:42:03 +
+++ src/logic/map.h	2019-03-24 13:14:51 +
@@ -28,6 +28,7 @@
 #include 
 
 #include "base/i18n.h"
+#include "base/log.h"
 #include "economy/itransport_cost_calculator.h"
 #include "logic/description_maintainer.h"
 #include "logic/field.h"

___
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-1819311-port-spaces-heap-use-after-free into lp:widelands

2019-03-24 Thread Klaus Halfmann
Review: Approve compile, review, test

Fixed that bug, lets have it.

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1819311-port-spaces-heap-use-after-free/+merge/365004
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1819311-port-spaces-heap-use-after-free.

___
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/vector-float-warnings into lp:widelands

2019-03-24 Thread Klaus Halfmann
Code looks good.

will copile this and zoom around a bit.
-- 
https://code.launchpad.net/~widelands-dev/widelands/vector-float-warnings/+merge/365003
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/vector-float-warnings 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/vector-float-warnings into lp:widelands

2019-03-24 Thread Klaus Halfmann
Review: Approve compile, test, review

compiled, warnings are gone.

Jumped around a bit in the WideWorldMap, all fine.

Anyrthing else we must check?
-- 
https://code.launchpad.net/~widelands-dev/widelands/vector-float-warnings/+merge/365003
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/vector-float-warnings.

___
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:~nordfriese/widelands/workareas into lp:widelands

2019-03-24 Thread Klaus Halfmann
Is this for R20?
-- 
https://code.launchpad.net/~nordfriese/widelands/workareas/+merge/364266
Your team Widelands Developers is requested to review the proposed merge of 
lp:~nordfriese/widelands/workareas 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:~nordfriese/widelands/workareas into lp:widelands

2019-03-24 Thread Benedikt Straub
Would be nice, but I thought we were in feature freeze ;)
-- 
https://code.launchpad.net/~nordfriese/widelands/workareas/+merge/364266
Your team Widelands Developers is requested to review the proposed merge of 
lp:~nordfriese/widelands/workareas 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-1819311-port-spaces-heap-use-after-free into lp:widelands

2019-03-24 Thread GunChleoc
Thanks for the review :)

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1819311-port-spaces-heap-use-after-free/+merge/365004
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1819311-port-spaces-heap-use-after-free.

___
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/vector-float-warnings into lp:widelands

2019-03-24 Thread GunChleoc
I did the zooming test. Thanks for the review :)

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/vector-float-warnings/+merge/365003
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/vector-float-warnings.

___
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:~nordfriese/widelands/workareas into lp:widelands

2019-03-24 Thread GunChleoc
Yes, feature freeze. We're mopping up the remaining bugs right now, so we can't 
risk merging anything else.
-- 
https://code.launchpad.net/~nordfriese/widelands/workareas/+merge/364266
Your team Widelands Developers is requested to review the proposed merge of 
lp:~nordfriese/widelands/workareas 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


[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/loginbox_rework into lp:widelands-website

2019-03-24 Thread kaputtnik
kaputtnik has proposed merging 
lp:~widelands-dev/widelands-website/loginbox_rework into lp:widelands-website.

Commit message:
Loginbox rework

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1804993 in Widelands Website: "Click target for accessing PMs is too 
small"
  https://bugs.launchpad.net/widelands-website/+bug/1804993

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/loginbox_rework/+merge/365005

Change the links in the loginbox after a user has logged in to:

Profile | Messages
Playtime Scheduler
Logout

'Profile'and 'Messages' are links to the corresponding pages. The 'Messages' 
string get enhanced with '(# Number of unread messages)' if there are any.

'Playtime Scheduler' now links to the start page: 
https://wl.widelands.org/scheduling/main/ 


-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands-website/loginbox_rework into lp:widelands-website.
=== modified file 'mainpage/templates/mainpage/header.html'
--- mainpage/templates/mainpage/header.html	2019-03-18 19:06:29 +
+++ mainpage/templates/mainpage/header.html	2019-03-24 16:57:05 +
@@ -30,18 +30,20 @@
 		
 	
 	
-	
 		{% if user.is_authenticated %}
+			
+			Profile |
 			{% if messages_inbox_count %}
-Your Profile ({{ messages_inbox_count }})
-			{% else %}
-Your Profile
+Messages ({{ messages_inbox_count }})
+			{% else %}			
+Messages
 			{% endif %}
 			
-			Playtimes
+			Playtime Scheduler
 			
 			Logout
 		{% else %}
+			
 			Login/Register
 		{% endif %}
 	

___
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/vector-float-warnings into lp:widelands

2019-03-24 Thread bunnybot
Continuous integration builds have changed state:

Travis build 4635. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/510574232.
Appveyor build 4422. State: failed. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_vector_float_warnings-4422.
-- 
https://code.launchpad.net/~widelands-dev/widelands/vector-float-warnings/+merge/365003
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/vector-float-warnings.

___
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/vector-float-warnings into lp:widelands

2019-03-24 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/vector-float-warnings into 
lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/vector-float-warnings/+merge/365003
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/vector-float-warnings.

___
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/vector-float-warnings into lp:widelands

2019-03-24 Thread hessenfarmer
why did this get merged, although appveyor failed completely?
-- 
https://code.launchpad.net/~widelands-dev/widelands/vector-float-warnings/+merge/365003
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/vector-float-warnings.

___
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/vector-float-warnings into lp:widelands

2019-03-24 Thread Klaus Halfmann
OOps, you are right and its a compiler error:

> ../src/wui/mapview.h:83:13: error: expected unqualified-id before 'const'
>   bool near(const View& other) const {
 ^

But I have no idea what the problem ist, did we hit some reserved indentifier 
for WIN/GCC?

-- 
https://code.launchpad.net/~widelands-dev/widelands/vector-float-warnings/+merge/365003
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/vector-float-warnings.

___
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-1821506-new-scenario-crash into lp:widelands

2019-03-24 Thread bunnybot
Continuous integration builds have changed state:

Travis build 4636. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/510574309.
Appveyor build 4423. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1821506_new_scenario_crash-4423.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1821506-new-scenario-crash/+merge/365002
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1821506-new-scenario-crash 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


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1819311-port-spaces-heap-use-after-free into lp:widelands

2019-03-24 Thread bunnybot
Continuous integration builds have changed state:

Travis build 4637. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/510593332.
Appveyor build 4424. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1819311_port_spaces_heap_use_after_free-4424.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1819311-port-spaces-heap-use-after-free/+merge/365004
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1819311-port-spaces-heap-use-after-free.

___
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-1819311-port-spaces-heap-use-after-free into lp:widelands

2019-03-24 Thread noreply
The proposal to merge 
lp:~widelands-dev/widelands/bug-1819311-port-spaces-heap-use-after-free into 
lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1819311-port-spaces-heap-use-after-free/+merge/365004
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1819311-port-spaces-heap-use-after-free.

___
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/ferry into lp:widelands

2019-03-24 Thread bunnybot
Continuous integration builds have changed state:

Travis build 4638. State: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/510643337.
Appveyor build 4425. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4425.
-- 
https://code.launchpad.net/~widelands-dev/widelands/ferry/+merge/351880
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/ferry 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