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, 2 insertions, 3 deletions

diff --git a/src/ui/displaytext.cpp b/src/ui/displaytext.cpp
index aa51653..63075ee 100644
--- a/src/ui/displaytext.cpp
+++ b/src/ui/displaytext.cpp
@@ -28,7 +28,6 @@
 
 #include "common/event.h"
 #include "common/iman.h"
-#include "common/misc.h"
 #include "common/restext.h"
 
 #include "graphics/engine/engine.h"
@@ -180,7 +179,7 @@ void CDisplayText::DisplayError(Error err, Math::Vector goal, float height,
 
 // Displays text.
 
-void CDisplayText::DisplayText(char *text, CObject* pObj,
+void CDisplayText::DisplayText(const char *text, CObject* pObj,
                                float time, TextType type)
 {
     Math::Vector    pos;
@@ -196,7 +195,7 @@ void CDisplayText::DisplayText(char *text, CObject* pObj,
 
 // Displays text.
 
-void CDisplayText::DisplayText(char *text, Math::Vector goal, float height,
+void CDisplayText::DisplayText(const char *text, Math::Vector goal, float height,
                                float dist, float time, TextType type)
 {
     CObject*    toto;