SLUDGE: Arrange include order

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

View File

@ -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 {

View File

@ -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 {

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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/newfatal.h"
#include "sludge/objtypes.h"
#include "sludge/people.h"
#include "sludge/region.h"
#include "sludge/sludge.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/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 {

View File

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

View File

@ -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 {

View File

@ -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 {

View File

@ -21,12 +21,12 @@
*/
#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/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/objtypes.h"
#include "sludge/sludge.h"
#include "sludge/variable.h"
#include "sludge/version.h"
namespace Sludge {

View File

@ -21,23 +21,23 @@
*/
#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/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/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

View File

@ -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"

View File

@ -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 {

View File

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

View File

@ -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 {

View File

@ -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/sludger.h"
#include "sludge/zbuffer.h"
#include "sludge/imgloader.h"
#include "sludge/people.h"
#include "sludge/sludge.h"
#include "sludge/sludger.h"
#include "sludge/sprites.h"
#include "sludge/zbuffer.h"
namespace Sludge {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {