Moved files not directly related to CObject into src/level/ directory

src/CMakeLists.txt

@@ -125,6 +125,15 @@ set(BASE_SOURCES
     graphics/model/model_manager.cpp
     graphics/model/model_mesh.cpp
     graphics/model/model_output.cpp
+    level/level_category.cpp
+    level/mainmovie.cpp
+    level/player_profile.cpp
+    level/robotmain.cpp
+    level/scene_conditions.cpp
+    level/parser/parser.cpp
+    level/parser/parserexceptions.cpp
+    level/parser/parserline.cpp
+    level/parser/parserparam.cpp
     object/auto/auto.cpp
     object/auto/autobase.cpp
     object/auto/autoconvert.cpp
@@ -154,12 +163,6 @@ set(BASE_SOURCES
     object/implementation/power_container_impl.cpp
     object/implementation/programmable_impl.cpp
     object/implementation/task_executor_impl.cpp
-    object/level/parser.cpp
-    object/level/parserexceptions.cpp
-    object/level/parserline.cpp
-    object/level/parserparam.cpp
-    object/level_category.cpp
-    object/mainmovie.cpp
     object/motion/motion.cpp
     object/motion/motionant.cpp
     object/motion/motionbee.cpp
@@ -175,9 +178,6 @@ set(BASE_SOURCES
     object/object_manager.cpp
     object/old_object.cpp
     object/old_object_interface.cpp
-    object/player_profile.cpp
-    object/robotmain.cpp
-    object/scene_conditions.cpp
     object/task/task.cpp
     object/task/taskadvance.cpp
     object/task/taskbuild.cpp

src/app/app.cpp

@@ -39,7 +39,8 @@
 #include "graphics/opengl/glutil.h"
 
 #include "object/object_manager.h"
-#include "object/robotmain.h"
+
+#include "level/robotmain.h"
 
 #ifdef OPENAL_SOUND
     #include "sound/oalsound/alsound.h"

src/app/app.h

@@ -31,7 +31,7 @@
 
 #include "graphics/core/device.h"
 
-#include "object/level_category.h"
+#include "level/level_category.h"
 
 
 #include <string>

src/app/controller.cpp

@@ -22,7 +22,7 @@
 
 #include "common/make_unique.h"
 
-#include "object/robotmain.h"
+#include "level/robotmain.h"
 
 
 

src/app/controller.h

@@ -24,7 +24,7 @@
 
 #pragma once
 
-#include "object/level_category.h"
+#include "level/level_category.h"
 
 #include <memory>
 #include <string>

src/app/input.cpp

@@ -25,7 +25,7 @@
 
 #include "graphics/engine/engine.h"
 
-#include "object/robotmain.h"
+#include "level/robotmain.h"
 
 
 #include <sstream>

src/app/pausemanager.cpp

@@ -23,7 +23,7 @@
 
 #include "common/logger.h"
 
-#include "object/robotmain.h"
+#include "level/robotmain.h"
 
 
 template<> CPauseManager* CSingleton<CPauseManager>::m_instance = nullptr;

src/common/pathman.cpp

@@ -32,10 +32,6 @@
 
 #include "common/resources/resourcemanager.h"
 
-#include "object/robotmain.h"
-
-#include "object/level/parser.h"
-
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
 

src/common/pathman.h

@@ -32,7 +32,7 @@ class CSystemUtils;
 
 /**
  *  \class CPathManager
- *  \brief Class for managing data/lang/save paths, and %something% replacements
+ *  \brief Class for managing data/lang/save paths
  */
 class CPathManager : public CSingleton<CPathManager>
 {

src/common/restext.cpp

@@ -32,7 +32,6 @@
 #include "common/stringutils.h"
 
 #include "object/object_type.h"
-#include "object/robotmain.h"
 
 #include <libintl.h>
 #include <SDL_keyboard.h>

src/common/settings.cpp

@@ -26,7 +26,7 @@
 #include "graphics/engine/camera.h"
 #include "graphics/engine/engine.h"
 
-#include "object/robotmain.h"
+#include "level/robotmain.h"
 
 template<> CSettings* CSingleton<CSettings>::m_instance = nullptr;
 

src/graphics/engine/camera.cpp

@@ -27,12 +27,13 @@
 #include "graphics/engine/terrain.h"
 #include "graphics/engine/water.h"
 
+#include "level/robotmain.h"
+
 #include "math/const.h"
 #include "math/geometry.h"
 
 #include "object/object.h"
 #include "object/object_manager.h"
-#include "object/robotmain.h"
 
 #include "object/interface/carrier_object.h"
 #include "object/interface/movable_object.h"

src/graphics/engine/cloud.cpp

@@ -25,9 +25,9 @@
 #include "graphics/engine/engine.h"
 #include "graphics/engine/terrain.h"
 
-#include "math/geometry.h"
+#include "level/robotmain.h"
 
-#include "object/robotmain.h"
+#include "math/geometry.h"
 
 
 // Graphics module namespace

src/graphics/engine/engine.cpp

@@ -22,6 +22,7 @@
 
 #include "app/app.h"
 #include "app/input.h"
+#include "app/pausemanager.h"
 #include "app/system.h"
 
 #include "common/image.h"
@@ -49,6 +50,8 @@
 #include "graphics/model/model_mesh.h"
 #include "graphics/model/model_shadow_spot.h"
 
+#include "level/robotmain.h"
+
 #include "math/geometry.h"
 
 #include "sound/sound.h"

src/graphics/engine/lightning.cpp

@@ -28,11 +28,12 @@
 #include "graphics/engine/camera.h"
 #include "graphics/engine/terrain.h"
 
+#include "level/robotmain.h"
+
 #include "math/geometry.h"
 
 #include "object/object.h"
 #include "object/object_manager.h"
-#include "object/robotmain.h"
 
 #include "object/auto/autopowercaptor.h"
 

src/graphics/engine/particle.cpp

@@ -31,11 +31,12 @@
 #include "graphics/engine/text.h"
 #include "graphics/engine/water.h"
 
+#include "level/robotmain.h"
+
 #include "math/geometry.h"
 
 #include "object/object.h"
 #include "object/object_manager.h"
-#include "object/robotmain.h"
 
 #include <cstring>
 

src/graphics/engine/pyro.cpp

@@ -28,11 +28,12 @@
 #include "graphics/engine/particle.h"
 #include "graphics/engine/terrain.h"
 
+#include "level/robotmain.h"
+
 #include "math/geometry.h"
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 #include "object/motion/motionhuman.h"
 

src/graphics/engine/water.cpp

@@ -28,10 +28,11 @@
 #include "graphics/engine/engine.h"
 #include "graphics/engine/terrain.h"
 
+#include "level/robotmain.h"
+
 #include "math/geometry.h"
 
 #include "object/object.h"
-#include "object/robotmain.h"
 
 #include "sound/sound.h"
 

src/level/level_category.cpp

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see http://gnu.org/licenses
  */
-#include "object/level_category.h"
+#include "level/level_category.h"
 
 #include <map>
 

src/level/level_category.h

@@ -29,7 +29,7 @@ enum class LevelCategory
     CustomLevels = 4,
     Max,
 
-    // These are custom types not runnable by the user
+    // These are special types not runnable by the user
     Win,
     Lost,
     Perso,

src/level/mainmovie.cpp

@@ -18,14 +18,15 @@
  */
 
 
-#include "object/mainmovie.h"
+#include "level/mainmovie.h"
 
 #include "app/app.h"
 
+#include "level/robotmain.h"
+
 #include "math/geometry.h"
 
 #include "object/object.h"
-#include "object/robotmain.h"
 
 #include "object/interface/movable_object.h"
 

src/level/mainmovie.h

@@ -18,7 +18,7 @@
  */
 
 /**
- * \file object/mainmovie.h
+ * \file level/mainmovie.h
  * \brief CMainMovie - control over movie sequences
  */
 

src/level/parser/parser.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-#include "object/level/parser.h"
+#include "level/parser/parser.h"
 
 #include "app/app.h"
 
@@ -28,9 +28,9 @@
 #include "common/resources/outputstream.h"
 #include "common/resources/resourcemanager.h"
 
-#include "object/robotmain.h"
+#include "level/robotmain.h"
 
-#include "object/level/parserexceptions.h"
+#include "level/parser/parserexceptions.h"
 
 #include <string>
 #include <exception>

src/level/parser/parser.h

@@ -18,21 +18,21 @@
  */
 
 /**
- * \file object/level/parser.h
+ * \file level/parser/parser.h
  * \brief Parser for level files
  */
 
 #pragma once
 
-#include "object/level_category.h"
+#include "level/level_category.h"
 
 #include "common/make_unique.h"
 
-#include "object/robotmain.h"
+#include "level/robotmain.h"
 
-#include "object/level/parserexceptions.h"
+#include "level/parser/parserexceptions.h"
-#include "object/level/parserline.h"
+#include "level/parser/parserline.h"
-#include "object/level/parserparam.h"
+#include "level/parser/parserparam.h"
 
 #include <string>
 #include <vector>

src/level/parser/parserexceptions.cpp

@@ -17,9 +17,9 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-#include "object/level/parserexceptions.h"
+#include "level/parser/parserexceptions.h"
 
-#include "object/level/parser.h"
+#include "level/parser/parser.h"
 
 #include <boost/lexical_cast.hpp>
 

src/level/parser/parserexceptions.h

@@ -18,7 +18,7 @@
  */
 
 /**
- * \file object/level/parserexceptions.h
+ * \file level/parser/parserexceptions.h
  * \brief Exceptions that could be thrown in level parser
  */
 

src/level/parser/parserline.cpp

@@ -17,12 +17,12 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-#include "object/level/parserline.h"
+#include "level/parser/parserline.h"
 
 #include "common/logger.h"
 #include "common/make_unique.h"
 
-#include "object/level/parser.h"
+#include "level/parser/parser.h"
 
 CLevelParserLine::CLevelParserLine(std::string command)
 {

src/level/parser/parserline.h

@@ -18,13 +18,13 @@
  */
 
 /**
- * \file object/level/parserline.h
+ * \file level/parser/parserline.h
  * \brief Class for one line from level file
  */
 
 #pragma once
 
-#include "object/level/parserparam.h"
+#include "level/parser/parserparam.h"
 
 #include <string>
 #include <map>

src/level/parser/parserparam.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-#include "object/level/parserparam.h"
+#include "level/parser/parserparam.h"
 
 #include "app/app.h"
 
@@ -26,9 +26,9 @@
 
 #include "common/resources/resourcemanager.h"
 
-#include "object/robotmain.h"
+#include "level/robotmain.h"
 
-#include "object/level/parser.h"
+#include "level/parser/parser.h"
 
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>

src/level/parser/parserparam.h

@@ -18,7 +18,7 @@
  */
 
 /**
- * \file object/level/parserparam.h
+ * \file level/parser/parserparam.h
  * \brief Value of command argument in level file
  */
 

src/level/player_profile.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-#include "object/player_profile.h"
+#include "level/player_profile.h"
 
 #include "common/config_file.h"
 #include "common/logger.h"
@@ -28,9 +28,9 @@
 #include "common/resources/outputstream.h"
 #include "common/resources/resourcemanager.h"
 
-#include "object/robotmain.h"
+#include "level/robotmain.h"
 
-#include "object/level/parser.h"
+#include "level/parser/parser.h"
 
 
 void PlayerApperance::DefPerso()

src/level/player_profile.h

@@ -20,7 +20,7 @@
 
 #include "graphics/core/color.h"
 
-#include "object/level_category.h"
+#include "level/level_category.h"
 
 #include <string>
 #include <map>

src/level/robotmain.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-#include "object/robotmain.h"
+#include "level/robotmain.h"
 
 #include "CBot/CBotDll.h"
 
@@ -53,21 +53,22 @@
 
 #include "graphics/model/model_manager.h"
 
+#include "level/mainmovie.h"
+#include "level/player_profile.h"
+#include "level/scene_conditions.h"
+
+#include "level/parser/parser.h"
+
 #include "math/const.h"
 #include "math/geometry.h"
 
-#include "object/mainmovie.h"
 #include "object/object.h"
 #include "object/object_create_exception.h"
 #include "object/object_manager.h"
-#include "object/player_profile.h"
-#include "object/scene_conditions.h"
 
 #include "object/auto/auto.h"
 #include "object/auto/autobase.h"
 
-#include "object/level/parser.h"
-
 #include "object/motion/motion.h"
 #include "object/motion/motionhuman.h"
 #include "object/motion/motiontoto.h"

src/level/robotmain.h

@@ -18,7 +18,7 @@
  */
 
 /**
- * \file object/robotmain.h
+ * \file level/robotmain.h
  * \brief CRobotMain - main class of Colobot game engine
  */
 
@@ -29,12 +29,13 @@
 #include "common/global.h"
 #include "common/singleton.h"
 
+#include "level/level_category.h"
+#include "level/mainmovie.h"
+
 #include "graphics/engine/camera.h"
 #include "graphics/engine/particle.h"
 
 #include "object/drive_type.h"
-#include "object/level_category.h"
-#include "object/mainmovie.h"
 #include "object/mission_type.h"
 #include "object/object_type.h"
 #include "object/tool_type.h"

src/level/scene_conditions.cpp

@@ -17,18 +17,18 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-#include "object/scene_conditions.h"
+#include "level/scene_conditions.h"
 
 #include "math/geometry.h"
 
+#include "level/parser/parserline.h"
+
 #include "object/object.h"
 #include "object/object_manager.h"
 
 #include "object/interface/powered_object.h"
 #include "object/interface/transportable_object.h"
 
-#include "object/level/parserline.h"
-
 
 void CSceneCondition::Read(CLevelParserLine* line)
 {

src/level/scene_conditions.h

@@ -18,7 +18,7 @@
  */
 
 /**
- * \file object/scene_conditions.h
+ * \file level/scene_conditions.h
  * \brief Classes for managing conditions in scene files
  */
 

src/object/auto/auto.cpp

@@ -25,10 +25,12 @@
 #include "common/event.h"
 #include "common/make_unique.h"
 
-#include "object/old_object.h"
+#include "level/robotmain.h"
 
-#include "object/level/parserline.h"
+#include "level/parser/parserline.h"
-#include "object/level/parserparam.h"
+#include "level/parser/parserparam.h"
+
+#include "object/old_object.h"
 
 #include "ui/controls/gauge.h"
 #include "ui/controls/interface.h"

src/object/auto/autobase.cpp

@@ -25,16 +25,19 @@
 #include "graphics/engine/planet.h"
 #include "graphics/engine/terrain.h"
 
+#include "level/robotmain.h"
+
 #include "math/geometry.h"
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 #include "object/interface/transportable_object.h"
 
 #include "physics/physics.h"
 
+#include "sound/sound.h"
+
 #include "ui/controls/interface.h"
 #include "ui/controls/window.h"
 

src/object/auto/autoconvert.cpp

@@ -22,6 +22,11 @@
 
 #include "common/make_unique.h"
 
+#include "level/parser/parserline.h"
+#include "level/parser/parserparam.h"
+
+#include "level/robotmain.h"
+
 #include "math/geometry.h"
 
 #include "object/object_manager.h"
@@ -29,12 +34,11 @@
 
 #include "object/interface/transportable_object.h"
 
-#include "object/level/parserline.h"
-#include "object/level/parserparam.h"
-
 #include "ui/controls/interface.h"
 #include "ui/controls/window.h"
 
+#include "sound/sound.h"
+
 
 // Object's constructor.
 
@@ -481,4 +485,3 @@ void CAutoConvert::CreateMetal()
 
     m_main->DisplayError(INFO_CONVERT, m_object);
 }
-

src/object/auto/autoderrick.cpp

@@ -24,13 +24,15 @@
 
 #include "graphics/engine/terrain.h"
 
+#include "level/parser/parserline.h"
+#include "level/parser/parserparam.h"
+
 #include "math/geometry.h"
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
 
-#include "object/level/parserline.h"
+#include "sound/sound.h"
-#include "object/level/parserparam.h"
 
 #include "ui/controls/interface.h"
 #include "ui/controls/window.h"
@@ -536,4 +538,3 @@ Error CAutoDerrick::GetError()
     if ( m_phase == ADP_WAIT )  return ERR_DERRICK_NULL;
     return ERR_OK;
 }
-

src/object/auto/autodestroyer.cpp

@@ -24,11 +24,15 @@
 
 #include "graphics/engine/pyro_manager.h"
 
+#include "level/robotmain.h"
+
+#include "level/parser/parserline.h"
+#include "level/parser/parserparam.h"
+
 #include "object/object_manager.h"
 #include "object/old_object.h"
 
-#include "object/level/parserline.h"
+#include "sound/sound.h"
-#include "object/level/parserparam.h"
 
 #include "ui/controls/interface.h"
 #include "ui/controls/window.h"

src/object/auto/autoegg.cpp

@@ -24,6 +24,9 @@
 
 #include "graphics/engine/pyro_manager.h"
 
+#include "level/parser/parserline.h"
+#include "level/parser/parserparam.h"
+
 #include "math/geometry.h"
 
 #include "object/object_manager.h"
@@ -32,9 +35,6 @@
 #include "object/interface/programmable_object.h"
 #include "object/interface/transportable_object.h"
 
-#include "object/level/parserline.h"
-#include "object/level/parserparam.h"
-
 
 // Object's constructor.
 

src/object/auto/autofactory.cpp

@@ -25,21 +25,24 @@
 
 #include "math/geometry.h"
 
+#include "level/robotmain.h"
+
+#include "level/parser/parserline.h"
+#include "level/parser/parserparam.h"
+
 #include "object/object_create_params.h"
 #include "object/object_manager.h"
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 #include "object/interface/programmable_object.h"
 #include "object/interface/transportable_object.h"
 
-#include "object/level/parserline.h"
-#include "object/level/parserparam.h"
-
 #include "physics/physics.h"
 
 #include "script/script.h"
 
+#include "sound/sound.h"
+
 #include "ui/controls/interface.h"
 #include "ui/controls/window.h"
 

src/object/auto/autolabo.cpp

@@ -24,17 +24,18 @@
 #include "common/make_unique.h"
 #include "common/misc.h"
 
+#include "level/robotmain.h"
+
+#include "level/parser/parserline.h"
+#include "level/parser/parserparam.h"
+
 #include "math/geometry.h"
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 #include "object/interface/powered_object.h"
 
-#include "object/level/parserline.h"
-#include "object/level/parserparam.h"
-
 #include "ui/controls/interface.h"
 #include "ui/controls/window.h"
 

src/object/auto/automush.cpp

@@ -22,12 +22,12 @@
 
 #include "common/make_unique.h"
 
+#include "level/parser/parserline.h"
+#include "level/parser/parserparam.h"
+
 #include "object/object_manager.h"
 #include "object/old_object.h"
 
-#include "object/level/parserline.h"
-#include "object/level/parserparam.h"
-
 #include "sound/sound.h"
 
 
@@ -322,4 +322,3 @@ bool CAutoMush::Read(CLevelParserLine* line)
 
     return true;
 }
-

src/object/auto/autonest.cpp

@@ -24,12 +24,12 @@
 
 #include "graphics/engine/terrain.h"
 
+#include "level/parser/parserline.h"
+#include "level/parser/parserparam.h"
+
 #include "object/object_manager.h"
 #include "object/old_object.h"
 
-#include "object/level/parserline.h"
-#include "object/level/parserparam.h"
-
 
 // Object's constructor.
 
@@ -236,4 +236,3 @@ bool CAutoNest::Read(CLevelParserLine* line)
 
     return true;
 }
-

src/object/auto/autonuclearplant.cpp

@@ -24,14 +24,18 @@
 
 #include "math/geometry.h"
 
+#include "level/robotmain.h"
+
+#include "level/parser/parserline.h"
+#include "level/parser/parserparam.h"
+
 #include "object/object_manager.h"
 #include "object/old_object.h"
 
 #include "object/interface/powered_object.h"
 #include "object/interface/transportable_object.h"
 
-#include "object/level/parserline.h"
+#include "sound/sound.h"
-#include "object/level/parserparam.h"
 
 #include "ui/controls/interface.h"
 #include "ui/controls/window.h"
@@ -454,4 +458,3 @@ bool CAutoNuclearPlant::Read(CLevelParserLine* line)
 
     return true;
 }
-

src/object/auto/autoportico.cpp

@@ -22,8 +22,9 @@
 
 #include "common/stringutils.h"
 
+#include "level/robotmain.h"
+
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 
 const int PARAM_DEPOSE = 2;     // run=2 -> deposits the spaceship

src/object/auto/autopowercaptor.cpp

@@ -24,6 +24,9 @@
 
 #include "math/geometry.h"
 
+#include "level/parser/parserline.h"
+#include "level/parser/parserparam.h"
+
 #include "object/object_manager.h"
 #include "object/old_object.h"
 
@@ -31,8 +34,7 @@
 #include "object/interface/powered_object.h"
 #include "object/interface/transportable_object.h"
 
-#include "object/level/parserline.h"
+#include "sound/sound.h"
-#include "object/level/parserparam.h"
 
 #include "ui/controls/interface.h"
 #include "ui/controls/window.h"

src/object/auto/autopowerplant.cpp

@@ -24,6 +24,11 @@
 
 #include "graphics/engine/terrain.h"
 
+#include "level/robotmain.h"
+
+#include "level/parser/parserline.h"
+#include "level/parser/parserparam.h"
+
 #include "math/geometry.h"
 
 #include "object/object_manager.h"
@@ -32,8 +37,7 @@
 #include "object/interface/powered_object.h"
 #include "object/interface/transportable_object.h"
 
-#include "object/level/parserline.h"
+#include "sound/sound.h"
-#include "object/level/parserparam.h"
 
 #include "ui/controls/gauge.h"
 #include "ui/controls/interface.h"
@@ -609,4 +613,3 @@ bool CAutoPowerPlant::Read(CLevelParserLine* line)
 
     return true;
 }
