Merge dev-common and various fixes to achieve compilation

- merged changes from dev-common
- fixed many compilation errors (CBrain, UI, ...)
- temporarily commented out some problematic code (e.g. input bindings)
- (partially) fixed #include styling
- everything compiles except for CRobotMain, CMainDialog and CStudio

1 files changed, 3 insertions, 3 deletions

diff --git a/src/ui/displaytext.h b/src/ui/displaytext.h
index b8af97e..5714cc5 100644
--- a/src/ui/displaytext.h
+++ b/src/ui/displaytext.h
@@ -21,7 +21,7 @@
 
 
 #include "common/event.h"
-#include "common/misc.h"
+#include "common/global.h"
 
 #include "sound/sound.h"
 
@@ -64,8 +64,8 @@ public:
 
     void        DisplayError(Error err, CObject* pObj, float time=10.0f);
     void        DisplayError(Error err, Math::Vector goal, float height=15.0f, float dist=60.0f, float time=10.0f);
-    void        DisplayText(char *text, CObject* pObj, float time=10.0f, TextType type=TT_INFO);
-    void        DisplayText(char *text, Math::Vector goal, float height=15.0f, float dist=60.0f, float time=10.0f, TextType type=TT_INFO);
+    void        DisplayText(const char *text, CObject* pObj, float time=10.0f, TextType type=TT_INFO);
+    void        DisplayText(const char *text, Math::Vector goal, float height=15.0f, float dist=60.0f, float time=10.0f, TextType type=TT_INFO);
     void        HideText(bool bHide);
     void        ClearText();
     bool        ClearLastText();