1 nit, not tested yet.
Diff comments:
> === modified file 'src/logic/map_objects/tribes/production_program.cc'
> --- src/logic/map_objects/tribes/production_program.cc2019-04-24
> 06:01:37 +
> +++ src/logic/map_objects/tribes/production_program.cc2019-04-27
> 13:34:24 +
Tested.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/bug1642882-clear-space-in-port-vicinity/+merge/366599
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug1642882-clear-space-in-port-vicinity.
__
Maps need a comparison operator, because the elements are sorted. You could try
out
http://www.cplusplus.com/reference/unordered_map/unordered_map/
--
https://code.launchpad.net/~widelands-dev/widelands/per-level-soldier-anims/+merge/354929
Your team Widelands Developers is requested to review t
The proposal to merge
lp:~widelands-dev/widelands/bug1642882-clear-space-in-port-vicinity into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug1642882-clear-space-in-port-vicinity/+merge/366599
--
Y
Klaus Halfmann has proposed merging
lp:~widelands-dev/widelands/bug_1826669_MapDownloandChange into
lp:widelands/build20.
Commit message:
Fix for #1826669
Requested reviews:
Toni Förster (stonerl): remote network test
Related bugs:
Bug #1826669 in widelands: "R20-rc1 HeapUseAfterFree when c
This will merge to buld20.
I will try to do a bigger refactoring for trunk, but we should merge it there,
too.
--
https://code.launchpad.net/~widelands-dev/widelands/bug_1826669_MapDownloandChange/+merge/366616
Your team Widelands Developers is subscribed to branch lp:widelands/build20.
___
Review: Approve testing, playing, compiling
Tested with Klaus and this fixes the crash.
--
https://code.launchpad.net/~widelands-dev/widelands/bug_1826669_MapDownloandChange/+merge/366616
Your team Widelands Developers is subscribed to branch lp:widelands/build20.
___
Thanks for the suggestion, replaced it with unordered_map and removed the
operator<. I´m now using unique_ptr as key or the compiler warns about
unsupported hash functions…
--
https://code.launchpad.net/~widelands-dev/widelands/per-level-soldier-anims/+merge/354929
Your team Widelands Developers
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1826669-mp-map-b20 into lp:widelands.
Commit message:
Fix crash in NetClient when host changes their mind about a custom map in
mid-transfer.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1826669 in
Oops, wrong target branch. Take this one:
https://code.launchpad.net/~widelands-dev/widelands/bug-1826669-mp-map-b20/+merge/366618
--
https://code.launchpad.net/~widelands-dev/widelands/bug_1826669_MapDownloandChange/+merge/366616
Your team Widelands Developers is subscribed to branch lp:wideland
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1826669-mp-map-b20 into lp:widelands.
Commit message:
Fix crash in NetClient when host changes their mind about a custom map in
mid-transfer.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1826669 in
I have an alternative fix that will use unique_ptr. We are trying to get away
from raw delete calls. Tested with 2 Ubuntu machines.
https://code.launchpad.net/~widelands-dev/widelands/bug-1826669-mp-map-b20/+merge/366617
--
https://code.launchpad.net/~widelands-dev/widelands/bug_1826669_MapDownl
Woohoo, forgot to tick the checkbox too. Now I finally have the correct target
branch:
https://code.launchpad.net/~widelands-dev/widelands/bug-1826669-mp-map-b20/+merge/366619
--
https://code.launchpad.net/~widelands-dev/widelands/bug_1826669_MapDownloandChange/+merge/366616
Your team Widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1826669-mp-map-b20 into lp:widelands/build20.
Commit message:
Fix crash in NetClient when host changes their mind about a custom map in
mid-transfer.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #182
Ok adrresed code review. However .c_str() did not compile so I stood with
.str() which works fine.
Have tested this and added a translators hint.
--
https://code.launchpad.net/~widelands-dev/widelands/bugfix-buildings-tooltips/+merge/366607
Your team Widelands Developers is requested to review t
Review: Approve
I overlooked that you were using boost::format, so c_str() is not necessary.
So, code LGTM now :)
--
https://code.launchpad.net/~widelands-dev/widelands/bugfix-buildings-tooltips/+merge/366607
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug
That's because it still does need a unique key to identify the map contents.
The pointer address is unique, so it can deal with that.
We will need to do some thorough testing now.
--
https://code.launchpad.net/~widelands-dev/widelands/per-level-soldier-anims/+merge/354929
Your team Widelands Dev
Admitted, you fix is more elegant.
One nit inline.
Wil still compile and test this
Diff comments:
>
> === modified file 'src/network/network.h'
> --- src/network/network.h 2019-02-23 11:00:49 +
> +++ src/network/network.h 2019-04-28 14:30:33 +
> @@ -181,6 +181,11 @@
> };
>
>
Review: Needs Fixing compile test
Your soultion prevents the crahs but makes a difference:
- The new Map is not announced at the GUI
+ The new Map appears in the logs
- No Transfer of any Map happens any longer.
from the code I see no diecrt difference.
eventually ther is some == comparison f
I found one:
file_ = nullptr;
and
!file_ // this should be save.
in gameclient.cc
I used a Windows Server wit build20_rc1 as host so I could not test gamehost.cc
this way.
Now I am out of Ideas...
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1826669-mp-map-b20/+merge/366619
Benedikt Straub has proposed merging
lp:~widelands-dev/widelands/overlapping_workareas into lp:widelands.
Commit message:
Indicate overlapping workareas when placing buildings
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-
When I tested I still had a file from the previous attempt with the crashy
version. I had to delete that for the transfer to be initiated. Maybe that's it?
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1826669-mp-map-b20/+merge/366619
Your team Widelands Developers is subscribed to b
Yep, found and deleted it, will try again tomorrow.
Playing against WorldSavior and the-X makes me tired.
Thats another Bug for the Review in R21 then ...
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1826669-mp-map-b20/+merge/366619
Your team Widelands Developers is subscribed to b
Continuous integration builds have changed state:
Travis build 4826. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/525572046.
Appveyor build 4607. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_list_direc
Continuous integration builds have changed state:
Travis build 4827. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/525599704.
Appveyor build 4608. State: failed. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_per_level_s
Continuous integration builds have changed state:
Travis build 4829. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/525646461.
Appveyor build 4610. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bugfix_bu
Continuous integration builds have changed state:
Travis build 4830. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/525664696.
Appveyor build 4611. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_overlappin
I think we have some room here to get rid of code duplication.
Diff comments:
>
> === modified file 'src/graphic/gl/workarea_program.cc'
> --- src/graphic/gl/workarea_program.cc2019-04-25 21:48:17 +
> +++ src/graphic/gl/workarea_program.cc2019-04-28 16:58:57 +
> @@ -104,3
28 matches
Mail list logo