-

src/object/auto/autopowerstation.cpp

@@ -31,6 +31,8 @@
 #include "object/interface/carrier_object.h"
 #include "object/interface/powered_object.h"
 
+#include "sound/sound.h"
+
 #include "ui/controls/gauge.h"
 #include "ui/controls/interface.h"
 #include "ui/controls/window.h"

src/object/auto/autoradar.cpp

@@ -25,6 +25,8 @@
 #include "object/object_manager.h"
 #include "object/old_object.h"
 
+#include "sound/sound.h"
+
 #include "ui/controls/gauge.h"
 #include "ui/controls/interface.h"
 #include "ui/controls/window.h"
@@ -297,4 +299,3 @@ bool CAutoRadar::SearchEnemy(Math::Vector &pos)
     pos = best->GetPosition();
     return true;
 }
-

src/object/auto/autorepair.cpp

@@ -22,14 +22,16 @@
 
 #include "common/make_unique.h"
 
+#include "level/parser/parserline.h"
+#include "level/parser/parserparam.h"
+
 #include "object/object_manager.h"
 #include "object/old_object.h"
 
-#include "object/level/parserline.h"
-#include "object/level/parserparam.h"
-
 #include "physics/physics.h"
 
+#include "sound/sound.h"
+
 #include "ui/controls/interface.h"
 #include "ui/controls/window.h"
 

