Remove unnecessary #include "object/object.h"

src/common/restext.cpp

@@ -31,7 +31,7 @@
 
 #include "CBot/resource.h"
 
-#include "object/object.h"
+#include "object/object_type.h"
 #include "object/robotmain.h"
 
 #include <libintl.h>

src/object/brain.h

@@ -28,11 +28,11 @@
 #include "common/event.h"
 #include "common/misc.h"
 
-#include "object/object.h"
 #include "object/task/taskmanip.h"
 #include "object/task/taskflag.h"
 #include "object/task/taskshield.h"
 
+#include <vector>
 
 class COldObject;
 class CPhysics;

src/object/mainmovie.cpp

@@ -25,6 +25,7 @@
 #include "math/geometry.h"
 
 #include "object/motion/motionhuman.h"
+#include "object/object.h"
 #include "object/robotmain.h"
 
 

src/object/robotmain.h

@@ -30,7 +30,7 @@
 
 #include "graphics/engine/particle.h"
 
-#include "object/object.h"
+#include "object/object_type.h"
 #include "object/drive_type.h"
 #include "object/tool_type.h"
 #include "object/mainmovie.h"
@@ -38,8 +38,6 @@
 
 #include "app/pausemanager.h"
 
-#include <stdio.h>
-
 enum Phase
 {
     PHASE_INIT,
@@ -404,7 +402,7 @@ protected:
     float           m_gameTime;
     //! Playing time since level start, not dependent on simulation speed
     float           m_gameTimeAbsolute;
-    
+
     float           m_winDelay;
     float           m_lostDelay;
     bool            m_fixScene;        // scene fixed, no interraction

src/object/task/taskadvance.cpp

@@ -20,8 +20,12 @@
 
 #include "object/task/taskadvance.h"
 
+#include "graphics/engine/engine.h"
+
 #include "math/geometry.h"
 
+#include "object/object.h"
+
 #include "object/old_object.h"
 #include "physics/physics.h"
 

src/object/task/taskbuild.h

@@ -23,7 +23,9 @@
 
 
 #include "object/task/task.h"
-#include "object/object.h"
+
+#include "object/object_type.h"
+
 #include "math/vector.h"
 
 

src/object/task/taskdeletemark.h

@@ -23,7 +23,6 @@
 
 
 #include "object/task/task.h"
-#include "object/object.h"
 
 
 class CTaskDeleteMark : public CTask

src/object/task/taskflag.h

@@ -20,9 +20,9 @@
 
 #pragma once
 
-
 #include "object/task/task.h"
-#include "object/object.h"
+
+#include "object/object_type.h"
 
 #include "math/vector.h"
 

src/object/task/taskmanager.h

@@ -22,7 +22,6 @@
 #pragma once
 
 
-#include "object/object.h"
 #include "object/task/task.h"
 #include "object/task/taskmanip.h"
 #include "object/task/taskgoto.h"

src/object/task/taskmanip.h

@@ -23,7 +23,9 @@
 
 
 #include "object/task/task.h"
-#include "object/object.h"
+
+#include "object/object_type.h"
+
 #include "math/vector.h"
 
 

src/object/task/tasksearch.h

@@ -23,7 +23,8 @@
 
 
 #include "object/task/task.h"
-#include "object/object.h"
+
+#include "object/object_type.h"
 
 
 

src/object/task/taskspiderexplo.cpp

@@ -20,6 +20,7 @@
 
 #include "object/task/taskspiderexplo.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/pyro_manager.h"
 
 #include "object/motion/motionspider.h"

src/object/task/tasktake.h

@@ -23,7 +23,8 @@
 
 
 #include "object/task/task.h"
-#include "object/object.h"
+
+#include "object/object_type.h"
 
 
 class CObject;

src/physics/physics.h

@@ -27,10 +27,10 @@
 
 #include "common/global.h"
 
-#include "object/object.h"
-
 #include "math/vector.h"
 
+#include "object/object_type.h"
+
 
 class CObject;
 class COldObject;
@@ -39,6 +39,7 @@ class CMotion;
 class CSoundInterface;
 class CLevelParserLine;
 class CJostleableObject;
+struct Event;
 
 namespace Gfx {
 class CCamera;
@@ -47,6 +48,7 @@ class CLight;
 class CParticle;
 class CTerrain;
 class CWater;
+class CLightManager;
 }
 
 

src/script/cbottoken.cpp

@@ -20,7 +20,7 @@
 
 #include "script/cbottoken.h"
 
-#include "object/object.h"
+#include "object/object_type.h"
 #include "app/app.h"
 
 #include <string.h>
@@ -226,7 +226,7 @@ std::string GetHelpFilename(ObjectType type)
 std::string GetHelpFilename(const char *token)
 {
     std::string helpfile = "";
-    
+
     if ( strcmp(token, "if"            ) == 0 )  helpfile = "cbot/if";
     if ( strcmp(token, "else"          ) == 0 )  helpfile = "cbot/if";
     if ( strcmp(token, "for"           ) == 0 )  helpfile = "cbot/for";

src/ui/maindialog.h

@@ -23,6 +23,7 @@
 
 
 #include "graphics/core/color.h"
+#include "graphics/engine/camera.h"
 
 #include "object/robotmain.h"
 
@@ -72,7 +73,7 @@ class CMainDialog
 public:
     CMainDialog();
     ~CMainDialog();
-    
+
     void    Create();
 
     bool    EventProcess(const Event &event);
@@ -139,9 +140,9 @@ public:
 
     void    AllMissionUpdate();
     void    ShowSoluceUpdate();
-    
+
     std::string& GetUserLevelName(int id);
-    
+
     void    MakeSaveScreenshot(const std::string& name);
 
 protected:

src/ui/mainmap.h

@@ -27,8 +27,6 @@
 
 #include "math/point.h"
 
-#include "object/object.h"
-
 #include "ui/interface.h"
 
 

src/ui/mainshort.cpp

@@ -23,6 +23,7 @@
 #include "app/app.h"
 
 #include "object/object_manager.h"
+#include "object/object.h"
 
 
 namespace Ui {

src/ui/mainshort.h

@@ -25,8 +25,6 @@
 
 #include "math/point.h"
 
-#include "object/object.h"
-
 #include "graphics/engine/engine.h"
 
 #include "ui/interface.h"

src/ui/map.h

@@ -34,7 +34,6 @@
 
 #include "math/geometry.h"
 
-#include "object/object.h"
 #include "object/robotmain.h"
 
 

src/ui/target.h

@@ -28,7 +28,6 @@
 #include "graphics/engine/engine.h"
 
 #include "object/robotmain.h"
-#include "object/object.h"
 
 #include "ui/control.h"