Merge lp:~qcumber-some/widelands/bug1197429 into lp:widelands

[Jens Beyer]

Seems to be a visibility problem (and an easy fix).

But as with all C++ stuff, I'll let others decide if this really works as intended. ;-)

[Tino (tino79)]

Confirming successful build on win32.
But was the debugging option for gcc in the CMakeList.txt intended for the commit?

review: Needs Fixing

[Jens Beyer (qcumber-some)]

oops... no, this was not intended. ;-) I pushed the branch again...

[Nasenbaer (nasenbaer)]

I had the same question as Tino, but now that it is fixed... definitely approved!

review: Approve

[SirVer (sirver)]

C++ includes should be before any " " includes. Otherwise lgtm

=== modified file 'src/logic/ship.h'
--- src/logic/ship.h	2013-06-30 18:18:47 +0000
+++ src/logic/ship.h	2013-07-03 16:53:45 +0000
@@ -23,6 +23,7 @@
 #include "bob.h"
 #include "economy/shippingitem.h"
 #include "graphic/diranimations.h"
+#include <list>
 
 namespace UI {class Window;}
 class Interactive_GameBase;