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/object/robotmain.h b/src/object/robotmain.h
index 4ec897b..fead48d 100644
--- a/src/object/robotmain.h
+++ b/src/object/robotmain.h
@@ -189,11 +189,11 @@ public:
     void        ResetObject();
     void        ResetCreate();
     Error       CheckEndMission(bool frame);
-    void        CheckEndMessage(char *message);
+    void        CheckEndMessage(const char* message);
     int         GetObligatoryToken();
     char*       GetObligatoryToken(int i);
-    int         IsObligatoryToken(char *token);
-    bool        IsProhibitedToken(char *token);
+    int         IsObligatoryToken(const char* token);
+    bool        IsProhibitedToken(const char* token);
     void        UpdateMap();
     bool        GetShowMap();