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

3 files changed, 5 insertions, 6 deletions

diff --git a/src/object/motion/motion.cpp b/src/object/motion/motion.cpp
index c3b74ee..df8a4be 100644
--- a/src/object/motion/motion.cpp
+++ b/src/object/motion/motion.cpp
@@ -17,14 +17,13 @@
 // motion.cpp
 
 
-#include <stdio.h>
-
 #include "object/motion/motion.h"
 
 #include "common/iman.h"
 #include "script/cmdtoken.h"
 
-
+#include <stdio.h>
+#include <string.h>
 
 
 // Object's constructor.
diff --git a/src/object/motion/motion.h b/src/object/motion/motion.h
index ef943d2..d195e65 100644
--- a/src/object/motion/motion.h
+++ b/src/object/motion/motion.h
@@ -20,7 +20,7 @@
 
 
 #include "common/event.h"
-#include "common/misc.h"
+#include "common/global.h"
 #include "object/object.h"
 
 
diff --git a/src/object/motion/motionvehicle.cpp b/src/object/motion/motionvehicle.cpp
index af69d40..1e54562 100644
--- a/src/object/motion/motionvehicle.cpp
+++ b/src/object/motion/motionvehicle.cpp
@@ -17,8 +17,6 @@
 // motionvehicle.cpp
 
 
-#include <stdio.h>
-
 #include "object/motion/motionvehicle.h"
 
 #include "graphics/engine/modelfile.h"
@@ -28,6 +26,8 @@
 #include "object/brain.h"
 #include "physics/physics.h"
 
+#include <stdio.h>
+#include <string.h>