src/object/auto/autoresearch.cpp

@@ -23,16 +23,17 @@
 #include "common/global.h"
 #include "common/make_unique.h"
 
+#include "level/robotmain.h"
+
+#include "level/parser/parserline.h"
+#include "level/parser/parserparam.h"
+
 #include "math/geometry.h"
 
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 #include "object/interface/powered_object.h"
 
-#include "object/level/parserline.h"
-#include "object/level/parserparam.h"
-
 #include "ui/controls/gauge.h"
 #include "ui/controls/interface.h"
 #include "ui/controls/window.h"

src/object/auto/autotower.cpp

@@ -22,6 +22,11 @@
 
 #include "common/make_unique.h"
 
+#include "level/robotmain.h"
+
+#include "level/parser/parserline.h"
+#include "level/parser/parserparam.h"
+
 #include "math/geometry.h"
 
 #include "object/object_manager.h"
@@ -29,11 +34,10 @@
 
 #include "object/interface/powered_object.h"
 
-#include "object/level/parserline.h"
-#include "object/level/parserparam.h"
-
 #include "physics/physics.h"
 
+#include "sound/sound.h"
+
 #include "ui/controls/gauge.h"
 #include "ui/controls/interface.h"
 #include "ui/controls/window.h"

src/object/auto/autovault.cpp

