Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-boost-asio into lp:widelands

2017-05-21 Thread GunChleoc
I have done a code review anyway. Since I don't know that much about networking, it's for code style only. I have also given it a quick spin and found that IPv4 is preferred over IPv6, I think it should be the other way around if possible, since v6 is the more modern protocol. Diff comments:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-multitexture into lp:widelands

2017-05-21 Thread kaputtnik
Crashed again (r8200) after playing a while. Just followed an expedition ship exploring the world. Opened windows: Stock and Expedition. Unfortunately no asserts: Autosave: save took 1591 ms

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-multitexture into lp:widelands

2017-05-21 Thread GunChleoc
If you click on "Show diff comments" for a post, the diff will switch to the appropriate revision so you can see them. Answers to your comments inline - I added all important comments to the code as well. I will also replace the 0's with 0.f for the Rectf calls. I think the caching model is gen

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/warehouse_refactor into lp:widelands

2017-05-21 Thread GunChleoc
Review: Approve 2 tiny nits, code LGTM otherwise. Not tested yet. And trading - yay! :) Diff comments: > > === renamed file 'src/logic/map_objects/attackable.h' => > 'src/logic/map_objects/attack_target.h' Move this to src/logic/map_objects/tribes? > > === modified file 'src/logic/map_obje

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1636966-segfault-in-battle into lp:widelands

2017-05-21 Thread GunChleoc
Thanks for the review :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1636966-segfault-in-battle/+merge/324365 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1636966-segfault-in-battle into lp:widelands.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1674243-crash_with_save_game into lp:widelands

2017-05-21 Thread GunChleoc
In Player::rediscover_node, I found the following code: { // discover everything (above the ground) in this field field.terrains = f.field->get_terrains(); field.roads = f.field->get_roads(); field.owner = f.field->get_owned_by(); OK, owner

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1687100-reveal_fields into lp:widelands

2017-05-21 Thread GunChleoc
How is the documentation for you now? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1687100-reveal_fields/+merge/323721 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1687100-reveal_fields. ___ Maili

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1674243-crash_with_save_game into lp:widelands

2017-05-21 Thread SirVer
Yes, could be. I am traveling and cannot check right now. But if roads is set, owner should be too - there can't be a field with roads but without owners. > Am 21.05.2017 um 11:39 schrieb GunChleoc : > > In Player::rediscover_node, I found the following code: > >{ // discover everything (

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

2017-05-21 Thread bunnybot
Continuous integration builds have changed state: Travis build 2227. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/234476861. Appveyor build 2062. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_warehouse_

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/warehouse_refactor into lp:widelands

2017-05-21 Thread GunChleoc
Tested now, so you can merge this any time :) -- https://code.launchpad.net/~widelands-dev/widelands/warehouse_refactor/+merge/324367 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/warehouse_refactor. ___ Mailing lis

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-multitexture into lp:widelands

2017-05-21 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/fh1-multitexture into lp:widelands has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fh1-multitexture/+merge/323903 -- Your team Widelands Developers is subs

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/warehouse_refactor into lp:widelands

2017-05-21 Thread SirVer
Diff comments: > > === renamed file 'src/logic/map_objects/attackable.h' => > 'src/logic/map_objects/attack_target.h' done. > > === modified file 'src/logic/map_objects/tribes/soldier.cc' > --- src/logic/map_objects/tribes/soldier.cc 2017-05-13 18:48:26 + > +++ src/logic/map_objects/t

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/warehouse_refactor into lp:widelands

2017-05-21 Thread SirVer
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/warehouse_refactor/+merge/324367 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/warehouse_refactor. ___ Mailing list: https://launchpad.net/~wide

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1674243-crash_with_save_game into lp:widelands

2017-05-21 Thread GunChleoc
Review: Resubmit I have now implemented my new suggestion, because I think it makes more sense. It's hard to test for though, since this won't fix the crash for savegames that are already messed up. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1674243-crash_with_save_game/+merge/3

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1674243-crash_with_save_game into lp:widelands

