thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SLUDGE: Arrange include order

Browse source
This commit is contained in:
Simei Yin 2017-12-19 22:15:55 +01:00
parent d98016b222
commit fe9968a074
20 changed files with 85 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

37
engines/sludge/builtin.cpp
View file

@ -24,34 +24,33 @@
#include "common/savefile.h" #include "common/savefile.h"
#include "sludge/allfiles.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/backdrop.h"
#include "sludge/bg_effects.h" #include "sludge/bg_effects.h"
#include "sludge/sprites.h" #include "sludge/builtin.h"
#include "sludge/fonttext.h" #include "sludge/cursors.h"
#include "sludge/sprbanks.h" #include "sludge/event.h"
#include "sludge/people.h"
#include "sludge/sound.h"
#include "sludge/objtypes.h"
#include "sludge/floor.h" #include "sludge/floor.h"
#include "sludge/zbuffer.h" #include "sludge/fonttext.h"
#include "sludge/region.h" #include "sludge/freeze.h"
#include "sludge/graphics.h"
#include "sludge/language.h" #include "sludge/language.h"
#include "sludge/loadsave.h"
#include "sludge/moreio.h" #include "sludge/moreio.h"
#include "sludge/movie.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/savedata.h"
#include "sludge/freeze.h" #include "sludge/sludger.h"
#include "sludge/language.h" #include "sludge/sound.h"
#include "sludge/sludge.h"
#include "sludge/speech.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/utf8.h"
#include "sludge/graphics.h" #include "sludge/zbuffer.h"
#include "sludge/event.h"
namespace Sludge { namespace Sludge {

4
engines/sludge/floor.cpp
View file

@ -23,12 +23,12 @@
#include "graphics/surface.h" #include "graphics/surface.h"
#include "sludge/allfiles.h" #include "sludge/allfiles.h"
#include "sludge/newfatal.h"
#include "sludge/fileset.h" #include "sludge/fileset.h"
#include "sludge/floor.h"
#include "sludge/graphics.h" #include "sludge/graphics.h"
#include "sludge/moreio.h" #include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/sludge.h" #include "sludge/sludge.h"
#include "sludge/floor.h"
namespace Sludge { namespace Sludge {

4
engines/sludge/fonttext.cpp
View file

@ -21,11 +21,11 @@
*/ */
#include "sludge/allfiles.h" #include "sludge/allfiles.h"
#include "sludge/sprites.h"
#include "sludge/fonttext.h" #include "sludge/fonttext.h"
#include "sludge/graphics.h" #include "sludge/graphics.h"
#include "sludge/newfatal.h"
#include "sludge/moreio.h" #include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/sprites.h"
#include "sludge/sludge.h" #include "sludge/sludge.h"
#include "sludge/version.h" #include "sludge/version.h"

6
engines/sludge/freeze.cpp
View file

@ -21,8 +21,8 @@
*/ */
#include "sludge/allfiles.h" #include "sludge/allfiles.h"
#include "sludge/cursors.h"
#include "sludge/backdrop.h" #include "sludge/backdrop.h"
#include "sludge/cursors.h"
#include "sludge/event.h" #include "sludge/event.h"
#include "sludge/fonttext.h" #include "sludge/fonttext.h"
#include "sludge/freeze.h" #include "sludge/freeze.h"
@ -31,11 +31,11 @@
#include "sludge/objtypes.h" #include "sludge/objtypes.h"
#include "sludge/people.h" #include "sludge/people.h"
#include "sludge/region.h" #include "sludge/region.h"
#include "sludge/sludge.h"
#include "sludge/sludger.h"
#include "sludge/speech.h" #include "sludge/speech.h"
#include "sludge/sprites.h" #include "sludge/sprites.h"
#include "sludge/sprbanks.h" #include "sludge/sprbanks.h"
#include "sludge/sludge.h"
#include "sludge/sludger.h"
#include "sludge/statusba.h" #include "sludge/statusba.h"
#include "sludge/zbuffer.h" #include "sludge/zbuffer.h"

4
engines/sludge/language.cpp
View file

@ -24,9 +24,9 @@
#include "sludge/allfiles.h" #include "sludge/allfiles.h"
#include "sludge/fileset.h" #include "sludge/fileset.h"
#include "sludge/newfatal.h"
#include "sludge/moreio.h"
#include "sludge/language.h" #include "sludge/language.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/sludge.h" #include "sludge/sludge.h"
#include "sludge/version.h" #include "sludge/version.h"

28
engines/sludge/loadsave.cpp
View file

@ -23,30 +23,30 @@
#include "common/savefile.h" #include "common/savefile.h"
#include "sludge/allfiles.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/event.h"
#include "sludge/floor.h"
#include "sludge/fonttext.h" #include "sludge/fonttext.h"
#include "sludge/newfatal.h" #include "sludge/graphics.h"
#include "sludge/variable.h"
#include "sludge/language.h" #include "sludge/language.h"
#include "sludge/loadsave.h"
#include "sludge/moreio.h" #include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/objtypes.h"
#include "sludge/people.h"
#include "sludge/region.h"
#include "sludge/sludge.h" #include "sludge/sludge.h"
#include "sludge/sludger.h" #include "sludge/sludger.h"
#include "sludge/people.h"
#include "sludge/objtypes.h"
#include "sludge/backdrop.h"
#include "sludge/region.h"
#include "sludge/floor.h"
#include "sludge/zbuffer.h"
#include "sludge/cursors.h"
#include "sludge/statusba.h"
#include "sludge/sound.h" #include "sludge/sound.h"
#include "sludge/loadsave.h" #include "sludge/sprites.h"
#include "sludge/bg_effects.h" #include "sludge/statusba.h"
#include "sludge/speech.h" #include "sludge/speech.h"
#include "sludge/utf8.h" #include "sludge/utf8.h"
#include "sludge/variable.h"
#include "sludge/version.h" #include "sludge/version.h"
#include "sludge/graphics.h" #include "sludge/zbuffer.h"
namespace Sludge { namespace Sludge {

4
engines/sludge/loadsave.h
View file

@ -24,6 +24,10 @@
namespace Sludge { namespace Sludge {
struct LoadedFunction;
struct Variable;
struct VariableStack;
bool saveGame(const Common::String &fname); bool saveGame(const Common::String &fname);
bool loadGame(const Common::String &fname); bool loadGame(const Common::String &fname);

4
engines/sludge/movie.cpp
View file

@ -20,10 +20,10 @@
* *
*/ */
#include "sludge/newfatal.h"
#include "sludge/timing.h"
#include "sludge/movie.h" #include "sludge/movie.h"
#include "sludge/newfatal.h"
#include "sludge/sound.h" #include "sludge/sound.h"
#include "sludge/timing.h"
namespace Sludge { namespace Sludge {

2
engines/sludge/newfatal.cpp
View file

@ -23,9 +23,9 @@
#include "common/debug.h" #include "common/debug.h"
#include "sludge/allfiles.h" #include "sludge/allfiles.h"
#include "sludge/sound.h"
#include "sludge/errors.h" #include "sludge/errors.h"
#include "sludge/sludge.h" #include "sludge/sludge.h"
#include "sludge/sound.h"
#include "sludge/version.h" #include "sludge/version.h"
namespace Sludge { namespace Sludge {

10
engines/sludge/objtypes.cpp
View file

@ -21,12 +21,12 @@
*/ */
#include "sludge/allfiles.h" #include "sludge/allfiles.h"
#include "sludge/objtypes.h"
#include "sludge/variable.h"
#include "sludge/newfatal.h"
#include "sludge/moreio.h"
#include "sludge/sludge.h"
#include "sludge/fileset.h" #include "sludge/fileset.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/objtypes.h"
#include "sludge/sludge.h"
#include "sludge/variable.h"
#include "sludge/version.h" #include "sludge/version.h"
namespace Sludge { namespace Sludge {

24
engines/sludge/people.cpp
View file

@ -21,23 +21,23 @@
*/ */
#include "sludge/allfiles.h" #include "sludge/allfiles.h"
#include "sludge/graphics.h"
#include "sludge/sprites.h"
#include "sludge/sprbanks.h"
#include "sludge/sludger.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/floor.h"
#include "sludge/zbuffer.h" #include "sludge/graphics.h"
#include "sludge/loadsave.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/objtypes.h"
#include "sludge/people.h"
#include "sludge/region.h"
#include "sludge/sludge.h" #include "sludge/sludge.h"
#include "sludge/sludger.h"
#include "sludge/sound.h" #include "sludge/sound.h"
#include "sludge/speech.h" #include "sludge/speech.h"
#include "sludge/sprbanks.h"
#include "sludge/sprites.h"
#include "sludge/variable.h"
#include "sludge/version.h" #include "sludge/version.h"
#include "sludge/zbuffer.h"
#define ANGLEFIX (180.0 / 3.14157) #define ANGLEFIX (180.0 / 3.14157)
#define ANI_STAND 0 #define ANI_STAND 0

4
engines/sludge/savedata.cpp
View file

@ -23,9 +23,9 @@
#include "common/file.h" #include "common/file.h"
#include "sludge/allfiles.h" #include "sludge/allfiles.h"
#include "sludge/variable.h"
#include "sludge/newfatal.h"
#include "sludge/moreio.h" #include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/variable.h"
#define LOAD_ERROR "Can't load custom data...\n\n" #define LOAD_ERROR "Can't load custom data...\n\n"

6
engines/sludge/sound.cpp
View file

@ -31,11 +31,11 @@
#include "audio/mods/mod_xm_s3m.h" #include "audio/mods/mod_xm_s3m.h"
#include "sludge/allfiles.h" #include "sludge/allfiles.h"
#include "sludge/newfatal.h"
#include "sludge/sound.h"
#include "sludge/moreio.h"
#include "sludge/fileset.h" #include "sludge/fileset.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/sludge.h" #include "sludge/sludge.h"
#include "sludge/sound.h"
namespace Sludge { namespace Sludge {

2
engines/sludge/speech.h
View file

@ -26,6 +26,8 @@
namespace Sludge { namespace Sludge {
struct ObjectType;
struct SpeechLine { struct SpeechLine {
Common::String textLine; Common::String textLine;
SpeechLine *next; SpeechLine *next;

2
engines/sludge/sprbanks.cpp
View file

@ -24,10 +24,10 @@
#include "sludge/allfiles.h" #include "sludge/allfiles.h"
#include "sludge/graphics.h" #include "sludge/graphics.h"
#include "sludge/newfatal.h"
#include "sludge/sludge.h" #include "sludge/sludge.h"
#include "sludge/sprites.h" #include "sludge/sprites.h"
#include "sludge/sprbanks.h" #include "sludge/sprbanks.h"
#include "sludge/newfatal.h"
namespace Sludge { namespace Sludge {

12
engines/sludge/sprites.cpp
View file

@ -25,18 +25,18 @@
#include "graphics/transparent_surface.h" #include "graphics/transparent_surface.h"
#include "sludge/allfiles.h" #include "sludge/allfiles.h"
#include "sludge/backdrop.h"
#include "sludge/event.h" #include "sludge/event.h"
#include "sludge/fileset.h" #include "sludge/fileset.h"
#include "sludge/graphics.h" #include "sludge/graphics.h"
#include "sludge/people.h" #include "sludge/imgloader.h"
#include "sludge/sprites.h"
#include "sludge/moreio.h" #include "sludge/moreio.h"
#include "sludge/newfatal.h" #include "sludge/newfatal.h"
#include "sludge/backdrop.h" #include "sludge/people.h"
#include "sludge/sludger.h"
#include "sludge/zbuffer.h"
#include "sludge/imgloader.h"
#include "sludge/sludge.h" #include "sludge/sludge.h"
#include "sludge/sludger.h"
#include "sludge/sprites.h"
#include "sludge/zbuffer.h"
namespace Sludge { namespace Sludge {

2
engines/sludge/statusba.cpp
View file

@ -24,12 +24,12 @@
#include "sludge/allfiles.h" #include "sludge/allfiles.h"
#include "sludge/backdrop.h" #include "sludge/backdrop.h"
#include "sludge/sprites.h"
#include "sludge/fonttext.h" #include "sludge/fonttext.h"
#include "sludge/graphics.h" #include "sludge/graphics.h"
#include "sludge/moreio.h" #include "sludge/moreio.h"
#include "sludge/newfatal.h" #include "sludge/newfatal.h"
#include "sludge/sludge.h" #include "sludge/sludge.h"
#include "sludge/sprites.h"
#include "sludge/statusba.h" #include "sludge/statusba.h"
namespace Sludge { namespace Sludge {

4
engines/sludge/thumbnail.cpp
View file

@ -24,13 +24,13 @@
#include "image/png.h" #include "image/png.h"
#include "sludge/allfiles.h" #include "sludge/allfiles.h"
#include "sludge/backdrop.h"
#include "sludge/errors.h" #include "sludge/errors.h"
#include "sludge/graphics.h" #include "sludge/graphics.h"
#include "sludge/imgloader.h" #include "sludge/imgloader.h"
#include "sludge/moreio.h" #include "sludge/moreio.h"
#include "sludge/sludger.h"
#include "sludge/backdrop.h"
#include "sludge/newfatal.h" #include "sludge/newfatal.h"
#include "sludge/sludger.h"
#include "sludge/version.h" #include "sludge/version.h"
namespace Sludge { namespace Sludge {

4
engines/sludge/variable.cpp
View file

@ -24,13 +24,13 @@
#include "common/savefile.h" #include "common/savefile.h"
#include "sludge/allfiles.h" #include "sludge/allfiles.h"
#include "sludge/variable.h" #include "sludge/fileset.h"
#include "sludge/moreio.h" #include "sludge/moreio.h"
#include "sludge/newfatal.h" #include "sludge/newfatal.h"
#include "sludge/objtypes.h" #include "sludge/objtypes.h"
#include "sludge/people.h" #include "sludge/people.h"
#include "sludge/fileset.h"
#include "sludge/sludge.h" #include "sludge/sludge.h"
#include "sludge/variable.h"
namespace Sludge { namespace Sludge {

2
engines/sludge/zbuffer.cpp
View file

@ -25,13 +25,13 @@
#include "graphics/transparent_surface.h" #include "graphics/transparent_surface.h"
#include "sludge/allfiles.h" #include "sludge/allfiles.h"
#include "sludge/zbuffer.h"
#include "sludge/fileset.h" #include "sludge/fileset.h"
#include "sludge/graphics.h" #include "sludge/graphics.h"
#include "sludge/moreio.h" #include "sludge/moreio.h"
#include "sludge/newfatal.h" #include "sludge/newfatal.h"
#include "sludge/sludge.h" #include "sludge/sludge.h"
#include "sludge/sprites.h" #include "sludge/sprites.h"
#include "sludge/zbuffer.h"
namespace Sludge { namespace Sludge {