From ff957afefc7e311b137e7da9d1020df17ff75946 Mon Sep 17 00:00:00 2001 From: krzys-h Date: Thu, 13 Aug 2015 11:47:32 +0200 Subject: [PATCH] Moved files not directly related to CObject into src/level/ directory --- src/CMakeLists.txt | 18 +++++++++--------- src/app/app.cpp | 3 ++- src/app/app.h | 2 +- src/app/controller.cpp | 2 +- src/app/controller.h | 2 +- src/app/input.cpp | 2 +- src/app/pausemanager.cpp | 2 +- src/common/pathman.cpp | 4 ---- src/common/pathman.h | 2 +- src/common/restext.cpp | 1 - src/common/settings.cpp | 2 +- src/graphics/engine/camera.cpp | 3 ++- src/graphics/engine/cloud.cpp | 4 ++-- src/graphics/engine/engine.cpp | 3 +++ src/graphics/engine/lightning.cpp | 3 ++- src/graphics/engine/particle.cpp | 3 ++- src/graphics/engine/pyro.cpp | 3 ++- src/graphics/engine/water.cpp | 3 ++- src/{object => level}/level_category.cpp | 2 +- src/{object => level}/level_category.h | 2 +- src/{object => level}/mainmovie.cpp | 5 +++-- src/{object => level}/mainmovie.h | 2 +- src/{object/level => level/parser}/parser.cpp | 6 +++--- src/{object/level => level/parser}/parser.h | 12 ++++++------ .../parser}/parserexceptions.cpp | 4 ++-- .../level => level/parser}/parserexceptions.h | 2 +- .../level => level/parser}/parserline.cpp | 4 ++-- .../level => level/parser}/parserline.h | 4 ++-- .../level => level/parser}/parserparam.cpp | 6 +++--- .../level => level/parser}/parserparam.h | 2 +- src/{object => level}/player_profile.cpp | 6 +++--- src/{object => level}/player_profile.h | 2 +- src/{object => level}/robotmain.cpp | 13 +++++++------ src/{object => level}/robotmain.h | 7 ++++--- src/{object => level}/scene_conditions.cpp | 6 +++--- src/{object => level}/scene_conditions.h | 2 +- src/object/auto/auto.cpp | 8 +++++--- src/object/auto/autobase.cpp | 5 ++++- src/object/auto/autoconvert.cpp | 11 +++++++---- src/object/auto/autoderrick.cpp | 7 ++++--- src/object/auto/autodestroyer.cpp | 8 ++++++-- src/object/auto/autoegg.cpp | 6 +++--- src/object/auto/autofactory.cpp | 11 +++++++---- src/object/auto/autolabo.cpp | 9 +++++---- src/object/auto/automush.cpp | 7 +++---- src/object/auto/autonest.cpp | 7 +++---- src/object/auto/autonuclearplant.cpp | 9 ++++++--- src/object/auto/autoportico.cpp | 3 ++- src/object/auto/autopowercaptor.cpp | 6 ++++-- src/object/auto/autopowerplant.cpp | 9 ++++++--- src/object/auto/autopowerstation.cpp | 2 ++ src/object/auto/autoradar.cpp | 3 ++- src/object/auto/autorepair.cpp | 8 +++++--- src/object/auto/autoresearch.cpp | 9 +++++---- src/object/auto/autotower.cpp | 10 +++++++--- src/object/auto/autovault.cpp | 10 +++++----- .../implementation/programmable_impl.cpp | 3 ++- src/object/motion/motion.cpp | 9 +++++---- src/object/motion/motionhuman.cpp | 3 ++- src/object/motion/motiontoto.cpp | 3 ++- src/object/object.cpp | 2 +- src/object/object_factory.cpp | 3 ++- src/object/old_object.cpp | 11 ++++++----- src/object/subclass/exchange_post.cpp | 8 +++++--- src/object/task/task.cpp | 3 ++- src/object/task/taskbuild.cpp | 3 ++- src/object/task/taskdeletemark.cpp | 3 ++- src/object/task/taskmanip.cpp | 3 ++- src/object/task/taskrecover.cpp | 3 ++- src/object/task/tasksearch.cpp | 4 ++-- src/object/task/taskshield.cpp | 3 ++- src/object/task/tasktake.cpp | 4 ++-- src/object/task/taskterraform.cpp | 3 ++- src/object/task/taskturn.cpp | 4 ++-- src/physics/physics.cpp | 9 +++++---- src/script/script.cpp | 3 ++- src/script/scriptfunc.cpp | 7 ++++--- src/ui/controls/control.cpp | 2 +- src/ui/controls/edit.cpp | 4 ++-- src/ui/controls/editvalue.cpp | 2 +- src/ui/controls/interface.cpp | 2 ++ src/ui/controls/map.cpp | 4 ++-- src/ui/controls/target.cpp | 2 ++ src/ui/controls/target.h | 3 --- src/ui/displayinfo.cpp | 3 ++- src/ui/displaytext.cpp | 4 ++++ src/ui/maindialog.cpp | 4 ++-- src/ui/mainmap.cpp | 2 ++ src/ui/mainshort.cpp | 2 ++ src/ui/mainui.cpp | 2 +- src/ui/mainui.h | 2 +- src/ui/object_interface.cpp | 2 ++ src/ui/screen/screen.cpp | 2 +- src/ui/screen/screen_apperance.cpp | 6 +++--- src/ui/screen/screen_io.cpp | 8 ++++---- src/ui/screen/screen_io_read.cpp | 2 ++ src/ui/screen/screen_io_write.cpp | 2 ++ src/ui/screen/screen_level_list.cpp | 4 ++-- src/ui/screen/screen_level_list.h | 2 +- src/ui/screen/screen_main_menu.cpp | 2 +- src/ui/screen/screen_player_select.cpp | 6 +++++- src/ui/screen/screen_quit.cpp | 2 ++ src/ui/screen/screen_setup.h | 2 +- src/ui/screen/screen_welcome.cpp | 2 ++ src/ui/studio.cpp | 4 +++- 105 files changed, 280 insertions(+), 195 deletions(-) rename src/{object => level}/level_category.cpp (98%) rename src/{object => level}/level_category.h (95%) rename src/{object => level}/mainmovie.cpp (98%) rename src/{object => level}/mainmovie.h (98%) rename src/{object/level => level/parser}/parser.cpp (99%) rename src/{object/level => level/parser}/parser.h (93%) rename src/{object/level => level/parser}/parserexceptions.cpp (96%) rename src/{object/level => level/parser}/parserexceptions.h (97%) rename src/{object/level => level/parser}/parserline.cpp (97%) rename src/{object/level => level/parser}/parserline.h (96%) rename src/{object/level => level/parser}/parserparam.cpp (99%) rename src/{object/level => level/parser}/parserparam.h (99%) rename src/{object => level}/player_profile.cpp (99%) rename src/{object => level}/player_profile.h (99%) rename src/{object => level}/robotmain.cpp (99%) rename src/{object => level}/robotmain.h (99%) rename src/{object => level}/scene_conditions.cpp (98%) rename src/{object => level}/scene_conditions.h (98%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b53eb517..5fede92a 100644 --- a/src/CMakeLists.txt +++ b/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 diff --git a/src/app/app.cpp b/src/app/app.cpp index 15ddf290..baef7bf6 100644 --- a/src/app/app.cpp +++ b/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" diff --git a/src/app/app.h b/src/app/app.h index 0ec5334d..c730d659 100644 --- a/src/app/app.h +++ b/src/app/app.h @@ -31,7 +31,7 @@ #include "graphics/core/device.h" -#include "object/level_category.h" +#include "level/level_category.h" #include diff --git a/src/app/controller.cpp b/src/app/controller.cpp index 20fe8df7..4dc3d473 100644 --- a/src/app/controller.cpp +++ b/src/app/controller.cpp @@ -22,7 +22,7 @@ #include "common/make_unique.h" -#include "object/robotmain.h" +#include "level/robotmain.h" diff --git a/src/app/controller.h b/src/app/controller.h index 6f567f91..2f31a614 100644 --- a/src/app/controller.h +++ b/src/app/controller.h @@ -24,7 +24,7 @@ #pragma once -#include "object/level_category.h" +#include "level/level_category.h" #include #include diff --git a/src/app/input.cpp b/src/app/input.cpp index 57a8d880..e5b0f5b4 100644 --- a/src/app/input.cpp +++ b/src/app/input.cpp @@ -25,7 +25,7 @@ #include "graphics/engine/engine.h" -#include "object/robotmain.h" +#include "level/robotmain.h" #include diff --git a/src/app/pausemanager.cpp b/src/app/pausemanager.cpp index 0cb4ab50..4d6d8209 100644 --- a/src/app/pausemanager.cpp +++ b/src/app/pausemanager.cpp @@ -23,7 +23,7 @@ #include "common/logger.h" -#include "object/robotmain.h" +#include "level/robotmain.h" template<> CPauseManager* CSingleton::m_instance = nullptr; diff --git a/src/common/pathman.cpp b/src/common/pathman.cpp index f74bc127..8f4424e0 100644 --- a/src/common/pathman.cpp +++ b/src/common/pathman.cpp @@ -32,10 +32,6 @@ #include "common/resources/resourcemanager.h" -#include "object/robotmain.h" - -#include "object/level/parser.h" - #include #include diff --git a/src/common/pathman.h b/src/common/pathman.h index 0af3f701..58a860d0 100644 --- a/src/common/pathman.h +++ b/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 { diff --git a/src/common/restext.cpp b/src/common/restext.cpp index 38e35043..2a185bb4 100644 --- a/src/common/restext.cpp +++ b/src/common/restext.cpp @@ -32,7 +32,6 @@ #include "common/stringutils.h" #include "object/object_type.h" -#include "object/robotmain.h" #include #include diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 6fc73400..c29854eb 100644 --- a/src/common/settings.cpp +++ b/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::m_instance = nullptr; diff --git a/src/graphics/engine/camera.cpp b/src/graphics/engine/camera.cpp index e27af21d..8915e01c 100644 --- a/src/graphics/engine/camera.cpp +++ b/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" diff --git a/src/graphics/engine/cloud.cpp b/src/graphics/engine/cloud.cpp index bb68d9a0..25ab7f5e 100644 --- a/src/graphics/engine/cloud.cpp +++ b/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 diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp index dc6e0a8a..23976628 100644 --- a/src/graphics/engine/engine.cpp +++ b/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" diff --git a/src/graphics/engine/lightning.cpp b/src/graphics/engine/lightning.cpp index 9bbf1d62..0bada54d 100644 --- a/src/graphics/engine/lightning.cpp +++ b/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" diff --git a/src/graphics/engine/particle.cpp b/src/graphics/engine/particle.cpp index 22c1155e..5acd3a9d 100644 --- a/src/graphics/engine/particle.cpp +++ b/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 diff --git a/src/graphics/engine/pyro.cpp b/src/graphics/engine/pyro.cpp index 7ac54a9e..bd3cf108 100644 --- a/src/graphics/engine/pyro.cpp +++ b/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" diff --git a/src/graphics/engine/water.cpp b/src/graphics/engine/water.cpp index dc8ecfbf..61c16813 100644 --- a/src/graphics/engine/water.cpp +++ b/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" diff --git a/src/object/level_category.cpp b/src/level/level_category.cpp similarity index 98% rename from src/object/level_category.cpp rename to src/level/level_category.cpp index 72de9141..10d50a04 100644 --- a/src/object/level_category.cpp +++ b/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 diff --git a/src/object/level_category.h b/src/level/level_category.h similarity index 95% rename from src/object/level_category.h rename to src/level/level_category.h index be6a3f0a..7f16b528 100644 --- a/src/object/level_category.h +++ b/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, diff --git a/src/object/mainmovie.cpp b/src/level/mainmovie.cpp similarity index 98% rename from src/object/mainmovie.cpp rename to src/level/mainmovie.cpp index 8094f49e..73b111ba 100644 --- a/src/object/mainmovie.cpp +++ b/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" diff --git a/src/object/mainmovie.h b/src/level/mainmovie.h similarity index 98% rename from src/object/mainmovie.h rename to src/level/mainmovie.h index c76e7537..206cfd8e 100644 --- a/src/object/mainmovie.h +++ b/src/level/mainmovie.h @@ -18,7 +18,7 @@ */ /** - * \file object/mainmovie.h + * \file level/mainmovie.h * \brief CMainMovie - control over movie sequences */ diff --git a/src/object/level/parser.cpp b/src/level/parser/parser.cpp similarity index 99% rename from src/object/level/parser.cpp rename to src/level/parser/parser.cpp index 8cce9b6b..554104ed 100644 --- a/src/object/level/parser.cpp +++ b/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 #include diff --git a/src/object/level/parser.h b/src/level/parser/parser.h similarity index 93% rename from src/object/level/parser.h rename to src/level/parser/parser.h index 3ced2b06..ae2dc157 100644 --- a/src/object/level/parser.h +++ b/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 "object/level/parserline.h" -#include "object/level/parserparam.h" +#include "level/parser/parserexceptions.h" +#include "level/parser/parserline.h" +#include "level/parser/parserparam.h" #include #include diff --git a/src/object/level/parserexceptions.cpp b/src/level/parser/parserexceptions.cpp similarity index 96% rename from src/object/level/parserexceptions.cpp rename to src/level/parser/parserexceptions.cpp index d7f3f09b..4dc09fe3 100644 --- a/src/object/level/parserexceptions.cpp +++ b/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 diff --git a/src/object/level/parserexceptions.h b/src/level/parser/parserexceptions.h similarity index 97% rename from src/object/level/parserexceptions.h rename to src/level/parser/parserexceptions.h index b4a4d634..6d53b76f 100644 --- a/src/object/level/parserexceptions.h +++ b/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 */ diff --git a/src/object/level/parserline.cpp b/src/level/parser/parserline.cpp similarity index 97% rename from src/object/level/parserline.cpp rename to src/level/parser/parserline.cpp index 6b97b898..e34536c0 100644 --- a/src/object/level/parserline.cpp +++ b/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) { diff --git a/src/object/level/parserline.h b/src/level/parser/parserline.h similarity index 96% rename from src/object/level/parserline.h rename to src/level/parser/parserline.h index 9478fcd5..d104cd74 100644 --- a/src/object/level/parserline.h +++ b/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 #include diff --git a/src/object/level/parserparam.cpp b/src/level/parser/parserparam.cpp similarity index 99% rename from src/object/level/parserparam.cpp rename to src/level/parser/parserparam.cpp index ddad2dcf..5c911bc6 100644 --- a/src/object/level/parserparam.cpp +++ b/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 #include diff --git a/src/object/level/parserparam.h b/src/level/parser/parserparam.h similarity index 99% rename from src/object/level/parserparam.h rename to src/level/parser/parserparam.h index b22fb552..d5ea3b37 100644 --- a/src/object/level/parserparam.h +++ b/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 */ diff --git a/src/object/player_profile.cpp b/src/level/player_profile.cpp similarity index 99% rename from src/object/player_profile.cpp rename to src/level/player_profile.cpp index be2f9403..ad09f546 100644 --- a/src/object/player_profile.cpp +++ b/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() diff --git a/src/object/player_profile.h b/src/level/player_profile.h similarity index 99% rename from src/object/player_profile.h rename to src/level/player_profile.h index 1ca939f8..2d0a817e 100644 --- a/src/object/player_profile.h +++ b/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 #include diff --git a/src/object/robotmain.cpp b/src/level/robotmain.cpp similarity index 99% rename from src/object/robotmain.cpp rename to src/level/robotmain.cpp index 8f258e43..c6596320 100644 --- a/src/object/robotmain.cpp +++ b/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" diff --git a/src/object/robotmain.h b/src/level/robotmain.h similarity index 99% rename from src/object/robotmain.h rename to src/level/robotmain.h index 2d9ac052..33b6a726 100644 --- a/src/object/robotmain.h +++ b/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" diff --git a/src/object/scene_conditions.cpp b/src/level/scene_conditions.cpp similarity index 98% rename from src/object/scene_conditions.cpp rename to src/level/scene_conditions.cpp index 3526e362..6353046d 100644 --- a/src/object/scene_conditions.cpp +++ b/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) { diff --git a/src/object/scene_conditions.h b/src/level/scene_conditions.h similarity index 98% rename from src/object/scene_conditions.h rename to src/level/scene_conditions.h index f94537d3..5e593737 100644 --- a/src/object/scene_conditions.h +++ b/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 */ diff --git a/src/object/auto/auto.cpp b/src/object/auto/auto.cpp index b9381b41..d0b8ef26 100644 --- a/src/object/auto/auto.cpp +++ b/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 "object/level/parserparam.h" +#include "level/parser/parserline.h" +#include "level/parser/parserparam.h" + +#include "object/old_object.h" #include "ui/controls/gauge.h" #include "ui/controls/interface.h" diff --git a/src/object/auto/autobase.cpp b/src/object/auto/autobase.cpp index af97f03a..7c0becd1 100644 --- a/src/object/auto/autobase.cpp +++ b/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" diff --git a/src/object/auto/autoconvert.cpp b/src/object/auto/autoconvert.cpp index 559940c6..fb5e8828 100644 --- a/src/object/auto/autoconvert.cpp +++ b/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); } - diff --git a/src/object/auto/autoderrick.cpp b/src/object/auto/autoderrick.cpp index 2bdc7398..95a44546 100644 --- a/src/object/auto/autoderrick.cpp +++ b/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 "object/level/parserparam.h" +#include "sound/sound.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; } - diff --git a/src/object/auto/autodestroyer.cpp b/src/object/auto/autodestroyer.cpp index bd6bb6f6..857030fd 100644 --- a/src/object/auto/autodestroyer.cpp +++ b/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 "object/level/parserparam.h" +#include "sound/sound.h" #include "ui/controls/interface.h" #include "ui/controls/window.h" diff --git a/src/object/auto/autoegg.cpp b/src/object/auto/autoegg.cpp index 0a2e197d..7eb8e9ac 100644 --- a/src/object/auto/autoegg.cpp +++ b/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. diff --git a/src/object/auto/autofactory.cpp b/src/object/auto/autofactory.cpp index 1a3a0d5e..20f3a95f 100644 --- a/src/object/auto/autofactory.cpp +++ b/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" diff --git a/src/object/auto/autolabo.cpp b/src/object/auto/autolabo.cpp index 9601358f..d8e2ca8f 100644 --- a/src/object/auto/autolabo.cpp +++ b/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" diff --git a/src/object/auto/automush.cpp b/src/object/auto/automush.cpp index eac6608c..97cef952 100644 --- a/src/object/auto/automush.cpp +++ b/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; } - diff --git a/src/object/auto/autonest.cpp b/src/object/auto/autonest.cpp index 2b2136ab..af69b13b 100644 --- a/src/object/auto/autonest.cpp +++ b/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; } - diff --git a/src/object/auto/autonuclearplant.cpp b/src/object/auto/autonuclearplant.cpp index 82eaee26..4408c4e3 100644 --- a/src/object/auto/autonuclearplant.cpp +++ b/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 "object/level/parserparam.h" +#include "sound/sound.h" #include "ui/controls/interface.h" #include "ui/controls/window.h" @@ -454,4 +458,3 @@ bool CAutoNuclearPlant::Read(CLevelParserLine* line) return true; } - diff --git a/src/object/auto/autoportico.cpp b/src/object/auto/autoportico.cpp index 84534b0a..6e0f5dec 100644 --- a/src/object/auto/autoportico.cpp +++ b/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 diff --git a/src/object/auto/autopowercaptor.cpp b/src/object/auto/autopowercaptor.cpp index d6b993a2..3dd1b319 100644 --- a/src/object/auto/autopowercaptor.cpp +++ b/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 "object/level/parserparam.h" +#include "sound/sound.h" #include "ui/controls/interface.h" #include "ui/controls/window.h" diff --git a/src/object/auto/autopowerplant.cpp b/src/object/auto/autopowerplant.cpp index b8941ef8..9091a159 100644 --- a/src/object/auto/autopowerplant.cpp +++ b/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 "object/level/parserparam.h" +#include "sound/sound.h" #include "ui/controls/gauge.h" #include "ui/controls/interface.h" @@ -609,4 +613,3 @@ bool CAutoPowerPlant::Read(CLevelParserLine* line) return true; } - diff --git a/src/object/auto/autopowerstation.cpp b/src/object/auto/autopowerstation.cpp index cb80c86a..d3c3cee1 100644 --- a/src/object/auto/autopowerstation.cpp +++ b/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" diff --git a/src/object/auto/autoradar.cpp b/src/object/auto/autoradar.cpp index 0b75c371..c9510717 100644 --- a/src/object/auto/autoradar.cpp +++ b/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; } - diff --git a/src/object/auto/autorepair.cpp b/src/object/auto/autorepair.cpp index 726c98e9..2a5975d8 100644 --- a/src/object/auto/autorepair.cpp +++ b/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" diff --git a/src/object/auto/autoresearch.cpp b/src/object/auto/autoresearch.cpp index 8db14f17..e78675de 100644 --- a/src/object/auto/autoresearch.cpp +++ b/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" diff --git a/src/object/auto/autotower.cpp b/src/object/auto/autotower.cpp index 4b510109..0bdab8d7 100644 --- a/src/object/auto/autotower.cpp +++ b/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" diff --git a/src/object/auto/autovault.cpp b/src/object/auto/autovault.cpp index e0614013..3b7afd3f 100644 --- a/src/object/auto/autovault.cpp +++ b/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; } - diff --git a/src/object/implementation/programmable_impl.cpp b/src/object/implementation/programmable_impl.cpp index 140a9b29..8080b19c 100644 --- a/src/object/implementation/programmable_impl.cpp +++ b/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" diff --git a/src/object/motion/motion.cpp b/src/object/motion/motion.cpp index 6e21d442..997cd2e6 100644 --- a/src/object/motion/motion.cpp +++ b/src/object/motion/motion.cpp @@ -24,11 +24,12 @@ #include "common/make_unique.h" -#include "object/old_object.h" -#include "object/robotmain.h" +#include "level/robotmain.h" -#include "object/level/parserline.h" -#include "object/level/parserparam.h" +#include "level/parser/parserline.h" +#include "level/parser/parserparam.h" + +#include "object/old_object.h" diff --git a/src/object/motion/motionhuman.cpp b/src/object/motion/motionhuman.cpp index c0addd80..10e17fa1 100644 --- a/src/object/motion/motionhuman.cpp +++ b/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" diff --git a/src/object/motion/motiontoto.cpp b/src/object/motion/motiontoto.cpp index 95b10f4c..75a4f00e 100644 --- a/src/object/motion/motiontoto.cpp +++ b/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 diff --git a/src/object/object.cpp b/src/object/object.cpp index 9ce2c90b..d1215025 100644 --- a/src/object/object.cpp +++ b/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" diff --git a/src/object/object_factory.cpp b/src/object/object_factory.cpp index 9b655ff5..ff349cfa 100644 --- a/src/object/object_factory.cpp +++ b/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" diff --git a/src/object/old_object.cpp b/src/object/old_object.cpp index 611ca869..ce418c62 100644 --- a/src/object/old_object.cpp +++ b/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" diff --git a/src/object/subclass/exchange_post.cpp b/src/object/subclass/exchange_post.cpp index 8cd67667..5d975e7c 100644 --- a/src/object/subclass/exchange_post.cpp +++ b/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 "object/level/parserline.h" -#include "object/level/parserparam.h" +#include "sound/sound.h" #include "ui/controls/interface.h" #include "ui/controls/list.h" diff --git a/src/object/task/task.cpp b/src/object/task/task.cpp index 95cfe114..2a77f3b3 100644 --- a/src/object/task/task.cpp +++ b/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" diff --git a/src/object/task/taskbuild.cpp b/src/object/task/taskbuild.cpp index b19efc3b..77bad80a 100644 --- a/src/object/task/taskbuild.cpp +++ b/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" diff --git a/src/object/task/taskdeletemark.cpp b/src/object/task/taskdeletemark.cpp index e39bf584..51e29dd8 100644 --- a/src/object/task/taskdeletemark.cpp +++ b/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" diff --git a/src/object/task/taskmanip.cpp b/src/object/task/taskmanip.cpp index 8afc44cf..cc35833c 100644 --- a/src/object/task/taskmanip.cpp +++ b/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" diff --git a/src/object/task/taskrecover.cpp b/src/object/task/taskrecover.cpp index b712b8b0..95d5e141 100644 --- a/src/object/task/taskrecover.cpp +++ b/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" diff --git a/src/object/task/tasksearch.cpp b/src/object/task/tasksearch.cpp index 968e1085..e9b6c2f5 100644 --- a/src/object/task/tasksearch.cpp +++ b/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); } } - diff --git a/src/object/task/taskshield.cpp b/src/object/task/taskshield.cpp index bc94adf2..a01ce8a1 100644 --- a/src/object/task/taskshield.cpp +++ b/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" diff --git a/src/object/task/tasktake.cpp b/src/object/task/tasktake.cpp index c2a40842..05db40a9 100644 --- a/src/object/task/tasktake.cpp +++ b/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 } - diff --git a/src/object/task/taskterraform.cpp b/src/object/task/taskterraform.cpp index c4e2ac7a..542742b6 100644 --- a/src/object/task/taskterraform.cpp +++ b/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" diff --git a/src/object/task/taskturn.cpp b/src/object/task/taskturn.cpp index 64eac50f..8769e5c8 100644 --- a/src/object/task/taskturn.cpp +++ b/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; } - diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp index 9643020f..189ae96f 100644 --- a/src/physics/physics.cpp +++ b/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" diff --git a/src/script/script.cpp b/src/script/script.cpp index f3b783ab..eaab6591 100644 --- a/src/script/script.cpp +++ b/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" diff --git a/src/script/scriptfunc.cpp b/src/script/scriptfunc.cpp index 81e69e52..c108fc9d 100644 --- a/src/script/scriptfunc.cpp +++ b/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" diff --git a/src/ui/controls/control.cpp b/src/ui/controls/control.cpp index 7cb187a6..bf8662cc 100644 --- a/src/ui/controls/control.cpp +++ b/src/ui/controls/control.cpp @@ -24,7 +24,7 @@ #include "common/restext.h" -#include "object/robotmain.h" +#include "level/robotmain.h" diff --git a/src/ui/controls/edit.cpp b/src/ui/controls/edit.cpp index 324f4ad7..56671b96 100644 --- a/src/ui/controls/edit.cpp +++ b/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" diff --git a/src/ui/controls/editvalue.cpp b/src/ui/controls/editvalue.cpp index 7983ab38..cf84595f 100644 --- a/src/ui/controls/editvalue.cpp +++ b/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" diff --git a/src/ui/controls/interface.cpp b/src/ui/controls/interface.cpp index a04ab027..97ebec0a 100644 --- a/src/ui/controls/interface.cpp +++ b/src/ui/controls/interface.cpp @@ -22,6 +22,8 @@ #include "app/app.h" +#include "level/robotmain.h" + #include diff --git a/src/ui/controls/map.cpp b/src/ui/controls/map.cpp index 6eb89c20..86595f9b 100644 --- a/src/ui/controls/map.cpp +++ b/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" diff --git a/src/ui/controls/target.cpp b/src/ui/controls/target.cpp index e6adf5e4..2e0c30f7 100644 --- a/src/ui/controls/target.cpp +++ b/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" diff --git a/src/ui/controls/target.h b/src/ui/controls/target.h index e4b57172..0a377fb8 100644 --- a/src/ui/controls/target.h +++ b/src/ui/controls/target.h @@ -27,8 +27,6 @@ #include "graphics/engine/engine.h" -#include "object/robotmain.h" - #include "ui/controls/control.h" #include @@ -55,4 +53,3 @@ protected: } - diff --git a/src/ui/displayinfo.cpp b/src/ui/displayinfo.cpp index 70cead18..8acc90e8 100644 --- a/src/ui/displayinfo.cpp +++ b/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" diff --git a/src/ui/displaytext.cpp b/src/ui/displaytext.cpp index a0e9ca7b..113ec797 100644 --- a/src/ui/displaytext.cpp +++ b/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" diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp index 938328b6..1a99a156 100644 --- a/src/ui/maindialog.cpp +++ b/src/ui/maindialog.cpp @@ -29,8 +29,8 @@ #include "common/make_unique.h" #include "common/settings.h" -#include "object/player_profile.h" -#include "object/robotmain.h" +#include "level/robotmain.h" +#include "level/player_profile.h" #include "sound/sound.h" diff --git a/src/ui/mainmap.cpp b/src/ui/mainmap.cpp index 262691ae..ccbf8846 100644 --- a/src/ui/mainmap.cpp +++ b/src/ui/mainmap.cpp @@ -22,6 +22,8 @@ #include "app/app.h" +#include "level/robotmain.h" + namespace Ui { diff --git a/src/ui/mainshort.cpp b/src/ui/mainshort.cpp index f6e2e94f..698fc3af 100644 --- a/src/ui/mainshort.cpp +++ b/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" diff --git a/src/ui/mainui.cpp b/src/ui/mainui.cpp index 84dfa3c4..5ae1f6cb 100644 --- a/src/ui/mainui.cpp +++ b/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" diff --git a/src/ui/mainui.h b/src/ui/mainui.h index ac1b88ba..41711acb 100644 --- a/src/ui/mainui.h +++ b/src/ui/mainui.h @@ -18,7 +18,7 @@ */ #pragma once -#include "object/robotmain.h" +#include "level/robotmain.h" #include diff --git a/src/ui/object_interface.cpp b/src/ui/object_interface.cpp index 411bcc44..ace0dacc 100644 --- a/src/ui/object_interface.cpp +++ b/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" diff --git a/src/ui/screen/screen.cpp b/src/ui/screen/screen.cpp index a433d18e..65933541 100644 --- a/src/ui/screen/screen.cpp +++ b/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" diff --git a/src/ui/screen/screen_apperance.cpp b/src/ui/screen/screen_apperance.cpp index 8ba1e3a1..4799b637 100644 --- a/src/ui/screen/screen_apperance.cpp +++ b/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" diff --git a/src/ui/screen/screen_io.cpp b/src/ui/screen/screen_io.cpp index a067df57..6c6c3393 100644 --- a/src/ui/screen/screen_io.cpp +++ b/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 "object/robotmain.h" +#include "level/parser/parser.h" #include "ui/screen/screen_level_list.h" @@ -223,7 +223,7 @@ void CScreenIO::IOWriteScene() if ( sel == -1 ) return; pe->GetText(info, 100); - + m_interface->DeleteControl(EVENT_WINDOW5); std::string dir; diff --git a/src/ui/screen/screen_io_read.cpp b/src/ui/screen/screen_io_read.cpp index 827148ee..9fca7e68 100644 --- a/src/ui/screen/screen_io_read.cpp +++ b/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" diff --git a/src/ui/screen/screen_io_write.cpp b/src/ui/screen/screen_io_write.cpp index 33f69ea0..8322141a 100644 --- a/src/ui/screen/screen_io_write.cpp +++ b/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" diff --git a/src/ui/screen/screen_level_list.cpp b/src/ui/screen/screen_level_list.cpp index d6c692ae..6fff247e 100644 --- a/src/ui/screen/screen_level_list.cpp +++ b/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" diff --git a/src/ui/screen/screen_level_list.h b/src/ui/screen/screen_level_list.h index 964da37a..9bf712b8 100644 --- a/src/ui/screen/screen_level_list.h +++ b/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 #include diff --git a/src/ui/screen/screen_main_menu.cpp b/src/ui/screen/screen_main_menu.cpp index 9a42fe01..2d23b3b7 100644 --- a/src/ui/screen/screen_main_menu.cpp +++ b/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" diff --git a/src/ui/screen/screen_player_select.cpp b/src/ui/screen/screen_player_select.cpp index 4b36ebb2..369f779f 100644 --- a/src/ui/screen/screen_player_select.cpp +++ b/src/ui/screen/screen_player_select.cpp @@ -21,10 +21,14 @@ #include "app/app.h" +#include "level/robotmain.h" + #include "common/logger.h" #include "common/stringutils.h" -#include "object/player_profile.h" +#include "level/player_profile.h" + +#include "sound/sound.h" #include "ui/controls/button.h" #include "ui/controls/edit.h" diff --git a/src/ui/screen/screen_quit.cpp b/src/ui/screen/screen_quit.cpp index 74b2bedd..c1aabd10 100644 --- a/src/ui/screen/screen_quit.cpp +++ b/src/ui/screen/screen_quit.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" diff --git a/src/ui/screen/screen_setup.h b/src/ui/screen/screen_setup.h index c0d0dea3..9325266e 100644 --- a/src/ui/screen/screen_setup.h +++ b/src/ui/screen/screen_setup.h @@ -21,7 +21,7 @@ #include "ui/screen/screen.h" -#include "object/robotmain.h" +#include "level/robotmain.h" class CSettings; diff --git a/src/ui/screen/screen_welcome.cpp b/src/ui/screen/screen_welcome.cpp index d853b1ea..657df127 100644 --- a/src/ui/screen/screen_welcome.cpp +++ b/src/ui/screen/screen_welcome.cpp @@ -25,6 +25,8 @@ #include "graphics/engine/engine.h" +#include "level/robotmain.h" + #include "ui/controls/interface.h" #include "ui/controls/window.h" diff --git a/src/ui/studio.cpp b/src/ui/studio.cpp index adf5a7d8..bfc23bdd 100644 --- a/src/ui/studio.cpp +++ b/src/ui/studio.cpp @@ -31,11 +31,13 @@ #include "common/resources/resourcemanager.h" +#include "level/robotmain.h" +#include "level/player_profile.h" + #include "graphics/engine/camera.h" #include "graphics/engine/engine.h" #include "object/object.h" -#include "object/player_profile.h" #include "object/interface/programmable_object.h"