@@ -22,17 +22,18 @@
 
 #include "common/make_unique.h"
 
+#include "level/robotmain.h"
+
+#include "level/parser/parserline.h"
+#include "level/parser/parserparam.h"
+
 #include "math/geometry.h"
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 #include "object/interface/transportable_object.h"
 
-#include "object/level/parserline.h"
-#include "object/level/parserparam.h"
-
 #include "ui/controls/interface.h"
 #include "ui/controls/window.h"
 
@@ -556,4 +557,3 @@ CObject* CAutoVault::SearchVehicle()
     }
     return nullptr;
 }
-

src/object/implementation/programmable_impl.cpp

@@ -19,11 +19,12 @@
 
 #include "object/implementation/programmable_impl.h"
 
+#include "level/robotmain.h"
+
 #include "math/all.h"
 
 #include "object/object.h"
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 #include "object/interface/controllable_object.h"
 #include "object/interface/task_executor_object.h"

src/object/motion/motion.cpp

@@ -24,11 +24,12 @@
 
 #include "common/make_unique.h"
 
-#include "object/old_object.h"
+#include "level/robotmain.h"
-#include "object/robotmain.h"
 
-#include "object/level/parserline.h"
+#include "level/parser/parserline.h"
-#include "object/level/parserparam.h"
+#include "level/parser/parserparam.h"
+
+#include "object/old_object.h"
 
 
 