2017-05-21 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1674243-crash_with_save_game into lp:widelands has been updated. Commit Message changed to: Assign owners to neighbours in Player::rediscover_node. The lack of owners was causing crashes with the road program, which no longer knew which tex

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1674243-crash_with_save_game into lp:widelands

2017-05-21 Thread Klaus Halfmann
Mhh, ao the savegames caanot be fixed, as they already have the broken status. So when or why is Player::rediscover_node called? As of the code this is for the NoteFieldTerrainChanged Event raised by Map::change_terrain, this should happen by the gameeditor or some luascript only -> should happen

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1674243-crash_with_save_game into lp:widelands

2017-05-21 Thread Klaus Halfmann
So to test this we would need some game / scenarion where the borders two between players toggle a lot an then build roads along the newly seen parts of the map, correct? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1674243-crash_with_save_game/+merge/324301 Your team Widelands Deve

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1636966-segfault-in-battle into lp:widelands

2017-05-21 Thread bunnybot
Continuous integration builds have changed state: Travis build 2229. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/234503157. Appveyor build 2064. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_163696

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1636966-segfault-in-battle into lp:widelands

2017-05-21 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1636966-segfault-in-battle into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1636966-segfault-in-battle/+merge/324365 -- Your team Widelands

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1674243-crash_with_save_game into lp:widelands

2017-05-21 Thread GunChleoc
I guess that sort of situation could help with a bit of testing, yes. Nodes are rediscovered if a worker or ship passes by them, or if a building is built nearby. It can also be triggered by Lua code as in https://code.launchpad.net/~widelands-dev/widelands/bug-1687100-reveal_fields/+merge/3237

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-multitexture into lp:widelands

2017-05-21 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/fh1-multitexture into lp:widelands. Commit message: The new font renderer now creates a set of textures that will be blitted separately by the new class RenderedText. This avoids issues with texture sizes exceeding the maximum size supp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-multitexture into lp:widelands

2017-05-21 Thread GunChleoc
OK, this went faster than expected. We now have a templated class TransientCache that hands out shared_ptrs to everyone. It's a bit heavy in the header, but there was no obvious split into header/cc file because of the templating. I have also added some log output when the cache overflows. I ha

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1687100-reveal_fields into lp:widelands

2017-05-21 Thread kaputtnik
> How is the documentation for you now? Perfect :-) Thanks -- https://code.launchpad.net/~widelands-dev/widelands/bug-1687100-reveal_fields/+merge/323721 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1687100-reveal_fields. ___

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1687100-reveal_fields into lp:widelands

2017-05-21 Thread bunnybot
Continuous integration builds have changed state: Travis build 2230. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/234503590. Appveyor build 2065. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_168710

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-multitexture into lp:widelands

2017-05-21 Thread GunChleoc
Review: Resubmit Added some more small tweaks, and this is hopefully done now. Let's get a new diff. -- https://code.launchpad.net/~widelands-dev/widelands/fh1-multitexture/+merge/323903 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-multitexture. __

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-boost-asio into lp:widelands

2017-05-21 Thread Notabilis
Thanks for the review! I included all your suggestions, even though the "prefer IPv6" part is somewhere else in the code. -- https://code.launchpad.net/~widelands-dev/widelands/net-boost-asio/+merge/324364 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-

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

2017-05-21 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/warehouse_refactor into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/warehouse_refactor/+merge/324367 -- Your team Widelands Developers is subscribed

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-boost-asio into lp:widelands

2017-05-21 Thread bunnybot
Continuous integration builds have changed state: Travis build 2236. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/234606690. Appveyor build 2071. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_net_boost_a

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-multitexture into lp:widelands

2017-05-21 Thread bunnybot
Continuous integration builds have changed state: Travis build 2237. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/234607244. Appveyor build 2072. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fh1_multit