[Scummvm-git-logs] scummvm master -> 1ff0aba6c4dd862dcbee62f97c4e902bea77a38b

[bgK]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1ff0aba6c4 FULLPIPE: Reduce duplicate header includes


Commit: 1ff0aba6c4dd862dcbee62f97c4e902bea77a38b
    https://github.com/scummvm/scummvm/commit/1ff0aba6c4dd862dcbee62f97c4e902bea77a38b
Author: David Fioramonti (dafioram at gmail.com)
Date: 2018-05-05T06:58:47+02:00

Commit Message:
FULLPIPE: Reduce duplicate header includes

Remove duplicate headers in two files and ordered
the headers similar to other fullpipe files.

Changed paths:
    engines/fullpipe/modal.cpp
    engines/fullpipe/stateloader.cpp


diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 80fa329..042f1fb 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 250c527..5b89b6b 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) {