src/object/motion/motionhuman.cpp

@@ -26,11 +26,12 @@
 #include "graphics/engine/terrain.h"
 #include "graphics/engine/water.h"
 
+#include "level/robotmain.h"
+
 #include "math/geometry.h"
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 #include "object/interface/carrier_object.h"
 

src/object/motion/motiontoto.cpp

@@ -26,10 +26,11 @@
 #include "graphics/engine/terrain.h"
 #include "graphics/engine/water.h"
 
+#include "level/robotmain.h"
+
 #include "math/geometry.h"
 
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 
 #include <stdio.h>

src/object/object.cpp

@@ -22,7 +22,7 @@
 #include "common/restext.h"
 #include "common/stringutils.h"
 
-#include "object/robotmain.h"
+#include "level/robotmain.h"
 
 #include "graphics/model/model_crash_sphere.h"
 

src/object/object_factory.cpp

@@ -28,11 +28,12 @@
 
 #include "graphics/model/model_manager.h"
 
+#include "level/robotmain.h"
+
 #include "math/geometry.h"
 
 #include "object/object_create_params.h"
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 #include "object/auto/autobase.h"
 #include "object/auto/autoconvert.h"

src/object/old_object.cpp

@@ -34,18 +34,19 @@
 #include "graphics/engine/pyro_manager.h"
 #include "graphics/engine/terrain.h"
 
+#include "level/robotmain.h"
+
+#include "level/parser/parserexceptions.h"
+#include "level/parser/parserline.h"
+#include "level/parser/parserparam.h"
+
 #include "math/geometry.h"
 
 #include "object/object_manager.h"
-#include "object/robotmain.h"
 
 #include "object/auto/auto.h"
 #include "object/auto/autojostle.h"
 
-#include "object/level/parserexceptions.h"
-#include "object/level/parserline.h"
-#include "object/level/parserparam.h"
-
 #include "object/motion/motion.h"
 #include "object/motion/motionvehicle.h"
 

src/object/subclass/exchange_post.cpp

@@ -24,11 +24,13 @@
 
 #include "graphics/engine/oldmodelmanager.h"
 
+#include "level/parser/parserexceptions.h"
+#include "level/parser/parserline.h"
+#include "level/parser/parserparam.h"
+
 #include "object/object_create_params.h"
 
-#include "object/level/parserexceptions.h"
+#include "sound/sound.h"
-#include "object/level/parserline.h"
-#include "object/level/parserparam.h"
 
 #include "ui/controls/interface.h"
 #include "ui/controls/list.h"

src/object/task/task.cpp

@@ -22,8 +22,9 @@
 
 #include "app/app.h"
 
+#include "level/robotmain.h"
+
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 #include "object/interface/programmable_object.h"
 

src/object/task/taskbuild.cpp

@@ -27,11 +27,12 @@
 #include "graphics/engine/terrain.h"
 #include "graphics/engine/water.h"
 
+#include "level/robotmain.h"
+
 #include "math/geometry.h"
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 #include "object/auto/auto.h"
 

src/object/task/taskdeletemark.cpp

@@ -23,11 +23,12 @@
 #include "graphics/engine/particle.h"
 #include "graphics/engine/terrain.h"
 
+#include "level/robotmain.h"
+
 #include "math/geometry.h"
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 #include "physics/physics.h"
 

src/object/task/taskmanip.cpp

@@ -23,11 +23,12 @@
 #include "graphics/engine/pyro_manager.h"
 #include "graphics/engine/terrain.h"
 
+#include "level/robotmain.h"
+
 #include "math/geometry.h"
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 #include "object/interface/carrier_object.h"
 #include "object/interface/powered_object.h"

src/object/task/taskrecover.cpp

@@ -22,11 +22,12 @@
 
 #include "graphics/engine/particle.h"
 
+#include "level/robotmain.h"
+
 #include "math/geometry.h"
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 #include "object/interface/powered_object.h"
 

src/object/task/tasksearch.cpp

@@ -23,11 +23,12 @@
 #include "graphics/engine/particle.h"
 #include "graphics/engine/terrain.h"
 
+#include "level/robotmain.h"
+
 #include "math/geometry.h"
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 #include "physics/physics.h"
 
