From 11b0398c03a6da6db28fa266acb062fe57c35f39 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sun, 2 Aug 2015 13:09:48 +0200 Subject: [PATCH] Include refactoring * reordered includes according to correct style * removed some unnecessary includes --- src/app/app.cpp | 12 +++++---- src/app/app.h | 3 ++- src/app/input.cpp | 3 +-- src/app/main.cpp | 8 ++++-- src/app/pausemanager.cpp | 3 ++- src/app/pausemanager.h | 1 + src/common/config_file.cpp | 5 ++-- src/common/config_file.h | 5 ---- src/common/image.cpp | 3 ++- src/common/pathman.cpp | 10 +++---- src/common/resources/inputstream.cpp | 1 + src/common/resources/outputstream.cpp | 1 + src/common/resources/resourcemanager.cpp | 9 ++++--- src/common/resources/resourcemanager.h | 2 +- src/common/restext.cpp | 10 +++---- src/graphics/core/device.h | 3 +-- src/graphics/core/nulldevice.cpp | 5 ---- src/graphics/core/vertex.h | 2 +- src/graphics/engine/camera.cpp | 1 + src/graphics/engine/cloud.cpp | 5 ++-- src/graphics/engine/engine.cpp | 1 + src/graphics/engine/lightman.h | 1 + src/graphics/engine/lightning.cpp | 4 ++- src/graphics/engine/oldmodelmanager.cpp | 3 ++- src/graphics/engine/particle.cpp | 1 + src/graphics/engine/planet.cpp | 1 + src/graphics/engine/pyro.cpp | 3 ++- src/graphics/engine/pyro.h | 1 + src/graphics/engine/text.cpp | 1 + src/graphics/engine/water.cpp | 2 +- src/graphics/model/model_input.cpp | 1 + src/graphics/model/model_io_structs.h | 1 + src/graphics/model/model_manager.cpp | 1 + src/graphics/model/model_mesh.h | 4 +-- src/graphics/model/model_output.cpp | 3 +-- src/graphics/opengl/gl21device.cpp | 9 ++++--- src/graphics/opengl/gl21device.h | 1 + src/graphics/opengl/gl33device.cpp | 9 ++++--- src/graphics/opengl/gl33device.h | 3 ++- src/graphics/opengl/gldevice.cpp | 7 +++-- src/graphics/opengl/gldevice.h | 3 ++- src/graphics/opengl/glframebuffer.h | 1 + src/graphics/opengl/glutil.cpp | 2 +- src/graphics/opengl/glutil.h | 6 ++--- src/math/all.h | 4 +-- src/math/geometry.h | 2 +- src/object/auto/auto.cpp | 7 ++--- src/object/auto/autobase.cpp | 7 ++--- src/object/auto/autoconvert.cpp | 4 ++- src/object/auto/autoderrick.cpp | 1 + src/object/auto/autodestroyer.cpp | 2 ++ src/object/auto/autoegg.cpp | 2 ++ src/object/auto/autofactory.cpp | 8 +++--- src/object/auto/autohouston.h | 1 + src/object/auto/autolabo.cpp | 4 ++- src/object/auto/automush.cpp | 1 + src/object/auto/autonest.cpp | 1 + src/object/auto/autonuclearplant.cpp | 6 +++-- src/object/auto/autoportico.cpp | 3 +-- src/object/auto/autopowercaptor.cpp | 6 +++-- src/object/auto/autopowerplant.cpp | 4 ++- src/object/auto/autopowerstation.cpp | 3 ++- src/object/auto/autoradar.cpp | 2 +- src/object/auto/autorepair.cpp | 1 + src/object/auto/autoresearch.cpp | 10 ++++--- src/object/auto/autoroot.cpp | 4 +-- src/object/auto/autotower.cpp | 6 +++-- src/object/auto/autovault.cpp | 4 ++- src/object/brain.cpp | 19 +++++++++----- src/object/brain.h | 8 +++--- src/object/interface/jostleable_object.h | 4 +-- src/object/level/parser.cpp | 8 +++--- src/object/level/parser.h | 6 ++--- src/object/level/parserparam.cpp | 6 +++-- src/object/level/parserparam.h | 5 ++-- src/object/mainmovie.cpp | 5 ++-- src/object/motion/motion.cpp | 7 ++--- src/object/motion/motionhuman.cpp | 1 + src/object/motion/motiontoto.cpp | 4 +-- src/object/motion/motionvehicle.cpp | 1 + src/object/motion/motionvehicle.h | 1 + src/object/object_factory.cpp | 22 +++++++++------- src/object/object_manager.cpp | 3 ++- src/object/old_object.cpp | 15 ++++++----- src/object/old_object_interface.h | 3 +-- src/object/player_profile.cpp | 14 ++++++---- src/object/robotmain.cpp | 28 +++++++++++--------- src/object/robotmain.h | 9 +++---- src/object/scene_conditions.cpp | 8 +++--- src/object/scene_conditions.h | 2 +- src/object/subclass/exchange_post.cpp | 4 +-- src/object/subclass/exchange_post.h | 1 + src/object/subclass/static_object.cpp | 5 ++-- src/object/task/task.cpp | 1 + src/object/task/taskadvance.cpp | 1 + src/object/task/taskbuild.cpp | 8 ++++-- src/object/task/taskbuild.h | 4 +-- src/object/task/taskdeletemark.cpp | 9 +++---- src/object/task/taskfireant.cpp | 3 ++- src/object/task/taskfireant.h | 2 +- src/object/task/taskflag.cpp | 11 ++++---- src/object/task/taskflag.h | 4 +-- src/object/task/taskgoto.cpp | 3 ++- src/object/task/taskinfo.cpp | 1 + src/object/task/taskmanager.cpp | 20 +++++++------- src/object/task/taskmanager.h | 8 +++--- src/object/task/taskmanip.cpp | 5 ++-- src/object/task/taskmanip.h | 4 +-- src/object/task/taskpen.cpp | 4 +-- src/object/task/taskpen.h | 3 ++- src/object/task/taskrecover.cpp | 7 ++--- src/object/task/tasksearch.cpp | 2 +- src/object/task/taskshield.cpp | 6 +++-- src/object/task/taskspiderexplo.cpp | 3 ++- src/object/task/tasktake.cpp | 6 +++-- src/object/task/taskterraform.cpp | 10 ++++--- src/object/task/taskturn.cpp | 3 ++- src/physics/physics.cpp | 18 ++++++++----- src/script/cbottoken.cpp | 3 ++- src/script/script.cpp | 17 ++++++------ src/script/script.h | 3 +-- src/script/scriptfunc.cpp | 13 ++++++---- src/script/scriptfunc.h | 4 +-- src/sound/oalsound/alsound.h | 1 - src/sound/oalsound/buffer.cpp | 4 +-- src/sound/oalsound/buffer.h | 1 - src/sound/sound.cpp | 4 +-- src/tools/convert_model.cpp | 2 +- src/ui/color.cpp | 1 + src/ui/compass.cpp | 1 + src/ui/control.cpp | 5 ++++ src/ui/control.h | 17 ++++++------ src/ui/displayinfo.cpp | 6 +++-- src/ui/displayinfo.h | 4 +-- src/ui/displaytext.cpp | 5 ++-- src/ui/edit.cpp | 14 +++++++--- src/ui/edit.h | 19 +------------- src/ui/editvalue.cpp | 2 +- src/ui/editvalue.h | 1 + src/ui/gauge.cpp | 2 ++ src/ui/gauge.h | 6 ----- src/ui/interface.h | 26 +++++++++---------- src/ui/key.cpp | 4 +++ src/ui/key.h | 2 +- src/ui/label.cpp | 2 ++ src/ui/list.cpp | 5 +++- src/ui/list.h | 5 ++-- src/ui/maindialog.cpp | 33 ++++++++++++------------ src/ui/maindialog.h | 4 +-- src/ui/mainshort.cpp | 2 +- src/ui/map.cpp | 11 +++++++- src/ui/map.h | 15 +++++------ src/ui/shortcut.cpp | 5 ++-- src/ui/slider.h | 4 --- src/ui/studio.cpp | 8 +++--- src/ui/studio.h | 17 +++--------- src/ui/target.cpp | 2 +- src/ui/window.h | 30 ++++++++++----------- 158 files changed, 506 insertions(+), 393 deletions(-) diff --git a/src/app/app.cpp b/src/app/app.cpp index 8cd91c89..c19898f3 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -17,27 +17,29 @@ * along with this program. If not, see http://gnu.org/licenses */ -#include "common/config.h" - #include "app/app.h" +#include "common/config.h" + #include "app/controller.h" #include "app/input.h" #include "app/system.h" -#include "common/logger.h" #include "common/image.h" #include "common/key.h" -#include "common/pathman.h" +#include "common/logger.h" #include "common/make_unique.h" +#include "common/pathman.h" #include "common/stringutils.h" + #include "common/resources/resourcemanager.h" #include "graphics/core/nulldevice.h" + #include "graphics/opengl/glutil.h" -#include "object/robotmain.h" #include "object/object_manager.h" +#include "object/robotmain.h" #ifdef OPENAL_SOUND #include "sound/oalsound/alsound.h" diff --git a/src/app/app.h b/src/app/app.h index 00b38302..ecb82378 100644 --- a/src/app/app.h +++ b/src/app/app.h @@ -24,12 +24,13 @@ #pragma once +#include "common/config_file.h" #include "common/event.h" #include "common/global.h" #include "common/singleton.h" -#include "common/config_file.h" #include "graphics/core/device.h" + #include "graphics/engine/engine.h" #include "object/level_category.h" diff --git a/src/app/input.cpp b/src/app/input.cpp index 8cf9f99f..fcfbe16a 100644 --- a/src/app/input.cpp +++ b/src/app/input.cpp @@ -19,9 +19,8 @@ #include "app/input.h" - -#include "common/logger.h" #include "common/config_file.h" +#include "common/logger.h" #include "common/restext.h" #include "graphics/engine/engine.h" diff --git a/src/app/main.cpp b/src/app/main.cpp index 84f59153..8e327527 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -22,18 +22,22 @@ * \brief Entry point of application - main() function */ +#include "common/config.h" + #include "app/app.h" #include "app/system.h" +#if PLATFORM_WINDOWS + #include "app/system_windows.h" +#endif -#include "common/config.h" #include "common/logger.h" #include "common/misc.h" #include "common/restext.h" + #include "common/resources/resourcemanager.h" #if PLATFORM_WINDOWS #include - #include "app/system_windows.h" #endif diff --git a/src/app/pausemanager.cpp b/src/app/pausemanager.cpp index bb28dcf6..0cb4ab50 100644 --- a/src/app/pausemanager.cpp +++ b/src/app/pausemanager.cpp @@ -17,9 +17,10 @@ * along with this program. If not, see http://gnu.org/licenses */ -#include "app/app.h" #include "app/pausemanager.h" +#include "app/app.h" + #include "common/logger.h" #include "object/robotmain.h" diff --git a/src/app/pausemanager.h b/src/app/pausemanager.h index 2efdab4d..41c09fe1 100644 --- a/src/app/pausemanager.h +++ b/src/app/pausemanager.h @@ -24,6 +24,7 @@ #pragma once #include "common/singleton.h" + #include "sound/sound.h" #include diff --git a/src/common/config_file.cpp b/src/common/config_file.cpp index a150bd95..c73166ae 100644 --- a/src/common/config_file.cpp +++ b/src/common/config_file.cpp @@ -20,12 +20,13 @@ #include "common/config_file.h" -#include "common/resources/inputstream.h" -#include "common/resources/outputstream.h" #include "app/system.h" #include "common/logger.h" +#include "common/resources/inputstream.h" +#include "common/resources/outputstream.h" + #include #include #include diff --git a/src/common/config_file.h b/src/common/config_file.h index 1132f27b..d8970586 100644 --- a/src/common/config_file.h +++ b/src/common/config_file.h @@ -27,13 +27,8 @@ #include "common/singleton.h" #include -#include -#include #include -#include - -namespace fs = boost::filesystem; /** diff --git a/src/common/image.cpp b/src/common/image.cpp index 754dba20..90048cf9 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -20,9 +20,10 @@ #include "common/image.h" -#include "math/func.h" #include "common/resources/resourcemanager.h" +#include "math/func.h" + #include #include #include diff --git a/src/common/pathman.cpp b/src/common/pathman.cpp index c35933a8..01d7834d 100644 --- a/src/common/pathman.cpp +++ b/src/common/pathman.cpp @@ -20,12 +20,16 @@ #include "common/pathman.h" +#include "common/config.h" #include "app/app.h" #include "app/system.h" +#ifdef PLATFORM_WINDOWS + #include "app/system_windows.h" +#endif -#include "common/config.h" #include "common/logger.h" + #include "common/resources/resourcemanager.h" #include "object/robotmain.h" @@ -35,10 +39,6 @@ #include #include -#ifdef PLATFORM_WINDOWS - #include "app/system_windows.h" -#endif - template<> CPathManager* CSingleton::m_instance = nullptr; CPathManager::CPathManager() diff --git a/src/common/resources/inputstream.cpp b/src/common/resources/inputstream.cpp index 57d13056..74711368 100644 --- a/src/common/resources/inputstream.cpp +++ b/src/common/resources/inputstream.cpp @@ -18,6 +18,7 @@ */ #include "common/resources/inputstream.h" + #include "common/resources/inputstreambuffer.h" diff --git a/src/common/resources/outputstream.cpp b/src/common/resources/outputstream.cpp index e88520ea..dae2a50f 100644 --- a/src/common/resources/outputstream.cpp +++ b/src/common/resources/outputstream.cpp @@ -18,6 +18,7 @@ */ #include "common/resources/outputstream.h" + #include "common/resources/outputstreambuffer.h" diff --git a/src/common/resources/resourcemanager.cpp b/src/common/resources/resourcemanager.cpp index a400bf1f..aba12c7d 100644 --- a/src/common/resources/resourcemanager.cpp +++ b/src/common/resources/resourcemanager.cpp @@ -21,6 +21,11 @@ #include "common/resources/resourcemanager.h" #include "common/config.h" + +#if PLATFORM_WINDOWS + #include "app/system_windows.h" +#endif + #include "common/logger.h" #include "common/make_unique.h" @@ -29,10 +34,6 @@ #include #include -#if PLATFORM_WINDOWS - #include "app/system_windows.h" -#endif - namespace fs = boost::filesystem; diff --git a/src/common/resources/resourcemanager.h b/src/common/resources/resourcemanager.h index 6cfd7ee2..6ad04f35 100644 --- a/src/common/resources/resourcemanager.h +++ b/src/common/resources/resourcemanager.h @@ -19,8 +19,8 @@ #pragma once -#include "common/resources/sndfile_wrapper.h" #include "common/resources/sdl_file_wrapper.h" +#include "common/resources/sndfile_wrapper.h" #include #include diff --git a/src/common/restext.cpp b/src/common/restext.cpp index 8c7eeaa7..9193d872 100644 --- a/src/common/restext.cpp +++ b/src/common/restext.cpp @@ -20,17 +20,17 @@ #include "common/restext.h" -#include "app/input.h" - #include "common/config.h" -#include "common/global.h" +#include "CBot/resource.h" + +#include "app/input.h" + #include "common/event.h" +#include "common/global.h" #include "common/logger.h" #include "common/stringutils.h" -#include "CBot/resource.h" - #include "object/object_type.h" #include "object/robotmain.h" diff --git a/src/graphics/core/device.h b/src/graphics/core/device.h index 345abf68..c5b990d1 100644 --- a/src/graphics/core/device.h +++ b/src/graphics/core/device.h @@ -24,13 +24,12 @@ #pragma once - #include "graphics/core/color.h" +#include "graphics/core/framebuffer.h" #include "graphics/core/light.h" #include "graphics/core/material.h" #include "graphics/core/texture.h" #include "graphics/core/vertex.h" -#include "graphics/core/framebuffer.h" #include "math/intpoint.h" #include "math/matrix.h" diff --git a/src/graphics/core/nulldevice.cpp b/src/graphics/core/nulldevice.cpp index c0c3397c..b7c8775a 100644 --- a/src/graphics/core/nulldevice.cpp +++ b/src/graphics/core/nulldevice.cpp @@ -20,11 +20,6 @@ #include "graphics/core/nulldevice.h" -#include "common/config.h" -#include "common/logger.h" - -#include "math/geometry.h" - // Graphics module namespace namespace Gfx diff --git a/src/graphics/core/vertex.h b/src/graphics/core/vertex.h index 0a53da4c..07eca5eb 100644 --- a/src/graphics/core/vertex.h +++ b/src/graphics/core/vertex.h @@ -27,8 +27,8 @@ #include "graphics/core/color.h" -#include "math/vector.h" #include "math/point.h" +#include "math/vector.h" #include diff --git a/src/graphics/engine/camera.cpp b/src/graphics/engine/camera.cpp index 5bec9715..bf13b318 100644 --- a/src/graphics/engine/camera.cpp +++ b/src/graphics/engine/camera.cpp @@ -33,6 +33,7 @@ #include "object/object.h" #include "object/object_manager.h" #include "object/robotmain.h" + #include "object/interface/carrier_object.h" #include "object/interface/powered_object.h" #include "object/interface/transportable_object.h" diff --git a/src/graphics/engine/cloud.cpp b/src/graphics/engine/cloud.cpp index 53fe8bad..bd0bc52c 100644 --- a/src/graphics/engine/cloud.cpp +++ b/src/graphics/engine/cloud.cpp @@ -21,13 +21,14 @@ #include "graphics/engine/cloud.h" #include "graphics/core/device.h" + #include "graphics/engine/engine.h" #include "graphics/engine/terrain.h" -#include "object/robotmain.h" - #include "math/geometry.h" +#include "object/robotmain.h" + // Graphics module namespace namespace Gfx diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp index 840d5854..9f4fbd64 100644 --- a/src/graphics/engine/engine.cpp +++ b/src/graphics/engine/engine.cpp @@ -29,6 +29,7 @@ #include "common/make_unique.h" #include "graphics/core/device.h" + #include "graphics/engine/camera.h" #include "graphics/engine/cloud.h" #include "graphics/engine/lightman.h" diff --git a/src/graphics/engine/lightman.h b/src/graphics/engine/lightman.h index 4c34e4a7..ab9a4b51 100644 --- a/src/graphics/engine/lightman.h +++ b/src/graphics/engine/lightman.h @@ -27,6 +27,7 @@ #include "graphics/core/color.h" #include "graphics/core/light.h" + #include "graphics/engine/engine.h" #include "math/vector.h" diff --git a/src/graphics/engine/lightning.cpp b/src/graphics/engine/lightning.cpp index 60520685..44ea8021 100644 --- a/src/graphics/engine/lightning.cpp +++ b/src/graphics/engine/lightning.cpp @@ -25,6 +25,7 @@ #include "common/logger.h" #include "graphics/core/device.h" + #include "graphics/engine/camera.h" #include "graphics/engine/terrain.h" @@ -33,10 +34,11 @@ #include "object/object.h" #include "object/object_manager.h" #include "object/robotmain.h" -#include "object/interface/transportable_object.h" #include "object/auto/autopowercaptor.h" +#include "object/interface/transportable_object.h" + // Graphics module namespace namespace Gfx diff --git a/src/graphics/engine/oldmodelmanager.cpp b/src/graphics/engine/oldmodelmanager.cpp index 443cef15..814ca075 100644 --- a/src/graphics/engine/oldmodelmanager.cpp +++ b/src/graphics/engine/oldmodelmanager.cpp @@ -22,9 +22,10 @@ #include "app/app.h" #include "common/logger.h" -#include "common/resources/inputstream.h" #include "common/stringutils.h" +#include "common/resources/inputstream.h" + #include "graphics/engine/engine.h" #include "graphics/model/model_input.h" diff --git a/src/graphics/engine/particle.cpp b/src/graphics/engine/particle.cpp index 813d7d6c..2de76bf7 100644 --- a/src/graphics/engine/particle.cpp +++ b/src/graphics/engine/particle.cpp @@ -25,6 +25,7 @@ #include "common/logger.h" #include "graphics/core/device.h" + #include "graphics/engine/engine.h" #include "graphics/engine/terrain.h" #include "graphics/engine/water.h" diff --git a/src/graphics/engine/planet.cpp b/src/graphics/engine/planet.cpp index f8c37930..ecf7bbc2 100644 --- a/src/graphics/engine/planet.cpp +++ b/src/graphics/engine/planet.cpp @@ -21,6 +21,7 @@ #include "graphics/engine/planet.h" #include "graphics/core/device.h" + #include "graphics/engine/engine.h" diff --git a/src/graphics/engine/pyro.cpp b/src/graphics/engine/pyro.cpp index 4be6ab8d..a935f110 100644 --- a/src/graphics/engine/pyro.cpp +++ b/src/graphics/engine/pyro.cpp @@ -30,9 +30,10 @@ #include "math/geometry.h" -#include "object/old_object.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/pyro.h b/src/graphics/engine/pyro.h index 8a1bd767..0ab4b6e1 100644 --- a/src/graphics/engine/pyro.h +++ b/src/graphics/engine/pyro.h @@ -29,6 +29,7 @@ #include "common/global.h" #include "graphics/core/color.h" + #include "graphics/engine/pyro_type.h" #include "math/sphere.h" diff --git a/src/graphics/engine/text.cpp b/src/graphics/engine/text.cpp index 13c3e2ad..1a8d84a3 100644 --- a/src/graphics/engine/text.cpp +++ b/src/graphics/engine/text.cpp @@ -25,6 +25,7 @@ #include "common/image.h" #include "common/logger.h" #include "common/stringutils.h" + #include "common/resources/resourcemanager.h" #include "math/func.h" diff --git a/src/graphics/engine/water.cpp b/src/graphics/engine/water.cpp index 0916fd58..a91e7a8f 100644 --- a/src/graphics/engine/water.cpp +++ b/src/graphics/engine/water.cpp @@ -17,7 +17,6 @@ * along with this program. If not, see http://gnu.org/licenses */ - #include "graphics/engine/water.h" #include "app/app.h" @@ -25,6 +24,7 @@ #include "common/logger.h" #include "graphics/core/device.h" + #include "graphics/engine/engine.h" #include "graphics/engine/terrain.h" diff --git a/src/graphics/model/model_input.cpp b/src/graphics/model/model_input.cpp index 8216d0ed..dbba1c74 100644 --- a/src/graphics/model/model_input.cpp +++ b/src/graphics/model/model_input.cpp @@ -21,6 +21,7 @@ #include "common/ioutils.h" #include "common/logger.h" + #include "common/resources/inputstream.h" #include "graphics/model/model_io_exception.h" diff --git a/src/graphics/model/model_io_structs.h b/src/graphics/model/model_io_structs.h index becff62c..0091f4ac 100644 --- a/src/graphics/model/model_io_structs.h +++ b/src/graphics/model/model_io_structs.h @@ -20,6 +20,7 @@ #pragma once #include "graphics/core/material.h" + #include "graphics/model/model_triangle.h" #include diff --git a/src/graphics/model/model_manager.cpp b/src/graphics/model/model_manager.cpp index 8575c18c..8dc653a3 100644 --- a/src/graphics/model/model_manager.cpp +++ b/src/graphics/model/model_manager.cpp @@ -20,6 +20,7 @@ #include "graphics/model/model_manager.h" #include "common/logger.h" + #include "common/resources/inputstream.h" #include "graphics/model/model_input.h" diff --git a/src/graphics/model/model_mesh.h b/src/graphics/model/model_mesh.h index 82ee42df..f4daeda6 100644 --- a/src/graphics/model/model_mesh.h +++ b/src/graphics/model/model_mesh.h @@ -19,10 +19,10 @@ #pragma once -#include "math/vector.h" - #include "graphics/model/model_triangle.h" +#include "math/vector.h" + #include namespace Gfx diff --git a/src/graphics/model/model_output.cpp b/src/graphics/model/model_output.cpp index d1218e4b..ac81fb25 100644 --- a/src/graphics/model/model_output.cpp +++ b/src/graphics/model/model_output.cpp @@ -21,11 +21,10 @@ #include "common/ioutils.h" +#include "graphics/model/model.h" #include "graphics/model/model_io_exception.h" #include "graphics/model/model_io_structs.h" -#include "graphics/model/model.h" - #include namespace Gfx diff --git a/src/graphics/opengl/gl21device.cpp b/src/graphics/opengl/gl21device.cpp index 69865643..d49984d4 100644 --- a/src/graphics/opengl/gl21device.cpp +++ b/src/graphics/opengl/gl21device.cpp @@ -19,13 +19,16 @@ #include "graphics/opengl/gl21device.h" -#include "graphics/opengl/glframebuffer.h" -#include "graphics/engine/engine.h" #include "common/config.h" + +#include "common/config_file.h" #include "common/image.h" #include "common/logger.h" -#include "common/config_file.h" + +#include "graphics/engine/engine.h" + +#include "graphics/opengl/glframebuffer.h" #include "math/geometry.h" diff --git a/src/graphics/opengl/gl21device.h b/src/graphics/opengl/gl21device.h index 59f90093..08ea34b8 100644 --- a/src/graphics/opengl/gl21device.h +++ b/src/graphics/opengl/gl21device.h @@ -25,6 +25,7 @@ #pragma once #include "graphics/core/device.h" + #include "graphics/opengl/glutil.h" #include diff --git a/src/graphics/opengl/gl33device.cpp b/src/graphics/opengl/gl33device.cpp index b2ce11f9..2068145c 100644 --- a/src/graphics/opengl/gl33device.cpp +++ b/src/graphics/opengl/gl33device.cpp @@ -18,13 +18,16 @@ */ #include "graphics/opengl/gl33device.h" -#include "graphics/opengl/glframebuffer.h" -#include "graphics/engine/engine.h" #include "common/config.h" + +#include "common/config_file.h" #include "common/image.h" #include "common/logger.h" -#include "common/config_file.h" + +#include "graphics/engine/engine.h" + +#include "graphics/opengl/glframebuffer.h" #include "math/geometry.h" diff --git a/src/graphics/opengl/gl33device.h b/src/graphics/opengl/gl33device.h index f19a0da5..d7a40add 100644 --- a/src/graphics/opengl/gl33device.h +++ b/src/graphics/opengl/gl33device.h @@ -25,8 +25,9 @@ #pragma once #include "graphics/core/device.h" -#include "graphics/opengl/glutil.h" + #include "graphics/opengl/glframebuffer.h" +#include "graphics/opengl/glutil.h" #include #include diff --git a/src/graphics/opengl/gldevice.cpp b/src/graphics/opengl/gldevice.cpp index ff6555a4..acbde6b5 100644 --- a/src/graphics/opengl/gldevice.cpp +++ b/src/graphics/opengl/gldevice.cpp @@ -19,13 +19,16 @@ #include "graphics/opengl/gldevice.h" -#include "graphics/opengl/glframebuffer.h" -#include "graphics/engine/engine.h" #include "common/config.h" + #include "common/image.h" #include "common/logger.h" +#include "graphics/engine/engine.h" + +#include "graphics/opengl/glframebuffer.h" + #include "math/geometry.h" diff --git a/src/graphics/opengl/gldevice.h b/src/graphics/opengl/gldevice.h index 7a87a206..e73eaf82 100644 --- a/src/graphics/opengl/gldevice.h +++ b/src/graphics/opengl/gldevice.h @@ -25,8 +25,9 @@ #pragma once #include "graphics/core/device.h" -#include "graphics/opengl/glutil.h" + #include "graphics/opengl/glframebuffer.h" +#include "graphics/opengl/glutil.h" #include #include diff --git a/src/graphics/opengl/glframebuffer.h b/src/graphics/opengl/glframebuffer.h index e9fbc980..694a973b 100644 --- a/src/graphics/opengl/glframebuffer.h +++ b/src/graphics/opengl/glframebuffer.h @@ -20,6 +20,7 @@ #pragma once #include "graphics/core/framebuffer.h" + #include "graphics/opengl/glutil.h" namespace Gfx diff --git a/src/graphics/opengl/glutil.cpp b/src/graphics/opengl/glutil.cpp index c2b6a8d7..e811fda9 100644 --- a/src/graphics/opengl/glutil.cpp +++ b/src/graphics/opengl/glutil.cpp @@ -22,9 +22,9 @@ #include "common/logger.h" #include "common/make_unique.h" -#include "graphics/opengl/gldevice.h" #include "graphics/opengl/gl21device.h" #include "graphics/opengl/gl33device.h" +#include "graphics/opengl/gldevice.h" #include #include diff --git a/src/graphics/opengl/glutil.h b/src/graphics/opengl/glutil.h index 90a867fa..236c1889 100644 --- a/src/graphics/opengl/glutil.h +++ b/src/graphics/opengl/glutil.h @@ -19,11 +19,11 @@ #pragma once -#include "graphics/core/device.h" - -// config.h must be included before glew.h +// config.h must be included first #include "common/config.h" +#include "graphics/core/device.h" + #include #include diff --git a/src/math/all.h b/src/math/all.h index fc289ee7..6092675a 100644 --- a/src/math/all.h +++ b/src/math/all.h @@ -27,8 +27,8 @@ #include "math/const.h" #include "math/func.h" +#include "math/geometry.h" +#include "math/matrix.h" #include "math/point.h" #include "math/vector.h" -#include "math/matrix.h" -#include "math/geometry.h" diff --git a/src/math/geometry.h b/src/math/geometry.h index e02695f3..bb1f59f0 100644 --- a/src/math/geometry.h +++ b/src/math/geometry.h @@ -27,8 +27,8 @@ #include "math/const.h" #include "math/func.h" -#include "math/point.h" #include "math/matrix.h" +#include "math/point.h" #include "math/vector.h" diff --git a/src/object/auto/auto.cpp b/src/object/auto/auto.cpp index 764938a9..22803117 100644 --- a/src/object/auto/auto.cpp +++ b/src/object/auto/auto.cpp @@ -25,12 +25,13 @@ #include "common/event.h" #include "common/make_unique.h" -#include "object/level/parserline.h" -#include "object/level/parserparam.h" #include "object/old_object.h" -#include "ui/interface.h" +#include "object/level/parserline.h" +#include "object/level/parserparam.h" + #include "ui/gauge.h" +#include "ui/interface.h" #include "ui/window.h" diff --git a/src/object/auto/autobase.cpp b/src/object/auto/autobase.cpp index 7cb3c148..6d0fa3f9 100644 --- a/src/object/auto/autobase.cpp +++ b/src/object/auto/autobase.cpp @@ -19,12 +19,11 @@ #include "object/auto/autobase.h" -#include "object/interface/transportable_object.h" -#include "graphics/engine/terrain.h" #include "graphics/engine/cloud.h" -#include "graphics/engine/planet.h" #include "graphics/engine/lightning.h" +#include "graphics/engine/planet.h" +#include "graphics/engine/terrain.h" #include "math/geometry.h" @@ -32,6 +31,8 @@ #include "object/old_object.h" #include "object/robotmain.h" +#include "object/interface/transportable_object.h" + #include "physics/physics.h" #include "ui/interface.h" diff --git a/src/object/auto/autoconvert.cpp b/src/object/auto/autoconvert.cpp index 37047a2f..cf299226 100644 --- a/src/object/auto/autoconvert.cpp +++ b/src/object/auto/autoconvert.cpp @@ -26,9 +26,11 @@ #include "object/object_manager.h" #include "object/old_object.h" + +#include "object/interface/transportable_object.h" + #include "object/level/parserline.h" #include "object/level/parserparam.h" -#include "object/interface/transportable_object.h" #include "ui/interface.h" #include "ui/window.h" diff --git a/src/object/auto/autoderrick.cpp b/src/object/auto/autoderrick.cpp index a9d4f3a7..3742a1e3 100644 --- a/src/object/auto/autoderrick.cpp +++ b/src/object/auto/autoderrick.cpp @@ -28,6 +28,7 @@ #include "object/object_manager.h" #include "object/old_object.h" + #include "object/level/parserline.h" #include "object/level/parserparam.h" diff --git a/src/object/auto/autodestroyer.cpp b/src/object/auto/autodestroyer.cpp index 96d81aa4..b2a059f8 100644 --- a/src/object/auto/autodestroyer.cpp +++ b/src/object/auto/autodestroyer.cpp @@ -26,12 +26,14 @@ #include "object/object_manager.h" #include "object/old_object.h" + #include "object/level/parserline.h" #include "object/level/parserparam.h" #include "ui/interface.h" #include "ui/window.h" +#include // Object's constructor. diff --git a/src/object/auto/autoegg.cpp b/src/object/auto/autoegg.cpp index 7f51a76b..18af17ed 100644 --- a/src/object/auto/autoegg.cpp +++ b/src/object/auto/autoegg.cpp @@ -29,8 +29,10 @@ #include "object/brain.h" #include "object/object_manager.h" #include "object/old_object.h" + #include "object/interface/programmable_object.h" #include "object/interface/transportable_object.h" + #include "object/level/parserline.h" #include "object/level/parserparam.h" diff --git a/src/object/auto/autofactory.cpp b/src/object/auto/autofactory.cpp index dca754e9..079b289b 100644 --- a/src/object/auto/autofactory.cpp +++ b/src/object/auto/autofactory.cpp @@ -26,15 +26,17 @@ #include "math/geometry.h" #include "object/brain.h" -#include "object/old_object.h" #include "object/object_create_params.h" #include "object/object_manager.h" +#include "object/old_object.h" #include "object/robotmain.h" -#include "object/level/parserline.h" -#include "object/level/parserparam.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" diff --git a/src/object/auto/autohouston.h b/src/object/auto/autohouston.h index 9857b22c..41507ec8 100644 --- a/src/object/auto/autohouston.h +++ b/src/object/auto/autohouston.h @@ -23,6 +23,7 @@ #include "object/auto/auto.h" + #include "graphics/engine/particle.h" diff --git a/src/object/auto/autolabo.cpp b/src/object/auto/autolabo.cpp index 48312c09..3c95cb9c 100644 --- a/src/object/auto/autolabo.cpp +++ b/src/object/auto/autolabo.cpp @@ -29,9 +29,11 @@ #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 "object/interface/powered_object.h" #include "ui/interface.h" #include "ui/window.h" diff --git a/src/object/auto/automush.cpp b/src/object/auto/automush.cpp index 6ed8237e..0bf24453 100644 --- a/src/object/auto/automush.cpp +++ b/src/object/auto/automush.cpp @@ -24,6 +24,7 @@ #include "object/object_manager.h" #include "object/old_object.h" + #include "object/level/parserline.h" #include "object/level/parserparam.h" diff --git a/src/object/auto/autonest.cpp b/src/object/auto/autonest.cpp index 918e1bf2..2b2136ab 100644 --- a/src/object/auto/autonest.cpp +++ b/src/object/auto/autonest.cpp @@ -26,6 +26,7 @@ #include "object/object_manager.h" #include "object/old_object.h" + #include "object/level/parserline.h" #include "object/level/parserparam.h" diff --git a/src/object/auto/autonuclearplant.cpp b/src/object/auto/autonuclearplant.cpp index 1f636a87..8e420e54 100644 --- a/src/object/auto/autonuclearplant.cpp +++ b/src/object/auto/autonuclearplant.cpp @@ -26,11 +26,13 @@ #include "object/object_manager.h" #include "object/old_object.h" -#include "object/level/parserline.h" -#include "object/level/parserparam.h" + #include "object/interface/powered_object.h" #include "object/interface/transportable_object.h" +#include "object/level/parserline.h" +#include "object/level/parserparam.h" + #include "ui/interface.h" #include "ui/window.h" diff --git a/src/object/auto/autoportico.cpp b/src/object/auto/autoportico.cpp index c82ded0a..84534b0a 100644 --- a/src/object/auto/autoportico.cpp +++ b/src/object/auto/autoportico.cpp @@ -20,11 +20,10 @@ #include "object/auto/autoportico.h" - #include "common/stringutils.h" -#include "object/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 4faeba11..dfd9b496 100644 --- a/src/object/auto/autopowercaptor.cpp +++ b/src/object/auto/autopowercaptor.cpp @@ -26,12 +26,14 @@ #include "object/object_manager.h" #include "object/old_object.h" -#include "object/level/parserline.h" -#include "object/level/parserparam.h" + #include "object/interface/carrier_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 "ui/interface.h" #include "ui/window.h" diff --git a/src/object/auto/autopowerplant.cpp b/src/object/auto/autopowerplant.cpp index 8f11d248..be3cf5d8 100644 --- a/src/object/auto/autopowerplant.cpp +++ b/src/object/auto/autopowerplant.cpp @@ -28,13 +28,15 @@ #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 "ui/interface.h" #include "ui/gauge.h" +#include "ui/interface.h" #include "ui/window.h" diff --git a/src/object/auto/autopowerstation.cpp b/src/object/auto/autopowerstation.cpp index 25ffffc7..44aef7c2 100644 --- a/src/object/auto/autopowerstation.cpp +++ b/src/object/auto/autopowerstation.cpp @@ -27,11 +27,12 @@ #include "object/object_manager.h" #include "object/old_object.h" + #include "object/interface/carrier_object.h" #include "object/interface/powered_object.h" -#include "ui/interface.h" #include "ui/gauge.h" +#include "ui/interface.h" #include "ui/window.h" diff --git a/src/object/auto/autoradar.cpp b/src/object/auto/autoradar.cpp index 221d7134..6014e386 100644 --- a/src/object/auto/autoradar.cpp +++ b/src/object/auto/autoradar.cpp @@ -25,9 +25,9 @@ #include "object/object_manager.h" #include "object/old_object.h" +#include "ui/gauge.h" #include "ui/interface.h" #include "ui/window.h" -#include "ui/gauge.h" diff --git a/src/object/auto/autorepair.cpp b/src/object/auto/autorepair.cpp index f1dd3ec8..74e6d9cb 100644 --- a/src/object/auto/autorepair.cpp +++ b/src/object/auto/autorepair.cpp @@ -24,6 +24,7 @@ #include "object/object_manager.h" #include "object/old_object.h" + #include "object/level/parserline.h" #include "object/level/parserparam.h" diff --git a/src/object/auto/autoresearch.cpp b/src/object/auto/autoresearch.cpp index b1e12234..5ce2c015 100644 --- a/src/object/auto/autoresearch.cpp +++ b/src/object/auto/autoresearch.cpp @@ -25,14 +25,16 @@ #include "math/geometry.h" -#include "object/robotmain.h" #include "object/old_object.h" -#include "object/level/parserline.h" -#include "object/level/parserparam.h" +#include "object/robotmain.h" + #include "object/interface/powered_object.h" -#include "ui/interface.h" +#include "object/level/parserline.h" +#include "object/level/parserparam.h" + #include "ui/gauge.h" +#include "ui/interface.h" #include "ui/window.h" diff --git a/src/object/auto/autoroot.cpp b/src/object/auto/autoroot.cpp index 011e1668..80b443bb 100644 --- a/src/object/auto/autoroot.cpp +++ b/src/object/auto/autoroot.cpp @@ -23,10 +23,10 @@ #include "graphics/engine/particle.h" #include "graphics/engine/terrain.h" -#include "object/old_object.h" - #include "math/geometry.h" +#include "object/old_object.h" + // Object's constructor. diff --git a/src/object/auto/autotower.cpp b/src/object/auto/autotower.cpp index 3a36e4fe..36e20951 100644 --- a/src/object/auto/autotower.cpp +++ b/src/object/auto/autotower.cpp @@ -26,15 +26,17 @@ #include "object/object_manager.h" #include "object/old_object.h" + +#include "object/interface/powered_object.h" + #include "object/level/parserline.h" #include "object/level/parserparam.h" -#include "object/interface/powered_object.h" #include "physics/physics.h" +#include "ui/gauge.h" #include "ui/interface.h" #include "ui/window.h" -#include "ui/gauge.h" const float TOWER_SCOPE = 200.0f; // range of beam diff --git a/src/object/auto/autovault.cpp b/src/object/auto/autovault.cpp index c5dfde60..36b72cde 100644 --- a/src/object/auto/autovault.cpp +++ b/src/object/auto/autovault.cpp @@ -27,9 +27,11 @@ #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 "object/interface/transportable_object.h" #include "ui/interface.h" #include "ui/window.h" diff --git a/src/object/brain.cpp b/src/object/brain.cpp index 5c021528..4c03e329 100644 --- a/src/object/brain.cpp +++ b/src/object/brain.cpp @@ -26,18 +26,25 @@ #include "common/misc.h" #include "graphics/core/color.h" + #include "graphics/engine/terrain.h" -#include "object/old_object.h" +#include "math/geometry.h" + #include "object/object_manager.h" -#include "object/motion/motion.h" -#include "object/motion/motionvehicle.h" -#include "object/task/taskmanager.h" -#include "object/level/parserline.h" -#include "object/level/parserparam.h" +#include "object/old_object.h" + #include "object/interface/carrier_object.h" #include "object/interface/powered_object.h" +#include "object/level/parserline.h" +#include "object/level/parserparam.h" + +#include "object/motion/motion.h" +#include "object/motion/motionvehicle.h" + +#include "object/task/taskmanager.h" + #include "physics/physics.h" #include "script/script.h" diff --git a/src/object/brain.h b/src/object/brain.h index 50760693..db1537be 100644 --- a/src/object/brain.h +++ b/src/object/brain.h @@ -24,15 +24,15 @@ #pragma once - #include "common/event.h" #include "common/misc.h" -#include "object/task/taskmanip.h" -#include "object/task/taskflag.h" -#include "object/task/taskshield.h" #include "object/trace_color.h" +#include "object/task/taskflag.h" +#include "object/task/taskmanip.h" +#include "object/task/taskshield.h" + #include #include #include diff --git a/src/object/interface/jostleable_object.h b/src/object/interface/jostleable_object.h index 7bd57ec5..2cf9f809 100644 --- a/src/object/interface/jostleable_object.h +++ b/src/object/interface/jostleable_object.h @@ -19,10 +19,10 @@ #pragma once -#include "object/object_interface_type.h" - #include "math/sphere.h" +#include "object/object_interface_type.h" + struct Event; /** diff --git a/src/object/level/parser.cpp b/src/object/level/parser.cpp index 10437ca3..ee627a45 100644 --- a/src/object/level/parser.cpp +++ b/src/object/level/parser.cpp @@ -19,18 +19,18 @@ #include "object/level/parser.h" - #include "app/app.h" #include "common/make_unique.h" -#include "common/resources/resourcemanager.h" + #include "common/resources/inputstream.h" #include "common/resources/outputstream.h" - -#include "object/level/parserexceptions.h" +#include "common/resources/resourcemanager.h" #include "object/robotmain.h" +#include "object/level/parserexceptions.h" + #include #include #include diff --git a/src/object/level/parser.h b/src/object/level/parser.h index 6700e6c9..7d5a2fc5 100644 --- a/src/object/level/parser.h +++ b/src/object/level/parser.h @@ -24,11 +24,11 @@ #pragma once +#include "object/level_category.h" + +#include "object/level/parserexceptions.h" #include "object/level/parserline.h" #include "object/level/parserparam.h" -#include "object/level/parserexceptions.h" - -#include "object/level_category.h" #include #include diff --git a/src/object/level/parserparam.cpp b/src/object/level/parserparam.cpp index 06463e5d..6e097069 100644 --- a/src/object/level/parserparam.cpp +++ b/src/object/level/parserparam.cpp @@ -17,18 +17,20 @@ * along with this program. If not, see http://gnu.org/licenses */ -#include "object/level/parserline.h" +#include "object/level/parserparam.h" #include "app/app.h" #include "common/logger.h" #include "common/make_unique.h" #include "common/pathman.h" + #include "common/resources/resourcemanager.h" -#include "object/level/parser.h" #include "object/robotmain.h" +#include "object/level/parser.h" + #include #include diff --git a/src/object/level/parserparam.h b/src/object/level/parserparam.h index 49897275..e57c9a7d 100644 --- a/src/object/level/parserparam.h +++ b/src/object/level/parserparam.h @@ -25,16 +25,17 @@ #pragma once #include "graphics/core/color.h" + #include "graphics/engine/camera.h" -#include "graphics/engine/water.h" #include "graphics/engine/pyro_type.h" +#include "graphics/engine/water.h" #include "math/point.h" #include "object/drive_type.h" +#include "object/mission_type.h" #include "object/object_type.h" #include "object/tool_type.h" -#include "object/mission_type.h" #include #include diff --git a/src/object/mainmovie.cpp b/src/object/mainmovie.cpp index a6fac03f..f186468e 100644 --- a/src/object/mainmovie.cpp +++ b/src/object/mainmovie.cpp @@ -24,12 +24,13 @@ #include "math/geometry.h" -#include "object/motion/motionhuman.h" #include "object/object.h" #include "object/robotmain.h" +#include "object/motion/motionhuman.h" -#include + +#include // Constructor of the application card. diff --git a/src/object/motion/motion.cpp b/src/object/motion/motion.cpp index 2c483103..2b3d86d7 100644 --- a/src/object/motion/motion.cpp +++ b/src/object/motion/motion.cpp @@ -24,15 +24,16 @@ #include "common/make_unique.h" -#include "object/robotmain.h" #include "object/old_object.h" +#include "object/robotmain.h" + #include "object/level/parserline.h" #include "object/level/parserparam.h" -#include -#include +#include +#include // Object's constructor. diff --git a/src/object/motion/motionhuman.cpp b/src/object/motion/motionhuman.cpp index eb5acdc9..b961f614 100644 --- a/src/object/motion/motionhuman.cpp +++ b/src/object/motion/motionhuman.cpp @@ -30,6 +30,7 @@ #include "object/old_object.h" #include "object/robotmain.h" + #include "object/interface/carrier_object.h" #include "physics/physics.h" diff --git a/src/object/motion/motiontoto.cpp b/src/object/motion/motiontoto.cpp index f37dcda4..1edecbcd 100644 --- a/src/object/motion/motiontoto.cpp +++ b/src/object/motion/motiontoto.cpp @@ -22,12 +22,12 @@ #include "app/app.h" -#include "math/geometry.h" - #include "graphics/engine/oldmodelmanager.h" #include "graphics/engine/terrain.h" #include "graphics/engine/water.h" +#include "math/geometry.h" + #include "object/old_object.h" #include "object/robotmain.h" diff --git a/src/object/motion/motionvehicle.cpp b/src/object/motion/motionvehicle.cpp index 822808b1..5b3762da 100644 --- a/src/object/motion/motionvehicle.cpp +++ b/src/object/motion/motionvehicle.cpp @@ -33,6 +33,7 @@ #include "object/brain.h" #include "object/object_manager.h" #include "object/old_object.h" + #include "object/interface/powered_object.h" #include "object/interface/transportable_object.h" diff --git a/src/object/motion/motionvehicle.h b/src/object/motion/motionvehicle.h index 6414bccd..556a64bb 100644 --- a/src/object/motion/motionvehicle.h +++ b/src/object/motion/motionvehicle.h @@ -21,6 +21,7 @@ #include "object/motion/motion.h" + #include "object/trace_color.h" diff --git a/src/object/object_factory.cpp b/src/object/object_factory.cpp index d4ef8c0d..b4a50b80 100644 --- a/src/object/object_factory.cpp +++ b/src/object/object_factory.cpp @@ -22,21 +22,24 @@ #include "common/make_unique.h" #include "graphics/engine/engine.h" +#include "graphics/engine/lightning.h" #include "graphics/engine/oldmodelmanager.h" #include "graphics/engine/terrain.h" -#include "graphics/engine/lightning.h" + #include "graphics/model/model_manager.h" -#include "object/old_object.h" +#include "math/geometry.h" + #include "object/brain.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" #include "object/auto/autoderrick.h" #include "object/auto/autodestroyer.h" #include "object/auto/autoegg.h" -#include "object/auto/autopowerplant.h" #include "object/auto/autofactory.h" #include "object/auto/autoflag.h" #include "object/auto/autohouston.h" @@ -45,29 +48,30 @@ #include "object/auto/automush.h" #include "object/auto/autonest.h" #include "object/auto/autonuclearplant.h" -#include "object/auto/autopowercaptor.h" #include "object/auto/autoportico.h" +#include "object/auto/autopowercaptor.h" +#include "object/auto/autopowerplant.h" +#include "object/auto/autopowerstation.h" #include "object/auto/autoradar.h" #include "object/auto/autorepair.h" #include "object/auto/autoresearch.h" #include "object/auto/autoroot.h" -#include "object/auto/autovault.h" -#include "object/auto/autopowerstation.h" #include "object/auto/autotower.h" +#include "object/auto/autovault.h" + #include "object/motion/motionant.h" #include "object/motion/motionbee.h" -#include "object/motion/motionlevelcontroller.h" #include "object/motion/motionhuman.h" +#include "object/motion/motionlevelcontroller.h" #include "object/motion/motionqueen.h" #include "object/motion/motionspider.h" #include "object/motion/motiontoto.h" #include "object/motion/motionvehicle.h" #include "object/motion/motionworm.h" + #include "object/subclass/exchange_post.h" #include "object/subclass/static_object.h" -#include "math/geometry.h" - #include "physics/physics.h" using COldObjectUPtr = std::unique_ptr; diff --git a/src/object/object_manager.cpp b/src/object/object_manager.cpp index 516e7f30..af41a28a 100644 --- a/src/object/object_manager.cpp +++ b/src/object/object_manager.cpp @@ -23,10 +23,11 @@ #include "math/all.h" #include "object/object.h" -#include "object/object_create_params.h" #include "object/object_create_exception.h" +#include "object/object_create_params.h" #include "object/object_factory.h" #include "object/old_object.h" + #include "object/auto/auto.h" #include "physics/physics.h" diff --git a/src/object/old_object.cpp b/src/object/old_object.cpp index 455dd4d6..b0df3e92 100644 --- a/src/object/old_object.cpp +++ b/src/object/old_object.cpp @@ -37,16 +37,19 @@ #include "math/geometry.h" +#include "object/brain.h" +#include "object/object_manager.h" +#include "object/robotmain.h" + #include "object/auto/auto.h" #include "object/auto/autojostle.h" -#include "object/brain.h" -#include "object/motion/motion.h" -#include "object/motion/motionvehicle.h" -#include "object/robotmain.h" -#include "object/object_manager.h" + +#include "object/level/parserexceptions.h" #include "object/level/parserline.h" #include "object/level/parserparam.h" -#include "object/level/parserexceptions.h" + +#include "object/motion/motion.h" +#include "object/motion/motionvehicle.h" #include "physics/physics.h" diff --git a/src/object/old_object_interface.h b/src/object/old_object_interface.h index 8cd6e846..d937e2e8 100644 --- a/src/object/old_object_interface.h +++ b/src/object/old_object_interface.h @@ -24,9 +24,8 @@ #pragma once - -#include "graphics/engine/engine.h" #include "graphics/engine/camera.h" +#include "graphics/engine/engine.h" #include "object/object_type.h" diff --git a/src/object/player_profile.cpp b/src/object/player_profile.cpp index f414c572..20b82364 100644 --- a/src/object/player_profile.cpp +++ b/src/object/player_profile.cpp @@ -16,19 +16,23 @@ * 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/player_profile.h" +#include "common/config_file.h" #include "common/logger.h" #include "common/make_unique.h" -#include "common/config_file.h" -#include "common/resources/resourcemanager.h" -#include "common/resources/inputstream.h" -#include "common/resources/outputstream.h" #include "common/restext.h" -#include "object/level/parser.h" +#include "common/resources/inputstream.h" +#include "common/resources/outputstream.h" +#include "common/resources/resourcemanager.h" + #include "object/robotmain.h" +#include "object/level/parser.h" + + void PlayerApperance::DefPerso() { this->colorCombi.r = 206.0f/256.0f; diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index 31633cca..726bdb03 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -17,7 +17,6 @@ * along with this program. If not, see http://gnu.org/licenses */ - #include "object/robotmain.h" #include "CBot/CBotDll.h" @@ -26,20 +25,18 @@ #include "app/controller.h" #include "app/input.h" -#include "clipboard/clipboard.h" - +#include "common/config_file.h" #include "common/event.h" #include "common/global.h" #include "common/logger.h" #include "common/make_unique.h" #include "common/misc.h" -#include "common/config_file.h" #include "common/restext.h" #include "common/stringutils.h" -#include "common/resources/resourcemanager.h" #include "common/resources/inputstream.h" #include "common/resources/outputstream.h" +#include "common/resources/resourcemanager.h" #include "graphics/engine/camera.h" #include "graphics/engine/cloud.h" @@ -53,28 +50,34 @@ #include "graphics/engine/terrain.h" #include "graphics/engine/text.h" #include "graphics/engine/water.h" + #include "graphics/model/model_manager.h" #include "math/const.h" #include "math/geometry.h" -#include "object/auto/auto.h" -#include "object/auto/autobase.h" #include "object/brain.h" #include "object/mainmovie.h" -#include "object/motion/motion.h" -#include "object/motion/motionhuman.h" -#include "object/motion/motiontoto.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" + +#include "object/subclass/exchange_post.h" + #include "object/task/task.h" #include "object/task/taskbuild.h" #include "object/task/taskmanip.h" -#include "object/level/parser.h" -#include "object/subclass/exchange_post.h" #include "physics/physics.h" @@ -100,6 +103,7 @@ #include +#include #include diff --git a/src/object/robotmain.h b/src/object/robotmain.h index f5ca0233..8134a8f7 100644 --- a/src/object/robotmain.h +++ b/src/object/robotmain.h @@ -24,20 +24,19 @@ #pragma once +#include "app/pausemanager.h" #include "common/global.h" #include "common/singleton.h" #include "graphics/engine/particle.h" -#include "object/level_category.h" -#include "object/object_type.h" #include "object/drive_type.h" -#include "object/tool_type.h" +#include "object/level_category.h" #include "object/mainmovie.h" #include "object/mission_type.h" - -#include "app/pausemanager.h" +#include "object/object_type.h" +#include "object/tool_type.h" #include diff --git a/src/object/scene_conditions.cpp b/src/object/scene_conditions.cpp index b0c9e01f..eea9d6aa 100644 --- a/src/object/scene_conditions.cpp +++ b/src/object/scene_conditions.cpp @@ -17,17 +17,19 @@ * along with this program. If not, see http://gnu.org/licenses */ - #include "object/scene_conditions.h" #include "math/geometry.h" -#include "object/level/parserline.h" -#include "object/object_manager.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) { this->pos = line->GetParam("pos")->AsPoint(Math::Vector(0.0f, 0.0f, 0.0f))*g_unit; diff --git a/src/object/scene_conditions.h b/src/object/scene_conditions.h index 73da9e9e..f94537d3 100644 --- a/src/object/scene_conditions.h +++ b/src/object/scene_conditions.h @@ -28,9 +28,9 @@ #include "math/vector.h" +#include "object/drive_type.h" #include "object/object_type.h" #include "object/tool_type.h" -#include "object/drive_type.h" class CLevelParserLine; diff --git a/src/object/subclass/exchange_post.cpp b/src/object/subclass/exchange_post.cpp index c482067e..d1d7074e 100644 --- a/src/object/subclass/exchange_post.cpp +++ b/src/object/subclass/exchange_post.cpp @@ -25,10 +25,10 @@ #include "graphics/engine/oldmodelmanager.h" #include "object/object_create_params.h" + +#include "object/level/parserexceptions.h" #include "object/level/parserline.h" #include "object/level/parserparam.h" -#include "object/level/parserexceptions.h" - #include "ui/interface.h" #include "ui/list.h" diff --git a/src/object/subclass/exchange_post.h b/src/object/subclass/exchange_post.h index 8e26c09a..cd51e275 100644 --- a/src/object/subclass/exchange_post.h +++ b/src/object/subclass/exchange_post.h @@ -21,6 +21,7 @@ #pragma once #include "object/old_object.h" + #include "object/auto/auto.h" #include diff --git a/src/object/subclass/static_object.cpp b/src/object/subclass/static_object.cpp index cd00925f..83f50b6d 100644 --- a/src/object/subclass/static_object.cpp +++ b/src/object/subclass/static_object.cpp @@ -22,14 +22,15 @@ #include "common/make_unique.h" #include "graphics/engine/terrain.h" + #include "graphics/model/model.h" #include "graphics/model/model_io_exception.h" #include "graphics/model/model_manager.h" -#include "object/object_create_exception.h" - #include "math/geometry.h" +#include "object/object_create_exception.h" + const std::unordered_map CStaticObject::m_staticModelNames = { diff --git a/src/object/task/task.cpp b/src/object/task/task.cpp index d7186362..db54fb48 100644 --- a/src/object/task/task.cpp +++ b/src/object/task/task.cpp @@ -24,6 +24,7 @@ #include "object/old_object.h" #include "object/robotmain.h" + #include "object/interface/programmable_object.h" diff --git a/src/object/task/taskadvance.cpp b/src/object/task/taskadvance.cpp index c4f4881b..d6abf127 100644 --- a/src/object/task/taskadvance.cpp +++ b/src/object/task/taskadvance.cpp @@ -27,6 +27,7 @@ #include "object/object.h" #include "object/old_object.h" + #include "physics/physics.h" diff --git a/src/object/task/taskbuild.cpp b/src/object/task/taskbuild.cpp index 8ba74540..3a894e10 100644 --- a/src/object/task/taskbuild.cpp +++ b/src/object/task/taskbuild.cpp @@ -22,20 +22,24 @@ #include "graphics/core/color.h" #include "graphics/core/light.h" + #include "graphics/engine/lightman.h" #include "graphics/engine/terrain.h" #include "graphics/engine/water.h" #include "math/geometry.h" -#include "object/auto/auto.h" -#include "object/motion/motionhuman.h" #include "object/object_manager.h" #include "object/old_object.h" #include "object/robotmain.h" + +#include "object/auto/auto.h" + #include "object/interface/carrier_object.h" #include "object/interface/transportable_object.h" +#include "object/motion/motionhuman.h" + #include "physics/physics.h" #include diff --git a/src/object/task/taskbuild.h b/src/object/task/taskbuild.h index 3993fdb2..7dcf9a2b 100644 --- a/src/object/task/taskbuild.h +++ b/src/object/task/taskbuild.h @@ -24,10 +24,10 @@ #include "object/task/task.h" -#include "object/object_type.h" - #include "math/vector.h" +#include "object/object_type.h" + class CObject; diff --git a/src/object/task/taskdeletemark.cpp b/src/object/task/taskdeletemark.cpp index 259c6aa3..e39bf584 100644 --- a/src/object/task/taskdeletemark.cpp +++ b/src/object/task/taskdeletemark.cpp @@ -20,16 +20,15 @@ #include "object/task/taskdeletemark.h" - #include "graphics/engine/particle.h" #include "graphics/engine/terrain.h" -#include "object/old_object.h" -#include "object/object_manager.h" -#include "object/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/taskfireant.cpp b/src/object/task/taskfireant.cpp index c05700a9..57ecd4e4 100644 --- a/src/object/task/taskfireant.cpp +++ b/src/object/task/taskfireant.cpp @@ -24,9 +24,10 @@ #include "math/geometry.h" -#include "object/motion/motionant.h" #include "object/old_object.h" +#include "object/motion/motionant.h" + #include "physics/physics.h" diff --git a/src/object/task/taskfireant.h b/src/object/task/taskfireant.h index eff520e0..40915729 100644 --- a/src/object/task/taskfireant.h +++ b/src/object/task/taskfireant.h @@ -23,8 +23,8 @@ #include "object/task/task.h" -#include "math/vector.h" +#include "math/vector.h" enum TaskFireAnt diff --git a/src/object/task/taskflag.cpp b/src/object/task/taskflag.cpp index 9c71ab89..2e89adc6 100644 --- a/src/object/task/taskflag.cpp +++ b/src/object/task/taskflag.cpp @@ -17,20 +17,21 @@ * along with this program. If not, see http://gnu.org/licenses */ - #include "object/task/taskflag.h" -#include "math/geometry.h" - #include "graphics/engine/particle.h" #include "graphics/engine/pyro_manager.h" #include "graphics/engine/water.h" -#include "object/old_object.h" +#include "math/geometry.h" + #include "object/object_manager.h" -#include "object/motion/motionhuman.h" +#include "object/old_object.h" + #include "object/interface/carrier_object.h" +#include "object/motion/motionhuman.h" + #include "physics/physics.h" diff --git a/src/object/task/taskflag.h b/src/object/task/taskflag.h index 3b6f1a15..2dd11347 100644 --- a/src/object/task/taskflag.h +++ b/src/object/task/taskflag.h @@ -22,10 +22,10 @@ #include "object/task/task.h" -#include "object/object_type.h" - #include "math/vector.h" +#include "object/object_type.h" + class CObject; diff --git a/src/object/task/taskgoto.cpp b/src/object/task/taskgoto.cpp index 1ae7adf6..057ac4b8 100644 --- a/src/object/task/taskgoto.cpp +++ b/src/object/task/taskgoto.cpp @@ -27,8 +27,9 @@ #include "math/geometry.h" -#include "object/old_object.h" #include "object/object_manager.h" +#include "object/old_object.h" + #include "object/interface/transportable_object.h" #include "physics/physics.h" diff --git a/src/object/task/taskinfo.cpp b/src/object/task/taskinfo.cpp index 569ff994..cfbe72ea 100644 --- a/src/object/task/taskinfo.cpp +++ b/src/object/task/taskinfo.cpp @@ -23,6 +23,7 @@ #include "graphics/engine/particle.h" #include "object/object_manager.h" + #include "object/subclass/exchange_post.h" #include diff --git a/src/object/task/taskmanager.cpp b/src/object/task/taskmanager.cpp index 026b843a..7357e975 100644 --- a/src/object/task/taskmanager.cpp +++ b/src/object/task/taskmanager.cpp @@ -20,23 +20,23 @@ #include "object/task/taskmanager.h" -#include "object/task/taskwait.h" +#include "object/old_object.h" + #include "object/task/taskadvance.h" -#include "object/task/taskturn.h" -#include "object/task/tasktake.h" #include "object/task/taskbuild.h" -#include "object/task/tasksearch.h" #include "object/task/taskdeletemark.h" -#include "object/task/taskterraform.h" -#include "object/task/taskpen.h" -#include "object/task/taskrecover.h" -#include "object/task/taskinfo.h" #include "object/task/taskfire.h" #include "object/task/taskfireant.h" #include "object/task/taskgungoal.h" +#include "object/task/taskinfo.h" +#include "object/task/taskpen.h" +#include "object/task/taskrecover.h" +#include "object/task/tasksearch.h" #include "object/task/taskspiderexplo.h" - -#include "object/old_object.h" +#include "object/task/tasktake.h" +#include "object/task/taskterraform.h" +#include "object/task/taskturn.h" +#include "object/task/taskwait.h" // Object's constructor. diff --git a/src/object/task/taskmanager.h b/src/object/task/taskmanager.h index 4c6836fd..f30e807d 100644 --- a/src/object/task/taskmanager.h +++ b/src/object/task/taskmanager.h @@ -21,13 +21,13 @@ #pragma once +#include "object/trace_color.h" #include "object/task/task.h" -#include "object/task/taskmanip.h" -#include "object/task/taskgoto.h" -#include "object/task/taskshield.h" #include "object/task/taskflag.h" -#include "object/trace_color.h" +#include "object/task/taskgoto.h" +#include "object/task/taskmanip.h" +#include "object/task/taskshield.h" diff --git a/src/object/task/taskmanip.cpp b/src/object/task/taskmanip.cpp index a02a4f9f..fb31d09c 100644 --- a/src/object/task/taskmanip.cpp +++ b/src/object/task/taskmanip.cpp @@ -20,14 +20,15 @@ #include "object/task/taskmanip.h" -#include "graphics/engine/terrain.h" #include "graphics/engine/pyro_manager.h" +#include "graphics/engine/terrain.h" #include "math/geometry.h" -#include "object/old_object.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" #include "object/interface/transportable_object.h" diff --git a/src/object/task/taskmanip.h b/src/object/task/taskmanip.h index 533663d7..be41d6d0 100644 --- a/src/object/task/taskmanip.h +++ b/src/object/task/taskmanip.h @@ -24,10 +24,10 @@ #include "object/task/task.h" -#include "object/object_type.h" - #include "math/vector.h" +#include "object/object_type.h" + class CObject; diff --git a/src/object/task/taskpen.cpp b/src/object/task/taskpen.cpp index 5231556f..d4c6007b 100644 --- a/src/object/task/taskpen.cpp +++ b/src/object/task/taskpen.cpp @@ -22,10 +22,10 @@ #include "graphics/engine/particle.h" -#include "object/old_object.h" - #include "math/geometry.h" +#include "object/old_object.h" + // Object's constructor. diff --git a/src/object/task/taskpen.h b/src/object/task/taskpen.h index d4aef7d3..4354a2d6 100644 --- a/src/object/task/taskpen.h +++ b/src/object/task/taskpen.h @@ -23,9 +23,10 @@ #include "object/task/task.h" -#include "object/trace_color.h" + #include "math/vector.h" +#include "object/trace_color.h" enum TaskPenPhase diff --git a/src/object/task/taskrecover.cpp b/src/object/task/taskrecover.cpp index 68592781..97ea90d6 100644 --- a/src/object/task/taskrecover.cpp +++ b/src/object/task/taskrecover.cpp @@ -24,13 +24,14 @@ #include "math/geometry.h" -#include "physics/physics.h" - -#include "object/old_object.h" #include "object/object_manager.h" +#include "object/old_object.h" #include "object/robotmain.h" + #include "object/interface/powered_object.h" +#include "physics/physics.h" + const float ENERGY_RECOVER = 0.25f; // energy consumed by recovery const float RECOVER_DIST = 11.8f; diff --git a/src/object/task/tasksearch.cpp b/src/object/task/tasksearch.cpp index 9d415b40..35b78dab 100644 --- a/src/object/task/tasksearch.cpp +++ b/src/object/task/tasksearch.cpp @@ -25,8 +25,8 @@ #include "math/geometry.h" -#include "object/old_object.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/taskshield.cpp b/src/object/task/taskshield.cpp index 89919cf3..694cfbaf 100644 --- a/src/object/task/taskshield.cpp +++ b/src/object/task/taskshield.cpp @@ -21,15 +21,17 @@ #include "object/task/taskshield.h" #include "graphics/core/light.h" -#include "graphics/engine/particle.h" + #include "graphics/engine/lightman.h" +#include "graphics/engine/particle.h" #include "math/geometry.h" #include "object/brain.h" -#include "object/old_object.h" #include "object/object_manager.h" +#include "object/old_object.h" #include "object/robotmain.h" + #include "object/interface/powered_object.h" #include "physics/physics.h" diff --git a/src/object/task/taskspiderexplo.cpp b/src/object/task/taskspiderexplo.cpp index f6fdfd75..eadf44a7 100644 --- a/src/object/task/taskspiderexplo.cpp +++ b/src/object/task/taskspiderexplo.cpp @@ -23,9 +23,10 @@ #include "graphics/engine/engine.h" #include "graphics/engine/pyro_manager.h" -#include "object/motion/motionspider.h" #include "object/old_object.h" +#include "object/motion/motionspider.h" + #include "physics/physics.h" diff --git a/src/object/task/tasktake.cpp b/src/object/task/tasktake.cpp index b50bf909..2ba350c4 100644 --- a/src/object/task/tasktake.cpp +++ b/src/object/task/tasktake.cpp @@ -25,14 +25,16 @@ #include "math/geometry.h" -#include "object/old_object.h" -#include "object/motion/motionhuman.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" #include "object/interface/transportable_object.h" +#include "object/motion/motionhuman.h" + #include "physics/physics.h" diff --git a/src/object/task/taskterraform.cpp b/src/object/task/taskterraform.cpp index 002ea22a..cf2af574 100644 --- a/src/object/task/taskterraform.cpp +++ b/src/object/task/taskterraform.cpp @@ -19,21 +19,23 @@ #include "object/task/taskterraform.h" -#include "graphics/engine/pyro_manager.h" #include "graphics/engine/particle.h" +#include "graphics/engine/pyro_manager.h" #include "graphics/engine/terrain.h" #include "math/geometry.h" -#include "object/old_object.h" #include "object/brain.h" #include "object/object_manager.h" +#include "object/old_object.h" #include "object/robotmain.h" -#include "object/motion/motionant.h" -#include "object/motion/motionspider.h" + #include "object/interface/powered_object.h" #include "object/interface/programmable_object.h" +#include "object/motion/motionant.h" +#include "object/motion/motionspider.h" + #include "physics/physics.h" diff --git a/src/object/task/taskturn.cpp b/src/object/task/taskturn.cpp index 365d0c8a..64eac50f 100644 --- a/src/object/task/taskturn.cpp +++ b/src/object/task/taskturn.cpp @@ -21,11 +21,12 @@ #include "object/task/taskturn.h" #include "graphics/engine/terrain.h" -#include "physics/physics.h" #include "object/old_object.h" #include "object/robotmain.h" +#include "physics/physics.h" + // Object's constructor. diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp index 0e732abb..c1363c9b 100644 --- a/src/physics/physics.cpp +++ b/src/physics/physics.cpp @@ -37,19 +37,23 @@ #include "object/brain.h" #include "object/object_manager.h" -#include "object/robotmain.h" -#include "object/motion/motion.h" -#include "object/motion/motionvehicle.h" -#include "object/motion/motionhuman.h" -#include "object/task/task.h" -#include "object/level/parserline.h" -#include "object/level/parserparam.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" + +#include "object/task/task.h" + const float LANDING_SPEED = 3.0f; diff --git a/src/script/cbottoken.cpp b/src/script/cbottoken.cpp index d526f4a8..829e9879 100644 --- a/src/script/cbottoken.cpp +++ b/src/script/cbottoken.cpp @@ -20,9 +20,10 @@ #include "script/cbottoken.h" -#include "object/object_type.h" #include "app/app.h" +#include "object/object_type.h" + #include diff --git a/src/script/script.cpp b/src/script/script.cpp index 5ef9b1b7..59050051 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -20,28 +20,29 @@ #include "script/script.h" - #include "app/pausemanager.h" -#include "common/resources/resourcemanager.h" -#include "common/resources/inputstream.h" -#include "common/resources/outputstream.h" #include "common/restext.h" #include "common/stringutils.h" +#include "common/resources/inputstream.h" +#include "common/resources/outputstream.h" +#include "common/resources/resourcemanager.h" + #include "graphics/engine/engine.h" #include "graphics/engine/text.h" #include "object/old_object.h" -#include "object/task/taskmanager.h" #include "object/robotmain.h" +#include "object/task/taskmanager.h" + #include "script/cbottoken.h" -#include "ui/interface.h" -#include "ui/edit.h" -#include "ui/list.h" #include "ui/displaytext.h" +#include "ui/edit.h" +#include "ui/interface.h" +#include "ui/list.h" diff --git a/src/script/script.h b/src/script/script.h index ccb8cddf..fa353b27 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -24,12 +24,11 @@ #pragma once +#include "CBot/CBotDll.h" #include "common/event.h" - #include "common/global.h" -#include "CBot/CBotDll.h" class COldObject; diff --git a/src/script/scriptfunc.cpp b/src/script/scriptfunc.cpp index 81f3c733..af0bb95c 100644 --- a/src/script/scriptfunc.cpp +++ b/src/script/scriptfunc.cpp @@ -19,13 +19,14 @@ #include "script/scriptfunc.h" +#include "common/config.h" #include "app/app.h" -#include "common/config.h" #include "common/logger.h" #include "common/make_unique.h" #include "common/pathman.h" + #include "common/resources/inputstream.h" #include "common/resources/outputstream.h" #include "common/resources/resourcemanager.h" @@ -38,17 +39,19 @@ #include "object/brain.h" #include "object/object.h" #include "object/object_manager.h" -#include "object/trace_color.h" #include "object/robotmain.h" -#include "object/task/taskmanager.h" -#include "object/subclass/exchange_post.h" +#include "object/trace_color.h" #include "object/auto/auto.h" -#include "object/auto/autofactory.h" #include "object/auto/autobase.h" +#include "object/auto/autofactory.h" #include "object/motion/motionvehicle.h" +#include "object/subclass/exchange_post.h" + +#include "object/task/taskmanager.h" + #include "physics/physics.h" #include "script/cbottoken.h" diff --git a/src/script/scriptfunc.h b/src/script/scriptfunc.h index 18064c88..5af89864 100644 --- a/src/script/scriptfunc.h +++ b/src/script/scriptfunc.h @@ -24,10 +24,10 @@ #pragma once -#include "common/global.h" - #include "CBot/CBotDll.h" +#include "common/global.h" + #include #include #include diff --git a/src/sound/oalsound/alsound.h b/src/sound/oalsound/alsound.h index 9b41c54d..80809de2 100644 --- a/src/sound/oalsound/alsound.h +++ b/src/sound/oalsound/alsound.h @@ -24,7 +24,6 @@ #pragma once -#include "common/logger.h" #include "sound/sound.h" #include "sound/oalsound/buffer.h" diff --git a/src/sound/oalsound/buffer.cpp b/src/sound/oalsound/buffer.cpp index 5fa13fdd..c6075cb8 100644 --- a/src/sound/oalsound/buffer.cpp +++ b/src/sound/oalsound/buffer.cpp @@ -20,10 +20,10 @@ #include "sound/oalsound/buffer.h" -#include "sound/oalsound/check.h" - #include "common/resources/resourcemanager.h" +#include "sound/oalsound/check.h" + #include diff --git a/src/sound/oalsound/buffer.h b/src/sound/oalsound/buffer.h index ed448eef..15d7434c 100644 --- a/src/sound/oalsound/buffer.h +++ b/src/sound/oalsound/buffer.h @@ -25,7 +25,6 @@ #pragma once #include "sound/sound.h" -#include "common/logger.h" #include #include diff --git a/src/sound/sound.cpp b/src/sound/sound.cpp index 38ec56e8..fbf90b58 100644 --- a/src/sound/sound.cpp +++ b/src/sound/sound.cpp @@ -19,10 +19,10 @@ #include "sound/sound.h" -#include "math/vector.h" - #include "common/logger.h" +#include "math/vector.h" + #include #include #include diff --git a/src/tools/convert_model.cpp b/src/tools/convert_model.cpp index 96c2dd65..15a5396d 100644 --- a/src/tools/convert_model.cpp +++ b/src/tools/convert_model.cpp @@ -19,8 +19,8 @@ #include "common/logger.h" #include "graphics/model/model_input.h" -#include "graphics/model/model_output.h" #include "graphics/model/model_io_exception.h" +#include "graphics/model/model_output.h" #include #include diff --git a/src/ui/color.cpp b/src/ui/color.cpp index ffd58d93..b5ab86b7 100644 --- a/src/ui/color.cpp +++ b/src/ui/color.cpp @@ -25,6 +25,7 @@ #include "common/restext.h" #include "graphics/core/device.h" + #include "graphics/engine/engine.h" #include diff --git a/src/ui/compass.cpp b/src/ui/compass.cpp index 9ad185bb..a3c7676b 100644 --- a/src/ui/compass.cpp +++ b/src/ui/compass.cpp @@ -24,6 +24,7 @@ #include "common/misc.h" #include "graphics/core/device.h" + #include "graphics/engine/engine.h" #include "math/geometry.h" diff --git a/src/ui/control.cpp b/src/ui/control.cpp index fa4b503e..bce6a77c 100644 --- a/src/ui/control.cpp +++ b/src/ui/control.cpp @@ -22,6 +22,11 @@ #include "app/app.h" +#include "common/restext.h" + +#include "object/robotmain.h" + + namespace Ui { diff --git a/src/ui/control.h b/src/ui/control.h index 5ccde02b..14dddccc 100644 --- a/src/ui/control.h +++ b/src/ui/control.h @@ -21,21 +21,20 @@ #pragma once -#include - #include "common/event.h" -#include "common/misc.h" -#include "common/restext.h" -#include "graphics/core/device.h" -#include "graphics/engine/engine.h" -#include "graphics/engine/particle.h" #include "graphics/engine/text.h" -#include "object/robotmain.h" +#include -#include "sound/sound.h" +class CRobotMain; +class CSoundInterface; +namespace Gfx +{ +class CEngine; +class CParticle; +} namespace Ui diff --git a/src/ui/displayinfo.cpp b/src/ui/displayinfo.cpp index 645a0245..62009208 100644 --- a/src/ui/displayinfo.cpp +++ b/src/ui/displayinfo.cpp @@ -27,6 +27,7 @@ #include "common/stringutils.h" #include "graphics/core/light.h" + #include "graphics/engine/engine.h" #include "graphics/engine/lightman.h" #include "graphics/engine/particle.h" @@ -34,16 +35,17 @@ #include "object/object.h" #include "object/object_manager.h" #include "object/robotmain.h" + #include "object/motion/motion.h" #include "object/motion/motiontoto.h" #include "script/cbottoken.h" -#include "ui/interface.h" #include "ui/button.h" -#include "ui/slider.h" #include "ui/edit.h" #include "ui/group.h" +#include "ui/interface.h" +#include "ui/slider.h" #include "ui/window.h" #include diff --git a/src/ui/displayinfo.h b/src/ui/displayinfo.h index 813a9093..d24cbb2c 100644 --- a/src/ui/displayinfo.h +++ b/src/ui/displayinfo.h @@ -21,13 +21,13 @@ #pragma once -#include +#include "app/pausemanager.h" #include "common/event.h" #include "graphics/engine/camera.h" -#include "app/pausemanager.h" +#include class CRobotMain; class CObject; diff --git a/src/ui/displaytext.cpp b/src/ui/displaytext.cpp index c4caf6eb..96ba7249 100644 --- a/src/ui/displaytext.cpp +++ b/src/ui/displaytext.cpp @@ -29,14 +29,15 @@ #include "object/object.h" #include "object/object_manager.h" + #include "object/motion/motion.h" #include "object/motion/motiontoto.h" -#include "ui/interface.h" #include "ui/button.h" +#include "ui/group.h" +#include "ui/interface.h" #include "ui/label.h" #include "ui/window.h" -#include "ui/group.h" diff --git a/src/ui/edit.cpp b/src/ui/edit.cpp index 141a5ccd..fe4468a7 100644 --- a/src/ui/edit.cpp +++ b/src/ui/edit.cpp @@ -20,22 +20,28 @@ #include "ui/edit.h" +#include "common/config.h" + #include "app/app.h" #include "app/input.h" -#include "clipboard/clipboard.h" - -#include "common/config.h" #include "common/logger.h" +#include "common/misc.h" #include "common/pathman.h" + #include "common/resources/inputstream.h" #include "common/resources/outputstream.h" #include "object/robotmain.h" -#include +#include "ui/scroll.h" + +#include + #include +#include + namespace Ui { diff --git a/src/ui/edit.h b/src/ui/edit.h index 1eae6741..d42d6db7 100644 --- a/src/ui/edit.h +++ b/src/ui/edit.h @@ -25,30 +25,13 @@ #pragma once - #include "ui/control.h" -#include "ui/scroll.h" - -#include "graphics/engine/engine.h" -#include "graphics/engine/text.h" - -#include "common/event.h" -#include "common/misc.h" -#include "common/restext.h" - -#include -#include -#include - -#include -#include - -namespace fs = boost::filesystem; namespace Ui { +class CScroll; //! maximum number of characters in CBOT edit diff --git a/src/ui/editvalue.cpp b/src/ui/editvalue.cpp index 57880e7c..c59bce2b 100644 --- a/src/ui/editvalue.cpp +++ b/src/ui/editvalue.cpp @@ -25,8 +25,8 @@ #include "object/robotmain.h" -#include "ui/edit.h" #include "ui/button.h" +#include "ui/edit.h" #include "ui/interface.h" diff --git a/src/ui/editvalue.h b/src/ui/editvalue.h index 1afcf27a..4c94aaf9 100644 --- a/src/ui/editvalue.h +++ b/src/ui/editvalue.h @@ -42,6 +42,7 @@ enum EditValueType class CEdit; class CButton; +class CInterface; diff --git a/src/ui/gauge.cpp b/src/ui/gauge.cpp index bfb2ec64..89b6fc8c 100644 --- a/src/ui/gauge.cpp +++ b/src/ui/gauge.cpp @@ -20,6 +20,8 @@ #include "ui/gauge.h" +#include "graphics/engine/engine.h" + namespace Ui { diff --git a/src/ui/gauge.h b/src/ui/gauge.h index eb73f13f..a709958f 100644 --- a/src/ui/gauge.h +++ b/src/ui/gauge.h @@ -21,14 +21,8 @@ #pragma once -#include "graphics/engine/engine.h" - -#include "common/event.h" -#include "common/misc.h" - #include "ui/control.h" - namespace Ui { diff --git a/src/ui/interface.h b/src/ui/interface.h index c5e7fb70..d284748a 100644 --- a/src/ui/interface.h +++ b/src/ui/interface.h @@ -24,29 +24,29 @@ #include "common/event.h" #include "common/misc.h" -#include "math/point.h" - #include "graphics/engine/camera.h" #include "graphics/engine/engine.h" -#include "ui/control.h" +#include "math/point.h" + #include "ui/button.h" -#include "ui/color.h" #include "ui/check.h" -#include "ui/key.h" -#include "ui/group.h" -#include "ui/image.h" -#include "ui/label.h" +#include "ui/color.h" +#include "ui/compass.h" +#include "ui/control.h" #include "ui/edit.h" #include "ui/editvalue.h" #include "ui/enumslider.h" -#include "ui/scroll.h" -#include "ui/slider.h" +#include "ui/group.h" +#include "ui/image.h" +#include "ui/key.h" +#include "ui/label.h" #include "ui/list.h" -#include "ui/shortcut.h" -#include "ui/compass.h" -#include "ui/target.h" #include "ui/map.h" +#include "ui/scroll.h" +#include "ui/shortcut.h" +#include "ui/slider.h" +#include "ui/target.h" #include "ui/window.h" #include diff --git a/src/ui/key.cpp b/src/ui/key.cpp index d71171ab..a79cc8d6 100644 --- a/src/ui/key.cpp +++ b/src/ui/key.cpp @@ -23,6 +23,10 @@ #include "common/global.h" #include "common/stringutils.h" +#include "graphics/engine/engine.h" + +#include "sound/sound.h" + #include namespace Ui diff --git a/src/ui/key.h b/src/ui/key.h index 1f12369a..00bdfe19 100644 --- a/src/ui/key.h +++ b/src/ui/key.h @@ -29,8 +29,8 @@ #include "app/input.h" #include "common/event.h" -#include "common/restext.h" #include "common/key.h" +#include "common/restext.h" namespace Ui diff --git a/src/ui/label.cpp b/src/ui/label.cpp index 68349d7a..b0ff1e67 100644 --- a/src/ui/label.cpp +++ b/src/ui/label.cpp @@ -20,6 +20,8 @@ #include "ui/label.h" +#include "graphics/engine/engine.h" + namespace Ui { diff --git a/src/ui/list.cpp b/src/ui/list.cpp index fa4c0ef1..f29e1dda 100644 --- a/src/ui/list.cpp +++ b/src/ui/list.cpp @@ -20,7 +20,10 @@ #include "ui/list.h" -#include +#include "graphics/engine/engine.h" + +#include +#include namespace Ui { diff --git a/src/ui/list.h b/src/ui/list.h index 81b6470b..45f6303e 100644 --- a/src/ui/list.h +++ b/src/ui/list.h @@ -23,14 +23,15 @@ #include "ui/control.h" -#include "ui/button.h" -#include "ui/scroll.h" #include "common/event.h" #include "common/misc.h" #include "graphics/engine/text.h" +#include "ui/button.h" +#include "ui/scroll.h" + namespace Ui { diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp index d53efd34..7337291e 100644 --- a/src/ui/maindialog.cpp +++ b/src/ui/maindialog.cpp @@ -20,45 +20,46 @@ #include "ui/maindialog.h" +#include "common/config.h" + #include "app/app.h" #include "app/input.h" #include "app/system.h" -#include "common/config.h" -#include "common/global.h" +#include "common/config_file.h" #include "common/event.h" +#include "common/global.h" #include "common/logger.h" #include "common/make_unique.h" #include "common/misc.h" -#include "common/config_file.h" #include "common/restext.h" #include "common/stringutils.h" -#include "common/resources/resourcemanager.h" #include "common/resources/inputstream.h" #include "common/resources/outputstream.h" - -#include "object/level/parser.h" +#include "common/resources/resourcemanager.h" #include "object/player_profile.h" #include "object/robotmain.h" +#include "object/level/parser.h" + #include "sound/sound.h" -#include "ui/interface.h" #include "ui/button.h" -#include "ui/color.h" #include "ui/check.h" -#include "ui/key.h" -#include "ui/group.h" -#include "ui/image.h" -#include "ui/scroll.h" -#include "ui/slider.h" -#include "ui/list.h" -#include "ui/label.h" -#include "ui/window.h" +#include "ui/color.h" #include "ui/edit.h" #include "ui/editvalue.h" +#include "ui/group.h" +#include "ui/image.h" +#include "ui/interface.h" +#include "ui/key.h" +#include "ui/label.h" +#include "ui/list.h" +#include "ui/scroll.h" +#include "ui/slider.h" +#include "ui/window.h" #include #include diff --git a/src/ui/maindialog.h b/src/ui/maindialog.h index f9a31d26..140fb0f9 100644 --- a/src/ui/maindialog.h +++ b/src/ui/maindialog.h @@ -18,15 +18,15 @@ */ #pragma once +#include "app/pausemanager.h" #include "graphics/core/color.h" + #include "graphics/engine/camera.h" #include "object/level_category.h" #include "object/robotmain.h" -#include "app/pausemanager.h" - #include diff --git a/src/ui/mainshort.cpp b/src/ui/mainshort.cpp index 2583d926..62536d26 100644 --- a/src/ui/mainshort.cpp +++ b/src/ui/mainshort.cpp @@ -24,8 +24,8 @@ #include "common/logger.h" -#include "object/object_manager.h" #include "object/object.h" +#include "object/object_manager.h" namespace Ui diff --git a/src/ui/map.cpp b/src/ui/map.cpp index 3f8a2123..0443ec72 100644 --- a/src/ui/map.cpp +++ b/src/ui/map.cpp @@ -22,9 +22,18 @@ #include "common/image.h" +#include "graphics/core/device.h" + +#include "graphics/engine/terrain.h" +#include "graphics/engine/water.h" + +#include "math/geometry.h" + +#include "object/robotmain.h" + #include "object/interface/transportable_object.h" -#include +#include namespace Ui diff --git a/src/ui/map.h b/src/ui/map.h index 42f2eb34..ff6fc549 100644 --- a/src/ui/map.h +++ b/src/ui/map.h @@ -21,20 +21,19 @@ #pragma once - #include "ui/control.h" #include "common/event.h" -#include "graphics/engine/terrain.h" -#include "graphics/engine/water.h" -#include "graphics/engine/engine.h" -#include "graphics/core/device.h" -#include "graphics/core/vertex.h" +#include "object/object_type.h" -#include "math/geometry.h" +class CObject; -#include "object/robotmain.h" +namespace Gfx +{ +class CWater; +class CTerrain; +} namespace Ui diff --git a/src/ui/shortcut.cpp b/src/ui/shortcut.cpp index 1d848410..d29dd293 100644 --- a/src/ui/shortcut.cpp +++ b/src/ui/shortcut.cpp @@ -23,10 +23,11 @@ #include "common/event.h" #include "common/misc.h" -#include "graphics/engine/engine.h" #include "graphics/core/device.h" -#include +#include "graphics/engine/engine.h" + +#include namespace Ui { diff --git a/src/ui/slider.h b/src/ui/slider.h index 416e4e0d..64edbc55 100644 --- a/src/ui/slider.h +++ b/src/ui/slider.h @@ -21,11 +21,7 @@ #pragma once - #include "ui/control.h" -#include "common/event.h" - -#include namespace Ui { diff --git a/src/ui/studio.cpp b/src/ui/studio.cpp index abe145f8..1f45c57a 100644 --- a/src/ui/studio.cpp +++ b/src/ui/studio.cpp @@ -24,12 +24,12 @@ #include "app/app.h" -#include "common/logger.h" -#include "common/resources/resourcemanager.h" - #include "common/event.h" +#include "common/logger.h" #include "common/misc.h" +#include "common/resources/resourcemanager.h" + #include "graphics/engine/camera.h" #include "graphics/engine/engine.h" @@ -43,9 +43,9 @@ #include "sound/sound.h" #include "ui/check.h" -#include "ui/control.h" #include "ui/color.h" #include "ui/compass.h" +#include "ui/control.h" #include "ui/edit.h" #include "ui/group.h" #include "ui/image.h" diff --git a/src/ui/studio.h b/src/ui/studio.h index f46c7827..256c5933 100644 --- a/src/ui/studio.h +++ b/src/ui/studio.h @@ -20,29 +20,18 @@ // studio.h #pragma once + +#include "app/pausemanager.h" + #include "common/event.h" #include "graphics/engine/camera.h" -#include "app/pausemanager.h" - -#include - -namespace fs = boost::filesystem; - #include class CEventQueue; -class CRobotMain; class CScript; class CSoundInterface; - -namespace Gfx -{ -class CEngine; -class CCamera; -} - struct Program; namespace Ui diff --git a/src/ui/target.cpp b/src/ui/target.cpp index 4e00fcb8..e0005268 100644 --- a/src/ui/target.cpp +++ b/src/ui/target.cpp @@ -20,8 +20,8 @@ #include "ui/target.h" -#include "object/old_object.h" #include "object/object_manager.h" +#include "object/old_object.h" namespace Ui diff --git a/src/ui/window.h b/src/ui/window.h index c4a9f836..20d0a58f 100644 --- a/src/ui/window.h +++ b/src/ui/window.h @@ -21,31 +21,27 @@ #pragma once -#include "common/event.h" -#include "common/misc.h" -#include "common/restext.h" - -#include "graphics/engine/text.h" +#include "ui/control.h" #include "ui/button.h" -#include "ui/color.h" #include "ui/check.h" -#include "ui/key.h" -#include "ui/group.h" -#include "ui/image.h" -#include "ui/label.h" +#include "ui/color.h" +#include "ui/compass.h" +#include "ui/control.h" #include "ui/edit.h" #include "ui/editvalue.h" #include "ui/enumslider.h" -#include "ui/scroll.h" -#include "ui/slider.h" -#include "ui/list.h" -#include "ui/shortcut.h" -#include "ui/map.h" #include "ui/gauge.h" -#include "ui/compass.h" +#include "ui/group.h" +#include "ui/image.h" +#include "ui/key.h" +#include "ui/label.h" +#include "ui/list.h" +#include "ui/map.h" +#include "ui/scroll.h" +#include "ui/shortcut.h" +#include "ui/slider.h" #include "ui/target.h" -#include "ui/control.h" #include