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

2013-07-20 Thread Jens Beyer (Qcumber-some)
Jens Beyer (Qcumber-some) has proposed merging lp:~widelands-dev/widelands/bug1203121 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1203121 in widelands: "Latest trunk FTBFS on Ubuntu 12.04 (src/helper.cc:82:8: error: 'mt19937' in namespace 'bo

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

2013-07-20 Thread SirVer
Review: Approve Thanks for tracking this down jens! Lgtm. -- https://code.launchpad.net/~widelands-dev/widelands/bug1203121/+merge/175987 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug1203121. ___ Mailing list:

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

2013-07-20 Thread SirVer
Tino, the problem here is that WIN32 is defined in some header (which we do not seem to include anymore at this point. I changed this and all other appearances of ifdef WIN32 to using _WIN32 which is defined by the compiler and therefore always true under windows. I pushed the change to trunk an

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

2013-07-20 Thread SirVer
Also: > According to http://gcc.gnu.org/onlinedocs/gcc/C-Dialect-Options.html "c++0x" > is deprecated. Yes, we should now use c++11 - I added a conditional into the CMake file to check for this. > I also tried "c++03" :(. This cannot work, we really need c++11 now. -- https://code.launchpad.net

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

2013-07-20 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug1201398 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug1201398/+merge/174809 -- https://code.launchpad.net/~widelands-dev/widelands/bug12013

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

2013-07-20 Thread SirVer
Review: Approve lgtm. I removed one unneeded boost header and merged to trunk. -- https://code.launchpad.net/~widelands-dev/widelands/bug1201398/+merge/174809 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug1201398. _

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

2013-07-20 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug1203121 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug1203121/+merge/175987 -- https://code.launchpad.net/~widelands-dev/widelands/bug12031

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

2013-07-20 Thread SirVer
I was in a merging mood, so I just merged this :). -- https://code.launchpad.net/~widelands-dev/widelands/bug1203121/+merge/175987 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug1203121. ___ Mailing list: https://

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

2013-07-20 Thread SirVer
Review: Approve I think the new solution is really nice. A rt::escape method would have been nice - but since there is more work to kill the old renderer and make the new one the only one this will come eventually. Merged. -- https://code.launchpad.net/~widelands-dev/widelands/bug657285/+merge

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

2013-07-20 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug657285 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug657285/+merge/175551 -- https://code.launchpad.net/~widelands-dev/widelands/bug657285/

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

2013-07-20 Thread cghislai
cghislai has proposed merging lp:~widelands-dev/widelands/game_end_summary into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/game_end_summary/+merge/176000 So I have the game end screen prototy

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

2013-07-20 Thread cghislai
Also please tell me about the code design. Currently player states are stored in the game class. The win scripts report results to the game controller, which builds a EndStatus struct and passes it to the game. Once states for all players have been gathered, game ask the interactive_base to show

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

2013-07-20 Thread Hans Joachim Desserud
Now that bug 1203121 has been fixed, I tried to merge this again, based on latest trunk. Results: Builds on Ubuntu 10.04 with GCC 4.4. Just for fun, I tried to install clang2.7 and see what happened, but it didn't even seem to have a clang++ binary? Anyways, Ubuntu 12.04: It builds fine with GCC

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

2013-07-20 Thread Tino
Review: Approve Ok, i'll give up. I've pushed a simple change wich allows compile this on mingw-win32. Longer explanation: With "std=c++11" mingw also implies strict ANSI mode. This disallows the usage of certain POSIX functions: - putenv() - strdup() - strcasecmp() - ... As I understand we wo

Re: [Widelands-dev] [Merge] lp:~peter.waller/widelands/toggle-fullscreen-rewrite into lp:widelands

2013-07-20 Thread Peter Waller
Hey, no worries sirver. Regarding "the right way to do it", I think it would be good if whilst in full screen we don't break alt-tab, which is currently the case. It just means if you happy to be in the multiplayer lobby waiting for someone to connect to you (say, you're hosting), you can't do