@@ -301,4 +302,3 @@ void CTaskSearch::DeleteMark(ObjectType type)
         CObjectManager::GetInstancePointer()->DeleteObject(obj);
     }
 }
-

src/object/task/taskshield.cpp

@@ -25,11 +25,12 @@
 #include "graphics/engine/lightman.h"
 #include "graphics/engine/particle.h"
 
+#include "level/robotmain.h"
+
 #include "math/geometry.h"
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 #include "object/interface/powered_object.h"
 

src/object/task/tasktake.cpp

@@ -23,11 +23,12 @@
 #include "graphics/engine/terrain.h"
 #include "graphics/engine/water.h"
 
+#include "level/robotmain.h"
+
 #include "math/geometry.h"
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 #include "object/interface/carrier_object.h"
 #include "object/interface/powered_object.h"
@@ -574,4 +575,3 @@ bool CTaskTake::IsFreeDeposeObject(Math::Vector pos)
     }
     return true;  // location free
 }
-

src/object/task/taskterraform.cpp

@@ -25,9 +25,10 @@
 
 #include "math/geometry.h"
 
+#include "level/robotmain.h"
+
 #include "object/object_manager.h"
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 #include "object/interface/powered_object.h"
 

src/object/task/taskturn.cpp

@@ -22,8 +22,9 @@
 
 #include "graphics/engine/terrain.h"
 
+#include "level/robotmain.h"
+
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 #include "physics/physics.h"
 
@@ -130,4 +131,3 @@ Error CTaskTurn::IsEnded()
 
     return ERR_CONTINUE;
 }
-

src/physics/physics.cpp

@@ -33,20 +33,21 @@
 #include "graphics/engine/terrain.h"
 #include "graphics/engine/water.h"
 
+#include "level/robotmain.h"
+
+#include "level/parser/parserline.h"
+#include "level/parser/parserparam.h"
+
 #include "math/geometry.h"
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 #include "object/interface/carrier_object.h"
 #include "object/interface/jostleable_object.h"
 #include "object/interface/powered_object.h"
 #include "object/interface/transportable_object.h"
 
-#include "object/level/parserline.h"
-#include "object/level/parserparam.h"
-
 #include "object/motion/motion.h"
 #include "object/motion/motionhuman.h"
 #include "object/motion/motionvehicle.h"

src/script/script.cpp

@@ -32,8 +32,9 @@
 #include "graphics/engine/engine.h"
 #include "graphics/engine/text.h"
 
+#include "level/robotmain.h"
+
 #include "object/old_object.h"
-#include "object/robotmain.h"
 
 #include "script/cbottoken.h"
 

src/script/scriptfunc.cpp

@@ -33,11 +33,14 @@
 #include "graphics/engine/terrain.h"
 #include "graphics/engine/water.h"
 
+#include "level/robotmain.h"
+
+#include "level/parser/parser.h"
+
 #include "math/all.h"
 
 #include "object/object.h"
 #include "object/object_manager.h"
-#include "object/robotmain.h"
 
 #include "object/auto/auto.h"
 #include "object/auto/autobase.h"
@@ -47,8 +50,6 @@
 #include "object/interface/task_executor_object.h"
 #include "object/interface/trace_drawing_object.h"
 
-#include "object/level/parser.h"
-
 #include "object/subclass/exchange_post.h"
 
 #include "object/task/taskmanager.h"

src/ui/controls/control.cpp

@@ -24,7 +24,7 @@
 
 #include "common/restext.h"
 
-#include "object/robotmain.h"
+#include "level/robotmain.h"
 
 
 

src/ui/controls/edit.cpp

@@ -32,9 +32,9 @@
 #include "common/resources/inputstream.h"
 #include "common/resources/outputstream.h"
 
-#include "object/level/parser.h"
+#include "graphics/engine/engine.h"
 
-#include "object/robotmain.h"
+#include "level/parser/parser.h"
 
 #include "ui/controls/scroll.h"
 

src/ui/controls/editvalue.cpp

@@ -24,7 +24,7 @@
 #include "common/make_unique.h"
 #include "common/misc.h"
 
-#include "object/robotmain.h"
+#include "level/robotmain.h"
 
 #include "ui/controls/button.h"
 #include "ui/controls/edit.h"

src/ui/controls/interface.cpp

@@ -22,6 +22,8 @@
 
 #include "app/app.h"
 
+#include "level/robotmain.h"
+
 #include <boost/range/adaptor/reversed.hpp>
 
 

src/ui/controls/map.cpp

@@ -27,9 +27,9 @@
 #include "graphics/engine/terrain.h"
 #include "graphics/engine/water.h"
 
-#include "math/geometry.h"
+#include "level/robotmain.h"
 
-#include "object/robotmain.h"
+#include "math/geometry.h"
 
 #include "object/interface/controllable_object.h"
 #include "object/interface/transportable_object.h"

src/ui/controls/target.cpp

@@ -20,6 +20,8 @@
 
 #include "ui/controls/target.h"
 
+#include "level/robotmain.h"
+
 #include "object/object_manager.h"
 #include "object/old_object.h"
 

src/ui/controls/target.h

@@ -27,8 +27,6 @@
 
 #include "graphics/engine/engine.h"
 
