diff options
| author | David Fioramonti | 2018-05-02 06:05:04 -0700 |
|---|---|---|
| committer | Bastien Bouclet | 2018-05-05 06:58:47 +0200 |
| commit | 1ff0aba6c4dd862dcbee62f97c4e902bea77a38b (patch) | |
| tree | 59724fa549ce326b3d5ecde3a374e5e6194ebb0e | |
| parent | 9db2f3cd8412faaa4771a17a8479f107e54e148f (diff) | |
| download | scummvm-rg350-1ff0aba6c4dd862dcbee62f97c4e902bea77a38b.tar.gz scummvm-rg350-1ff0aba6c4dd862dcbee62f97c4e902bea77a38b.tar.bz2 scummvm-rg350-1ff0aba6c4dd862dcbee62f97c4e902bea77a38b.zip | |
FULLPIPE: Reduce duplicate header includes
Remove duplicate headers in two files and ordered
the headers similar to other fullpipe files.
| -rw-r--r-- | engines/fullpipe/modal.cpp | 13 | ||||
| -rw-r--r-- | engines/fullpipe/stateloader.cpp | 16 |
2 files changed, 13 insertions, 16 deletions
diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp index 80fa3296f9..042f1fb859 100644 --- a/engines/fullpipe/modal.cpp +++ b/engines/fullpipe/modal.cpp @@ -21,22 +21,21 @@ */ #include "fullpipe/fullpipe.h" -#include "fullpipe/messages.h" + #include "fullpipe/constants.h" +#include "fullpipe/gameloader.h" +#include "fullpipe/messages.h" +#include "fullpipe/modal.h" #include "fullpipe/motion.h" +#include "fullpipe/objectnames.h" #include "fullpipe/scenes.h" -#include "fullpipe/gameloader.h" #include "fullpipe/statics.h" -#include "fullpipe/modal.h" -#include "fullpipe/constants.h" -#include "fullpipe/objectnames.h" +#include "engines/savestate.h" #include "graphics/palette.h" #include "graphics/surface.h" -#include "engines/savestate.h" - namespace Fullpipe { ModalIntro::ModalIntro() { diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp index 250c527f40..5b89b6b0e2 100644 --- a/engines/fullpipe/stateloader.cpp +++ b/engines/fullpipe/stateloader.cpp @@ -22,6 +22,13 @@ #include "fullpipe/fullpipe.h" +#include "fullpipe/constants.h" +#include "fullpipe/gameloader.h" +#include "fullpipe/interaction.h" +#include "fullpipe/objects.h" +#include "fullpipe/scene.h" +#include "fullpipe/statics.h" + #include "common/file.h" #include "common/array.h" #include "common/list.h" @@ -29,15 +36,6 @@ #include "graphics/thumbnail.h" -#include "fullpipe/objects.h" -#include "fullpipe/gameloader.h" -#include "fullpipe/scene.h" -#include "fullpipe/statics.h" -#include "fullpipe/interaction.h" -#include "fullpipe/gameloader.h" - -#include "fullpipe/constants.h" - namespace Fullpipe { bool GameLoader::readSavegame(const char *fname) { |