Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1685331-oldsaves into lp:widelands

2017-04-30 Thread GunChleoc
Review: Needs Fixing -- https://code.launchpad.net/~widelands-dev/widelands/bug-1685331-oldsaves/+merge/323442 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1685331-oldsaves. ___ Mailing list: https://launchpa

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1685331-oldsaves into lp:widelands

2017-04-30 Thread GunChleoc
I attached 2 savegames to the branch - one of them doesn't create a barracks. It might be easier to always make sure that we allow a barracks and live with it that it breaks some scenario restrictions. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1685331-oldsaves/+merge/323442 Your

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

2017-04-30 Thread bunnybot
Continuous integration builds have changed state: Travis build 2134. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/227422140. Appveyor build 1969. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fh1_width_

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1685331-oldsaves into lp:widelands

2017-04-30 Thread Notabilis
Just noticing: My last commit message is a bit broken. The first "Removed" should actually be an "Added". :-D -- https://code.launchpad.net/~widelands-dev/widelands/bug-1685331-oldsaves/+merge/323442 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1685331-o

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1685331-oldsaves into lp:widelands

2017-04-30 Thread bunnybot
Continuous integration builds have changed state: Travis build 2132. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/227354900. Appveyor build 1967. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_168533

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

2017-04-30 Thread GunChleoc
Yes it is. The same issue is there in player_color, which you refactored by using an auto. However, we have things spread out here to the calling function, which is a problem for clang, but not for gcc. So, I attempted having a pointer first and creating the unique_pointer on return. Can't make

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

2017-04-30 Thread SirVer
This is a const issue. Const Image vs (nonconst) texture. Just a guess - I am on mobile and can't decipher the code. > Am 30.04.2017 um 19:22 schrieb Klaus Halfmann : > > Sorry, still does not like it, Attaching the complete messages, maybe it can > help you > > ... > bzr+ssh://bazaar.launch

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1655168-statistics-overlap into lp:widelands

2017-04-30 Thread bunnybot
Continuous integration builds have changed state: Travis build 2131. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/227334675. Appveyor build 1966. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_165516

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

2017-04-30 Thread Klaus Halfmann
Sorry, still does not like it, Attaching the complete messages, maybe it can help you ... bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/fh1_width_and_mapobject_messages/ M src/wui/waresdisplay.cc

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

2017-04-30 Thread GunChleoc
How does your compiler like it now? -- https://code.launchpad.net/~widelands-dev/widelands/fh1_width_and_mapobject_messages/+merge/318189 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1_width_and_mapobject_messages. _

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1685331-oldsaves into lp:widelands

2017-04-30 Thread Notabilis
No problem, is done. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1685331-oldsaves/+merge/323442 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1685331-oldsaves. ___ Mailing list: https://launchpad.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1685331-oldsaves into lp:widelands

2017-04-30 Thread GunChleoc
Review: Approve Code LGTM, not tested. Could you please add a TODO as a marker to remove the code in warehouse.cc the next time we remove savegame compatibility? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1685331-oldsaves/+merge/323442 Your team Widelands Developers is subscribe

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1685331-oldsaves into lp:widelands

2017-04-30 Thread Notabilis
Notabilis has proposed merging lp:~widelands-dev/widelands/bug-1685331-oldsaves into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1685331 in widelands: "Barracks can't be built with old savegames" https://bugs.launchpad.net/widelands/+bug/1685331

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

2017-04-30 Thread Klaus Halfmann
Review: Needs Fixing compile I got an Error from my compiler as follows: fh1_width_and_mapobject_messages/src/graphic/animation.cc:232:9: error: no viable conversion from returned value of type 'unique_ptr>' to function return type 'unique_ptr>' return rv; I would expect our autmated build w

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1655168-statistics-overlap into lp:widelands

2017-04-30 Thread Notabilis
Notabilis has proposed merging lp:~widelands-dev/widelands/bug-1655168-statistics-overlap into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1655168 in widelands: "statistic window: switch ealier to hours instead of minutes" https://bugs.launchpad

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

2017-04-30 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/fh1_width_and_mapobject_messages into lp:widelands has been updated. Commit Message changed to: The new font renderer now sets the width properly and supports player color for images. - Added width property to img tag - Buildings and ships now

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

2017-04-30 Thread GunChleoc
Found it - when buildings send player messages, the representative image is grabbed for its width, and that's done without player color. So, I changed the hash for the cashing in the animation manager. I could have just changed the call in [1], but I figured that changing the hash is safer, alt

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1687043-multiline-edit into lp:widelands

2017-04-30 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1687043-multiline-edit into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1687043-multiline-edit/+merge/323428 -- Your team Widelands Develope

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1687043-multiline-edit into lp:widelands

2017-04-30 Thread Klaus Halfmann
Review: Approve compile, test, regressiontest Multilineedit fields are ok (even with German Umauts), word wrap is a bit early. Lets go. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1687043-multiline-edit/+merge/323428 Your team Widelands Developers is subscribed to