-#include "object/robotmain.h"
-
 #include "ui/controls/control.h"
 
 #include <string>
@@ -55,4 +53,3 @@ protected:
 
 
 }
-

src/ui/displayinfo.cpp

@@ -33,9 +33,10 @@
 #include "graphics/engine/lightman.h"
 #include "graphics/engine/particle.h"
 
+#include "level/robotmain.h"
+
 #include "object/object.h"
 #include "object/object_manager.h"
-#include "object/robotmain.h"
 
 #include "object/interface/movable_object.h"
 

src/ui/displaytext.cpp

@@ -27,6 +27,8 @@
 
 #include "graphics/engine/engine.h"
 
+#include "level/robotmain.h"
+
 #include "object/object.h"
 #include "object/object_manager.h"
 
@@ -35,6 +37,8 @@
 #include "object/motion/motion.h"
 #include "object/motion/motiontoto.h"
 
+#include "sound/sound.h"
+
 #include "ui/controls/button.h"
 #include "ui/controls/group.h"
 #include "ui/controls/interface.h"

src/ui/maindialog.cpp

@@ -29,8 +29,8 @@
 #include "common/make_unique.h"
 #include "common/settings.h"
 
-#include "object/player_profile.h"
+#include "level/robotmain.h"
-#include "object/robotmain.h"
+#include "level/player_profile.h"
 
 #include "sound/sound.h"
 

src/ui/mainmap.cpp

@@ -22,6 +22,8 @@
 
 #include "app/app.h"
 
+#include "level/robotmain.h"
+
 
 namespace Ui
 {

src/ui/mainshort.cpp

@@ -24,6 +24,8 @@
 
 #include "common/logger.h"
 
+#include "level/robotmain.h"
+
 #include "object/object.h"
 #include "object/object_manager.h"
 

src/ui/mainui.cpp

@@ -29,7 +29,7 @@
 
 #include "common/resources/resourcemanager.h"
 
-#include "object/robotmain.h"
+#include "level/robotmain.h"
 
 #include "sound/sound.h"
 

src/ui/mainui.h

@@ -18,7 +18,7 @@
  */
 #pragma once
 
-#include "object/robotmain.h"
+#include "level/robotmain.h"
 
 #include <vector>
 

src/ui/object_interface.cpp

@@ -26,6 +26,8 @@
 #include "graphics/engine/terrain.h"
 #include "graphics/engine/water.h"
 
+#include "level/robotmain.h"
+
 #include "math/geometry.h"
 
 #include "object/old_object.h"

src/ui/screen/screen.cpp

@@ -25,7 +25,7 @@
 
 #include "graphics/engine/engine.h"
 
-#include "object/robotmain.h"
+#include "level/robotmain.h"
 
 #include "ui/controls/interface.h"
 #include "ui/controls/label.h"

src/ui/screen/screen_apperance.cpp

@@ -21,11 +21,11 @@
 
 #include "app/app.h"
 
-#include "object/player_profile.h"
-#include "object/robotmain.h"
-
 #include "graphics/engine/camera.h"
 
+#include "level/player_profile.h"
+#include "level/robotmain.h"
+
 #include "ui/controls/button.h"
 #include "ui/controls/color.h"
 #include "ui/controls/interface.h"

src/ui/screen/screen_io.cpp

@@ -22,10 +22,10 @@
 #include "common/logger.h"
 #include "common/stringutils.h"
 
-#include "object/level/parser.h"
+#include "level/player_profile.h"
+#include "level/robotmain.h"
 
-#include "object/player_profile.h"
+#include "level/parser/parser.h"
-#include "object/robotmain.h"
 
 #include "ui/screen/screen_level_list.h"
 

src/ui/screen/screen_io_read.cpp

@@ -21,6 +21,8 @@
 
 #include "app/app.h"
 
+#include "level/robotmain.h"
+
 #include "ui/controls/button.h"
 #include "ui/controls/interface.h"
 #include "ui/controls/image.h"

src/ui/screen/screen_io_write.cpp

@@ -21,6 +21,8 @@
 
 #include "app/app.h"
 
+#include "level/robotmain.h"
+
 #include "ui/controls/button.h"
 #include "ui/controls/edit.h"
 #include "ui/controls/interface.h"

src/ui/screen/screen_level_list.cpp

@@ -25,9 +25,9 @@
 
 #include "common/resources/resourcemanager.h"
 
-#include "object/player_profile.h"
+#include "level/player_profile.h"
 
-#include "object/level/parser.h"
+#include "level/parser/parser.h"
 
 #include "ui/maindialog.h"
 

src/ui/screen/screen_level_list.h

@@ -21,7 +21,7 @@
 
 #include "ui/screen/screen.h"
 
-#include "object/level_category.h"
+#include "level/level_category.h"
 
 #include <map>
 #include <vector>

src/ui/screen/screen_main_menu.cpp

@@ -23,7 +23,7 @@
 
 #include "common/logger.h"
 
-#include "object/level/parser.h"
+#include "level/parser/parser.h"
 
 #include "ui/controls/button.h"
 #include "ui/controls/group.h"