diff options
author | Simei Yin | 2017-12-19 22:15:55 +0100 |
---|---|---|
committer | Simei Yin | 2017-12-19 22:16:21 +0100 |
commit | fe9968a074ac728610ea3955fd9c183b2e3e3529 (patch) | |
tree | ec1f4f6d8be43434c2842579c8d7bf970e821cd4 /engines | |
parent | d98016b22293c9f692050bef62e81c1cb70ff1fa (diff) | |
download | scummvm-rg350-fe9968a074ac728610ea3955fd9c183b2e3e3529.tar.gz scummvm-rg350-fe9968a074ac728610ea3955fd9c183b2e3e3529.tar.bz2 scummvm-rg350-fe9968a074ac728610ea3955fd9c183b2e3e3529.zip |
SLUDGE: Arrange include order
Diffstat (limited to 'engines')
-rw-r--r-- | engines/sludge/builtin.cpp | 37 | ||||
-rw-r--r-- | engines/sludge/floor.cpp | 4 | ||||
-rw-r--r-- | engines/sludge/fonttext.cpp | 4 | ||||
-rw-r--r-- | engines/sludge/freeze.cpp | 6 | ||||
-rw-r--r-- | engines/sludge/language.cpp | 4 | ||||
-rw-r--r-- | engines/sludge/loadsave.cpp | 28 | ||||
-rw-r--r-- | engines/sludge/loadsave.h | 4 | ||||
-rw-r--r-- | engines/sludge/movie.cpp | 4 | ||||
-rw-r--r-- | engines/sludge/newfatal.cpp | 2 | ||||
-rw-r--r-- | engines/sludge/objtypes.cpp | 8 | ||||
-rw-r--r-- | engines/sludge/people.cpp | 20 | ||||
-rw-r--r-- | engines/sludge/savedata.cpp | 4 | ||||
-rw-r--r-- | engines/sludge/sound.cpp | 6 | ||||
-rw-r--r-- | engines/sludge/speech.h | 2 | ||||
-rw-r--r-- | engines/sludge/sprbanks.cpp | 2 | ||||
-rw-r--r-- | engines/sludge/sprites.cpp | 10 | ||||
-rw-r--r-- | engines/sludge/statusba.cpp | 2 | ||||
-rw-r--r-- | engines/sludge/thumbnail.cpp | 4 | ||||
-rw-r--r-- | engines/sludge/variable.cpp | 4 | ||||
-rw-r--r-- | engines/sludge/zbuffer.cpp | 2 |
20 files changed, 81 insertions, 76 deletions
diff --git a/engines/sludge/builtin.cpp b/engines/sludge/builtin.cpp index 1a538fdb6b..7385d4d861 100644 --- a/engines/sludge/builtin.cpp +++ b/engines/sludge/builtin.cpp @@ -24,34 +24,33 @@ #include "common/savefile.h" #include "sludge/allfiles.h" -#include "sludge/sludger.h" -#include "sludge/builtin.h" -#include "sludge/newfatal.h" -#include "sludge/cursors.h" -#include "sludge/statusba.h" -#include "sludge/loadsave.h" #include "sludge/backdrop.h" #include "sludge/bg_effects.h" -#include "sludge/sprites.h" -#include "sludge/fonttext.h" -#include "sludge/sprbanks.h" -#include "sludge/people.h" -#include "sludge/sound.h" -#include "sludge/objtypes.h" +#include "sludge/builtin.h" +#include "sludge/cursors.h" +#include "sludge/event.h" #include "sludge/floor.h" -#include "sludge/zbuffer.h" -#include "sludge/region.h" +#include "sludge/fonttext.h" +#include "sludge/freeze.h" +#include "sludge/graphics.h" #include "sludge/language.h" +#include "sludge/loadsave.h" #include "sludge/moreio.h" #include "sludge/movie.h" +#include "sludge/newfatal.h" +#include "sludge/objtypes.h" +#include "sludge/people.h" +#include "sludge/region.h" #include "sludge/savedata.h" -#include "sludge/freeze.h" -#include "sludge/language.h" -#include "sludge/sludge.h" +#include "sludge/sludger.h" +#include "sludge/sound.h" #include "sludge/speech.h" +#include "sludge/sprbanks.h" +#include "sludge/sprites.h" +#include "sludge/statusba.h" +#include "sludge/sludge.h" #include "sludge/utf8.h" -#include "sludge/graphics.h" -#include "sludge/event.h" +#include "sludge/zbuffer.h" namespace Sludge { diff --git a/engines/sludge/floor.cpp b/engines/sludge/floor.cpp index 45a7501470..71aa75cbe7 100644 --- a/engines/sludge/floor.cpp +++ b/engines/sludge/floor.cpp @@ -23,12 +23,12 @@ #include "graphics/surface.h" #include "sludge/allfiles.h" -#include "sludge/newfatal.h" #include "sludge/fileset.h" +#include "sludge/floor.h" #include "sludge/graphics.h" #include "sludge/moreio.h" +#include "sludge/newfatal.h" #include "sludge/sludge.h" -#include "sludge/floor.h" namespace Sludge { diff --git a/engines/sludge/fonttext.cpp b/engines/sludge/fonttext.cpp index 787e95e6f3..0f63c6e24f 100644 --- a/engines/sludge/fonttext.cpp +++ b/engines/sludge/fonttext.cpp @@ -21,11 +21,11 @@ */ #include "sludge/allfiles.h" -#include "sludge/sprites.h" #include "sludge/fonttext.h" #include "sludge/graphics.h" -#include "sludge/newfatal.h" #include "sludge/moreio.h" +#include "sludge/newfatal.h" +#include "sludge/sprites.h" #include "sludge/sludge.h" #include "sludge/version.h" diff --git a/engines/sludge/freeze.cpp b/engines/sludge/freeze.cpp index 9f55564502..e90f2700d8 100644 --- a/engines/sludge/freeze.cpp +++ b/engines/sludge/freeze.cpp @@ -21,8 +21,8 @@ */ #include "sludge/allfiles.h" -#include "sludge/cursors.h" #include "sludge/backdrop.h" +#include "sludge/cursors.h" #include "sludge/event.h" #include "sludge/fonttext.h" #include "sludge/freeze.h" @@ -31,11 +31,11 @@ #include "sludge/objtypes.h" #include "sludge/people.h" #include "sludge/region.h" +#include "sludge/sludge.h" +#include "sludge/sludger.h" #include "sludge/speech.h" #include "sludge/sprites.h" #include "sludge/sprbanks.h" -#include "sludge/sludge.h" -#include "sludge/sludger.h" #include "sludge/statusba.h" #include "sludge/zbuffer.h" diff --git a/engines/sludge/language.cpp b/engines/sludge/language.cpp index 8bd9d51493..f2cde99a9c 100644 --- a/engines/sludge/language.cpp +++ b/engines/sludge/language.cpp @@ -24,9 +24,9 @@ #include "sludge/allfiles.h" #include "sludge/fileset.h" -#include "sludge/newfatal.h" -#include "sludge/moreio.h" #include "sludge/language.h" +#include "sludge/moreio.h" +#include "sludge/newfatal.h" #include "sludge/sludge.h" #include "sludge/version.h" diff --git a/engines/sludge/loadsave.cpp b/engines/sludge/loadsave.cpp index dc593a47de..4cabbc79da 100644 --- a/engines/sludge/loadsave.cpp +++ b/engines/sludge/loadsave.cpp @@ -23,30 +23,30 @@ #include "common/savefile.h" #include "sludge/allfiles.h" -#include "sludge/sprites.h" +#include "sludge/backdrop.h" +#include "sludge/bg_effects.h" +#include "sludge/cursors.h" #include "sludge/event.h" +#include "sludge/floor.h" #include "sludge/fonttext.h" -#include "sludge/newfatal.h" -#include "sludge/variable.h" +#include "sludge/graphics.h" #include "sludge/language.h" +#include "sludge/loadsave.h" #include "sludge/moreio.h" -#include "sludge/sludge.h" -#include "sludge/sludger.h" -#include "sludge/people.h" +#include "sludge/newfatal.h" #include "sludge/objtypes.h" -#include "sludge/backdrop.h" +#include "sludge/people.h" #include "sludge/region.h" -#include "sludge/floor.h" -#include "sludge/zbuffer.h" -#include "sludge/cursors.h" -#include "sludge/statusba.h" +#include "sludge/sludge.h" +#include "sludge/sludger.h" #include "sludge/sound.h" -#include "sludge/loadsave.h" -#include "sludge/bg_effects.h" +#include "sludge/sprites.h" +#include "sludge/statusba.h" #include "sludge/speech.h" #include "sludge/utf8.h" +#include "sludge/variable.h" #include "sludge/version.h" -#include "sludge/graphics.h" +#include "sludge/zbuffer.h" namespace Sludge { diff --git a/engines/sludge/loadsave.h b/engines/sludge/loadsave.h index 120e638369..269fadb507 100644 --- a/engines/sludge/loadsave.h +++ b/engines/sludge/loadsave.h @@ -24,6 +24,10 @@ namespace Sludge { +struct LoadedFunction; +struct Variable; +struct VariableStack; + bool saveGame(const Common::String &fname); bool loadGame(const Common::String &fname); diff --git a/engines/sludge/movie.cpp b/engines/sludge/movie.cpp index 0162a7086b..271728da75 100644 --- a/engines/sludge/movie.cpp +++ b/engines/sludge/movie.cpp @@ -20,10 +20,10 @@ * */ -#include "sludge/newfatal.h" -#include "sludge/timing.h" #include "sludge/movie.h" +#include "sludge/newfatal.h" #include "sludge/sound.h" +#include "sludge/timing.h" namespace Sludge { diff --git a/engines/sludge/newfatal.cpp b/engines/sludge/newfatal.cpp index 70f6bd9209..edd4a88073 100644 --- a/engines/sludge/newfatal.cpp +++ b/engines/sludge/newfatal.cpp @@ -23,9 +23,9 @@ #include "common/debug.h" #include "sludge/allfiles.h" -#include "sludge/sound.h" #include "sludge/errors.h" #include "sludge/sludge.h" +#include "sludge/sound.h" #include "sludge/version.h" namespace Sludge { diff --git a/engines/sludge/objtypes.cpp b/engines/sludge/objtypes.cpp index dc41249ab7..12d4318884 100644 --- a/engines/sludge/objtypes.cpp +++ b/engines/sludge/objtypes.cpp @@ -21,12 +21,12 @@ */ #include "sludge/allfiles.h" -#include "sludge/objtypes.h" -#include "sludge/variable.h" -#include "sludge/newfatal.h" +#include "sludge/fileset.h" #include "sludge/moreio.h" +#include "sludge/newfatal.h" +#include "sludge/objtypes.h" #include "sludge/sludge.h" -#include "sludge/fileset.h" +#include "sludge/variable.h" #include "sludge/version.h" namespace Sludge { diff --git a/engines/sludge/people.cpp b/engines/sludge/people.cpp index c4c0cfe4ea..4aec5fa8b7 100644 --- a/engines/sludge/people.cpp +++ b/engines/sludge/people.cpp @@ -21,23 +21,23 @@ */ #include "sludge/allfiles.h" +#include "sludge/floor.h" #include "sludge/graphics.h" -#include "sludge/sprites.h" -#include "sludge/sprbanks.h" -#include "sludge/sludger.h" +#include "sludge/loadsave.h" +#include "sludge/moreio.h" +#include "sludge/newfatal.h" #include "sludge/objtypes.h" -#include "sludge/region.h" #include "sludge/people.h" -#include "sludge/newfatal.h" -#include "sludge/variable.h" -#include "sludge/moreio.h" -#include "sludge/loadsave.h" -#include "sludge/floor.h" -#include "sludge/zbuffer.h" +#include "sludge/region.h" #include "sludge/sludge.h" +#include "sludge/sludger.h" #include "sludge/sound.h" #include "sludge/speech.h" +#include "sludge/sprbanks.h" +#include "sludge/sprites.h" +#include "sludge/variable.h" #include "sludge/version.h" +#include "sludge/zbuffer.h" #define ANGLEFIX (180.0 / 3.14157) #define ANI_STAND 0 diff --git a/engines/sludge/savedata.cpp b/engines/sludge/savedata.cpp index 9b75e137f3..9e2c92395d 100644 --- a/engines/sludge/savedata.cpp +++ b/engines/sludge/savedata.cpp @@ -23,9 +23,9 @@ #include "common/file.h" #include "sludge/allfiles.h" -#include "sludge/variable.h" -#include "sludge/newfatal.h" #include "sludge/moreio.h" +#include "sludge/newfatal.h" +#include "sludge/variable.h" #define LOAD_ERROR "Can't load custom data...\n\n" diff --git a/engines/sludge/sound.cpp b/engines/sludge/sound.cpp index 8f8284f1da..306fd49b4e 100644 --- a/engines/sludge/sound.cpp +++ b/engines/sludge/sound.cpp @@ -31,11 +31,11 @@ #include "audio/mods/mod_xm_s3m.h" #include "sludge/allfiles.h" -#include "sludge/newfatal.h" -#include "sludge/sound.h" -#include "sludge/moreio.h" #include "sludge/fileset.h" +#include "sludge/moreio.h" +#include "sludge/newfatal.h" #include "sludge/sludge.h" +#include "sludge/sound.h" namespace Sludge { diff --git a/engines/sludge/speech.h b/engines/sludge/speech.h index b33a52889c..98b6035cb0 100644 --- a/engines/sludge/speech.h +++ b/engines/sludge/speech.h @@ -26,6 +26,8 @@ namespace Sludge { +struct ObjectType; + struct SpeechLine { Common::String textLine; SpeechLine *next; diff --git a/engines/sludge/sprbanks.cpp b/engines/sludge/sprbanks.cpp index 5bc5de2fdf..c566f650c0 100644 --- a/engines/sludge/sprbanks.cpp +++ b/engines/sludge/sprbanks.cpp @@ -24,10 +24,10 @@ #include "sludge/allfiles.h" #include "sludge/graphics.h" +#include "sludge/newfatal.h" #include "sludge/sludge.h" #include "sludge/sprites.h" #include "sludge/sprbanks.h" -#include "sludge/newfatal.h" namespace Sludge { diff --git a/engines/sludge/sprites.cpp b/engines/sludge/sprites.cpp index 81769ccb97..49c27dbed8 100644 --- a/engines/sludge/sprites.cpp +++ b/engines/sludge/sprites.cpp @@ -25,18 +25,18 @@ #include "graphics/transparent_surface.h" #include "sludge/allfiles.h" +#include "sludge/backdrop.h" #include "sludge/event.h" #include "sludge/fileset.h" #include "sludge/graphics.h" -#include "sludge/people.h" -#include "sludge/sprites.h" +#include "sludge/imgloader.h" #include "sludge/moreio.h" #include "sludge/newfatal.h" -#include "sludge/backdrop.h" +#include "sludge/people.h" +#include "sludge/sludge.h" #include "sludge/sludger.h" +#include "sludge/sprites.h" #include "sludge/zbuffer.h" -#include "sludge/imgloader.h" -#include "sludge/sludge.h" namespace Sludge { diff --git a/engines/sludge/statusba.cpp b/engines/sludge/statusba.cpp index 9e8546a3ff..1aa24971f1 100644 --- a/engines/sludge/statusba.cpp +++ b/engines/sludge/statusba.cpp @@ -24,12 +24,12 @@ #include "sludge/allfiles.h" #include "sludge/backdrop.h" -#include "sludge/sprites.h" #include "sludge/fonttext.h" #include "sludge/graphics.h" #include "sludge/moreio.h" #include "sludge/newfatal.h" #include "sludge/sludge.h" +#include "sludge/sprites.h" #include "sludge/statusba.h" namespace Sludge { diff --git a/engines/sludge/thumbnail.cpp b/engines/sludge/thumbnail.cpp index 285b43ad86..2c7e007f71 100644 --- a/engines/sludge/thumbnail.cpp +++ b/engines/sludge/thumbnail.cpp @@ -24,13 +24,13 @@ #include "image/png.h" #include "sludge/allfiles.h" +#include "sludge/backdrop.h" #include "sludge/errors.h" #include "sludge/graphics.h" #include "sludge/imgloader.h" #include "sludge/moreio.h" -#include "sludge/sludger.h" -#include "sludge/backdrop.h" #include "sludge/newfatal.h" +#include "sludge/sludger.h" #include "sludge/version.h" namespace Sludge { diff --git a/engines/sludge/variable.cpp b/engines/sludge/variable.cpp index 510c6f4607..9cbb9f49f8 100644 --- a/engines/sludge/variable.cpp +++ b/engines/sludge/variable.cpp @@ -24,13 +24,13 @@ #include "common/savefile.h" #include "sludge/allfiles.h" -#include "sludge/variable.h" +#include "sludge/fileset.h" #include "sludge/moreio.h" #include "sludge/newfatal.h" #include "sludge/objtypes.h" #include "sludge/people.h" -#include "sludge/fileset.h" #include "sludge/sludge.h" +#include "sludge/variable.h" namespace Sludge { diff --git a/engines/sludge/zbuffer.cpp b/engines/sludge/zbuffer.cpp index bc9a1cf608..02dddd068e 100644 --- a/engines/sludge/zbuffer.cpp +++ b/engines/sludge/zbuffer.cpp @@ -25,13 +25,13 @@ #include "graphics/transparent_surface.h" #include "sludge/allfiles.h" -#include "sludge/zbuffer.h" #include "sludge/fileset.h" #include "sludge/graphics.h" #include "sludge/moreio.h" #include "sludge/newfatal.h" #include "sludge/sludge.h" #include "sludge/sprites.h" +#include "sludge/zbuffer.h" namespace Sludge { |