From 8cdee5a9310aecb0c8e39ceee4059b221d80ee0f Mon Sep 17 00:00:00 2001 From: Max Horn Date: Wed, 29 Mar 2006 15:59:37 +0000 Subject: [PATCH] Do not #include endian.h in scummsys.h (cuts down deps on endian.h from ~400 to ~250). Many greetings to eriktorbjorn, and have fun recompiling. svn-id: r21500 --- backends/midi/morphos.cpp | 1 + backends/midi/quicktime.cpp | 1 + common/md5.cpp | 1 + common/scummsys.h | 3 --- engines/cine/anim.cpp | 3 +++ engines/cine/bg.cpp | 3 +++ engines/cine/msg.cpp | 2 +- engines/cine/object.cpp | 1 + engines/cine/prc.cpp | 3 +++ engines/cine/rel.cpp | 3 +++ engines/cine/script.cpp | 3 +++ engines/cine/sfx_player.cpp | 1 + engines/cine/sound_driver.cpp | 3 +++ engines/cine/unpack.cpp | 3 +++ engines/cine/various.cpp | 3 +++ engines/gob/cdrom.cpp | 4 ++++ engines/gob/draw.cpp | 4 ++++ engines/gob/driver_vga.cpp | 4 ++++ engines/gob/game.cpp | 4 ++++ engines/gob/init.cpp | 4 ++++ engines/gob/inter.cpp | 4 ++++ engines/gob/inter_v1.cpp | 4 ++++ engines/gob/map.cpp | 4 ++++ engines/gob/mult.cpp | 4 ++++ engines/gob/mult_v1.cpp | 3 +++ engines/gob/mult_v2.cpp | 3 +++ engines/gob/pack.cpp | 4 ++++ engines/gob/parse.cpp | 4 ++++ engines/gob/parse_v1.cpp | 3 +++ engines/gob/parse_v2.cpp | 3 +++ engines/gob/scenery.cpp | 4 ++++ engines/gob/video.cpp | 3 +++ engines/kyra/animator.cpp | 3 +++ engines/kyra/resource.cpp | 1 + engines/kyra/saveload.cpp | 8 +++++--- engines/kyra/screen.cpp | 1 + engines/kyra/script.cpp | 1 + engines/kyra/script_v1.cpp | 1 + engines/kyra/sprites.cpp | 1 + engines/kyra/staticres.cpp | 1 + engines/kyra/wsamovie.cpp | 1 + engines/lure/animseq.cpp | 1 + engines/lure/decode.cpp | 1 + engines/lure/disk.cpp | 1 + engines/lure/lure.cpp | 1 + engines/lure/res.cpp | 1 + engines/lure/res_struct.cpp | 1 + engines/lure/scripts.cpp | 1 + engines/lure/strings.cpp | 1 + engines/lure/surface.cpp | 1 + engines/queen/sound.cpp | 2 ++ engines/queen/structs.h | 1 + engines/saga/script.h | 2 ++ engines/scumm/file.cpp | 1 + engines/scumm/imuse/sysex_samnmax.cpp | 1 + engines/scumm/imuse/sysex_scumm.cpp | 1 + engines/scumm/imuse_digi/dimuse_codecs.cpp | 1 + engines/scumm/scumm.h | 1 + engines/scumm/smush/codec1.cpp | 2 +- engines/scumm/smush/codec37.cpp | 1 + engines/scumm/smush/codec47.cpp | 1 + engines/scumm/smush/saud_channel.cpp | 1 + engines/sky/autoroute.cpp | 2 ++ engines/sky/compact.cpp | 1 + engines/sky/control.cpp | 2 ++ engines/sky/debug.cpp | 1 + engines/sky/disk.cpp | 3 ++- engines/sky/intro.cpp | 2 ++ engines/sky/logic.cpp | 2 ++ engines/sky/music/adlibchannel.cpp | 1 + engines/sky/music/adlibmusic.cpp | 3 +++ engines/sky/rnc_deco.cpp | 2 +- engines/sky/screen.cpp | 2 ++ engines/sky/sound.cpp | 2 ++ engines/sky/text.cpp | 3 +++ engines/sword1/control.cpp | 1 + engines/sword1/credits.cpp | 1 + engines/sword1/logic.cpp | 1 + engines/sword1/mouse.cpp | 4 +++- engines/sword1/music.cpp | 7 +++---- engines/sword1/objectman.cpp | 5 +++-- engines/sword1/resman.cpp | 12 +++++++----- engines/sword1/router.cpp | 5 +++-- engines/sword1/screen.cpp | 3 ++- engines/sword1/sound.cpp | 5 ++++- engines/sword1/text.cpp | 4 +++- engines/sword2/header.h | 1 + engines/sword2/interpreter.h | 2 ++ engines/sword2/logic.h | 1 + engines/sword2/object.h | 1 + engines/sword2/render.cpp | 1 + graphics/ilbm.cpp | 1 + sound/adpcm.cpp | 2 ++ sound/audiostream.cpp | 2 ++ sound/midiparser.h | 1 + sound/voc.cpp | 1 + 96 files changed, 199 insertions(+), 27 deletions(-) diff --git a/backends/midi/morphos.cpp b/backends/midi/morphos.cpp index 8935161e62c..9a0d20a7622 100644 --- a/backends/midi/morphos.cpp +++ b/backends/midi/morphos.cpp @@ -31,6 +31,7 @@ #include #include "common/stdafx.h" +#include "common/endian.h" #include "sound/mpu401.h" #include "common/util.h" #include "morphos.h" diff --git a/backends/midi/quicktime.cpp b/backends/midi/quicktime.cpp index afd6eeb539d..b7e973dd0b2 100644 --- a/backends/midi/quicktime.cpp +++ b/backends/midi/quicktime.cpp @@ -23,6 +23,7 @@ #include "sound/mpu401.h" +#include "common/endian.h" #include "common/util.h" #if defined(MACOSX) diff --git a/common/md5.cpp b/common/md5.cpp index 587e47fefdd..9d42c4bd616 100644 --- a/common/md5.cpp +++ b/common/md5.cpp @@ -30,6 +30,7 @@ #include "common/file.h" #include "common/md5.h" #include "common/util.h" +#include "common/endian.h" namespace Common { diff --git a/common/scummsys.h b/common/scummsys.h index f250c1e830c..05a9950c41a 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -398,7 +398,4 @@ typedef int16 OverlayColor; #endif - -#include "common/endian.h" - #endif diff --git a/engines/cine/anim.cpp b/engines/cine/anim.cpp index 0566cbdef9a..149794d6d2e 100644 --- a/engines/cine/anim.cpp +++ b/engines/cine/anim.cpp @@ -22,6 +22,9 @@ * */ +#include "common/stdafx.h" +#include "common/endian.h" + #include "cine/cine.h" #include "cine/anim.h" #include "cine/gfx.h" diff --git a/engines/cine/bg.cpp b/engines/cine/bg.cpp index 0867dc716d8..fc7010d9550 100644 --- a/engines/cine/bg.cpp +++ b/engines/cine/bg.cpp @@ -22,6 +22,9 @@ * */ +#include "common/stdafx.h" +#include "common/endian.h" + #include "cine/cine.h" #include "cine/various.h" diff --git a/engines/cine/msg.cpp b/engines/cine/msg.cpp index 71e4ee323b2..691c024259c 100644 --- a/engines/cine/msg.cpp +++ b/engines/cine/msg.cpp @@ -23,7 +23,7 @@ */ #include "common/stdafx.h" -#include "common/scummsys.h" +#include "common/endian.h" #include "cine/msg.h" #include "cine/various.h" diff --git a/engines/cine/object.cpp b/engines/cine/object.cpp index 2ef2dc3a666..0c42646897c 100644 --- a/engines/cine/object.cpp +++ b/engines/cine/object.cpp @@ -23,6 +23,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/scummsys.h" #include "common/util.h" diff --git a/engines/cine/prc.cpp b/engines/cine/prc.cpp index 70b3daf9a08..8eaff590041 100644 --- a/engines/cine/prc.cpp +++ b/engines/cine/prc.cpp @@ -22,6 +22,9 @@ * */ +#include "common/stdafx.h" +#include "common/endian.h" + #include "cine/cine.h" #include "cine/auto00.h" #include "cine/various.h" diff --git a/engines/cine/rel.cpp b/engines/cine/rel.cpp index 75ec5efe334..7cd2dcb894d 100644 --- a/engines/cine/rel.cpp +++ b/engines/cine/rel.cpp @@ -22,6 +22,9 @@ * */ +#include "common/stdafx.h" +#include "common/endian.h" + #include "cine/cine.h" #include "cine/various.h" diff --git a/engines/cine/script.cpp b/engines/cine/script.cpp index b5569f9900b..60def8e2e69 100644 --- a/engines/cine/script.cpp +++ b/engines/cine/script.cpp @@ -22,6 +22,9 @@ * */ +#include "common/stdafx.h" +#include "common/endian.h" + #include "cine/cine.h" #include "cine/bg_list.h" #include "cine/object.h" diff --git a/engines/cine/sfx_player.cpp b/engines/cine/sfx_player.cpp index 6ee98522556..dbe48155adf 100644 --- a/engines/cine/sfx_player.cpp +++ b/engines/cine/sfx_player.cpp @@ -23,6 +23,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/system.h" #include "cine/cine.h" diff --git a/engines/cine/sound_driver.cpp b/engines/cine/sound_driver.cpp index 8973fdf445d..d0398cb5b1b 100644 --- a/engines/cine/sound_driver.cpp +++ b/engines/cine/sound_driver.cpp @@ -22,6 +22,9 @@ * */ +#include "common/stdafx.h" +#include "common/endian.h" + #include "cine/cine.h" #include "cine/sound_driver.h" diff --git a/engines/cine/unpack.cpp b/engines/cine/unpack.cpp index cae9a2e1f21..597d4121235 100644 --- a/engines/cine/unpack.cpp +++ b/engines/cine/unpack.cpp @@ -22,6 +22,9 @@ * */ +#include "common/stdafx.h" +#include "common/endian.h" + #include "cine/unpack.h" namespace Cine { diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp index 35e634653d9..8c2f3b9cdcc 100644 --- a/engines/cine/various.cpp +++ b/engines/cine/various.cpp @@ -22,6 +22,9 @@ * */ +#include "common/stdafx.h" +#include "common/endian.h" + #include "cine/cine.h" #include "cine/font.h" #include "cine/main_loop.h" diff --git a/engines/gob/cdrom.cpp b/engines/gob/cdrom.cpp index d5b3dde1710..1a21cf0b67a 100644 --- a/engines/gob/cdrom.cpp +++ b/engines/gob/cdrom.cpp @@ -19,6 +19,10 @@ * $Id$ * */ + +#include "common/stdafx.h" +#include "common/endian.h" + #include "gob/gob.h" #include "gob/cdrom.h" #include "gob/dataio.h" diff --git a/engines/gob/draw.cpp b/engines/gob/draw.cpp index 62213b607ea..caf4a73ce8f 100644 --- a/engines/gob/draw.cpp +++ b/engines/gob/draw.cpp @@ -20,6 +20,10 @@ * $Id$ * */ + +#include "common/stdafx.h" +#include "common/endian.h" + #include "gob/gob.h" #include "gob/draw.h" #include "gob/global.h" diff --git a/engines/gob/driver_vga.cpp b/engines/gob/driver_vga.cpp index 3a2f44bc114..b34ab14a66f 100644 --- a/engines/gob/driver_vga.cpp +++ b/engines/gob/driver_vga.cpp @@ -20,6 +20,10 @@ * $Id$ * */ + +#include "common/stdafx.h" +#include "common/endian.h" + #include "gob/driver_vga.h" #include "graphics/primitives.h" diff --git a/engines/gob/game.cpp b/engines/gob/game.cpp index 677c0cc5cd8..32d3d9bce69 100644 --- a/engines/gob/game.cpp +++ b/engines/gob/game.cpp @@ -20,6 +20,10 @@ * $Id$ * */ + +#include "common/stdafx.h" +#include "common/endian.h" + #include "gob/gob.h" #include "gob/global.h" #include "gob/game.h" diff --git a/engines/gob/init.cpp b/engines/gob/init.cpp index 43b63444992..a5ba883590b 100644 --- a/engines/gob/init.cpp +++ b/engines/gob/init.cpp @@ -20,6 +20,10 @@ * $Id$ * */ + +#include "common/stdafx.h" +#include "common/endian.h" + #include "gob/gob.h" #include "gob/dataio.h" #include "gob/global.h" diff --git a/engines/gob/inter.cpp b/engines/gob/inter.cpp index 895301e07a6..72bbe3194e5 100644 --- a/engines/gob/inter.cpp +++ b/engines/gob/inter.cpp @@ -20,6 +20,10 @@ * $Id$ * */ + +#include "common/stdafx.h" +#include "common/endian.h" + #include "gob/gob.h" #include "gob/global.h" #include "gob/inter.h" diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp index 04eba247f2b..88cb5f23075 100644 --- a/engines/gob/inter_v1.cpp +++ b/engines/gob/inter_v1.cpp @@ -20,6 +20,10 @@ * $Id$ * */ + +#include "common/stdafx.h" +#include "common/endian.h" + #include "gob/gob.h" #include "gob/global.h" #include "gob/inter.h" diff --git a/engines/gob/map.cpp b/engines/gob/map.cpp index ed08d1d4010..4e90e5f2325 100644 --- a/engines/gob/map.cpp +++ b/engines/gob/map.cpp @@ -20,6 +20,10 @@ * $Id$ * */ + +#include "common/stdafx.h" +#include "common/endian.h" + #include "gob/gob.h" #include "gob/map.h" #include "gob/video.h" diff --git a/engines/gob/mult.cpp b/engines/gob/mult.cpp index 0ac2e115bc2..b16e5d97391 100644 --- a/engines/gob/mult.cpp +++ b/engines/gob/mult.cpp @@ -20,6 +20,10 @@ * $Id$ * */ + +#include "common/stdafx.h" +#include "common/endian.h" + #include "gob/gob.h" #include "gob/video.h" #include "gob/anim.h" diff --git a/engines/gob/mult_v1.cpp b/engines/gob/mult_v1.cpp index 72328c42cf2..a35ca3f3212 100644 --- a/engines/gob/mult_v1.cpp +++ b/engines/gob/mult_v1.cpp @@ -21,6 +21,9 @@ * */ +#include "common/stdafx.h" +#include "common/endian.h" + #include "gob/gob.h" #include "gob/mult.h" #include "gob/game.h" diff --git a/engines/gob/mult_v2.cpp b/engines/gob/mult_v2.cpp index 635caa75281..3c105f85284 100644 --- a/engines/gob/mult_v2.cpp +++ b/engines/gob/mult_v2.cpp @@ -21,6 +21,9 @@ * */ +#include "common/stdafx.h" +#include "common/endian.h" + #include "gob/gob.h" #include "gob/mult.h" #include "gob/game.h" diff --git a/engines/gob/pack.cpp b/engines/gob/pack.cpp index c255a70acec..60ba5deea47 100644 --- a/engines/gob/pack.cpp +++ b/engines/gob/pack.cpp @@ -20,6 +20,10 @@ * $Id$ * */ + +#include "common/stdafx.h" +#include "common/endian.h" + #include "gob/gob.h" #include "gob/pack.h" diff --git a/engines/gob/parse.cpp b/engines/gob/parse.cpp index 947de49d791..d8373cf58fc 100644 --- a/engines/gob/parse.cpp +++ b/engines/gob/parse.cpp @@ -20,6 +20,10 @@ * $Id$ * */ + +#include "common/stdafx.h" +#include "common/endian.h" + #include "gob/gob.h" #include "gob/global.h" #include "gob/game.h" diff --git a/engines/gob/parse_v1.cpp b/engines/gob/parse_v1.cpp index b827a269433..74660223c41 100644 --- a/engines/gob/parse_v1.cpp +++ b/engines/gob/parse_v1.cpp @@ -21,6 +21,9 @@ * */ +#include "common/stdafx.h" +#include "common/endian.h" + #include "gob/gob.h" #include "gob/parse.h" #include "gob/inter.h" diff --git a/engines/gob/parse_v2.cpp b/engines/gob/parse_v2.cpp index 8aae929459a..dce5c379950 100644 --- a/engines/gob/parse_v2.cpp +++ b/engines/gob/parse_v2.cpp @@ -21,6 +21,9 @@ * */ +#include "common/stdafx.h" +#include "common/endian.h" + #include "gob/gob.h" #include "gob/parse.h" #include "gob/inter.h" diff --git a/engines/gob/scenery.cpp b/engines/gob/scenery.cpp index 917c1995c51..0e65f9799ad 100644 --- a/engines/gob/scenery.cpp +++ b/engines/gob/scenery.cpp @@ -20,6 +20,10 @@ * $Id$ * */ + +#include "common/stdafx.h" +#include "common/endian.h" + #include "gob/gob.h" #include "gob/scenery.h" #include "gob/inter.h" diff --git a/engines/gob/video.cpp b/engines/gob/video.cpp index 1b52918a5bb..5e0dcad1851 100644 --- a/engines/gob/video.cpp +++ b/engines/gob/video.cpp @@ -20,6 +20,9 @@ * $Id$ * */ +#include "common/stdafx.h" +#include "common/endian.h" + #include "gob/gob.h" #include "gob/global.h" #include "gob/video.h" diff --git a/engines/kyra/animator.cpp b/engines/kyra/animator.cpp index e28860a4358..e2b9403a28f 100644 --- a/engines/kyra/animator.cpp +++ b/engines/kyra/animator.cpp @@ -20,6 +20,9 @@ * */ +#include "common/stdafx.h" +#include "common/endian.h" + #include "kyra/kyra.h" #include "kyra/screen.h" #include "kyra/animator.h" diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp index fe0f1850abb..42c8d3894f4 100644 --- a/engines/kyra/resource.cpp +++ b/engines/kyra/resource.cpp @@ -21,6 +21,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/file.h" #include "kyra/resource.h" #include "kyra/script.h" diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp index e3488984986..f56913fe864 100644 --- a/engines/kyra/saveload.cpp +++ b/engines/kyra/saveload.cpp @@ -20,14 +20,16 @@ * */ +#include "common/stdafx.h" +#include "common/endian.h" +#include "common/savefile.h" +#include "common/system.h" + #include "kyra/kyra.h" #include "kyra/animator.h" #include "kyra/screen.h" #include "kyra/resource.h" -#include "common/savefile.h" -#include "common/system.h" - #define CURRENT_VERSION 4 namespace Kyra { diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index 5b34dbaea82..31abb707461 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -21,6 +21,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/system.h" #include "kyra/screen.h" #include "kyra/kyra.h" diff --git a/engines/kyra/script.cpp b/engines/kyra/script.cpp index 14a8c33d4d5..70379a38276 100644 --- a/engines/kyra/script.cpp +++ b/engines/kyra/script.cpp @@ -21,6 +21,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/stream.h" #include "common/util.h" #include "common/system.h" diff --git a/engines/kyra/script_v1.cpp b/engines/kyra/script_v1.cpp index bc09ba707a3..269ed3a6fc8 100644 --- a/engines/kyra/script_v1.cpp +++ b/engines/kyra/script_v1.cpp @@ -21,6 +21,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "kyra/kyra.h" #include "kyra/script.h" #include "kyra/screen.h" diff --git a/engines/kyra/sprites.cpp b/engines/kyra/sprites.cpp index 620241964d2..3d962d82c97 100644 --- a/engines/kyra/sprites.cpp +++ b/engines/kyra/sprites.cpp @@ -21,6 +21,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/stream.h" #include "common/util.h" #include "common/system.h" diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index ddbdbd5d932..0dc9fec6368 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -21,6 +21,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "kyra/kyra.h" #include "kyra/screen.h" #include "kyra/resource.h" diff --git a/engines/kyra/wsamovie.cpp b/engines/kyra/wsamovie.cpp index efde7918f7a..ac9625efeda 100644 --- a/engines/kyra/wsamovie.cpp +++ b/engines/kyra/wsamovie.cpp @@ -21,6 +21,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "kyra/kyra.h" #include "kyra/screen.h" #include "kyra/wsamovie.h" diff --git a/engines/lure/animseq.cpp b/engines/lure/animseq.cpp index c5ca90afd17..5b13ae21d43 100644 --- a/engines/lure/animseq.cpp +++ b/engines/lure/animseq.cpp @@ -24,6 +24,7 @@ #include "lure/palette.h" #include "lure/decode.h" #include "lure/events.h" +#include "common/endian.h" namespace Lure { diff --git a/engines/lure/decode.cpp b/engines/lure/decode.cpp index c91cd97621e..c32223edc32 100644 --- a/engines/lure/decode.cpp +++ b/engines/lure/decode.cpp @@ -23,6 +23,7 @@ #include "lure/decode.h" #include "lure/memory.h" #include "lure/luredefs.h" +#include "common/endian.h" namespace Lure { diff --git a/engines/lure/disk.cpp b/engines/lure/disk.cpp index e996ff6eccd..96389574432 100644 --- a/engines/lure/disk.cpp +++ b/engines/lure/disk.cpp @@ -21,6 +21,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/file.h" #include "common/util.h" #include "common/scummsys.h" diff --git a/engines/lure/lure.cpp b/engines/lure/lure.cpp index 25a9a1a5c2e..cdc3a312795 100644 --- a/engines/lure/lure.cpp +++ b/engines/lure/lure.cpp @@ -28,6 +28,7 @@ #include "base/plugins.h" #include "common/config-manager.h" +#include "common/endian.h" #include "common/file.h" #include "common/system.h" #include "common/md5.h" diff --git a/engines/lure/res.cpp b/engines/lure/res.cpp index cca901a3348..c1a8fa82f12 100644 --- a/engines/lure/res.cpp +++ b/engines/lure/res.cpp @@ -24,6 +24,7 @@ #include "lure/disk.h" #include "lure/scripts.h" #include "lure/screen.h" +#include "common/endian.h" namespace Lure { diff --git a/engines/lure/res_struct.cpp b/engines/lure/res_struct.cpp index 4858f5e06b8..587e25919f0 100644 --- a/engines/lure/res_struct.cpp +++ b/engines/lure/res_struct.cpp @@ -24,6 +24,7 @@ #include "lure/disk.h" #include "lure/scripts.h" #include "lure/system.h" +#include "common/endian.h" namespace Lure { diff --git a/engines/lure/scripts.cpp b/engines/lure/scripts.cpp index 2cffae9fb1a..4753b003990 100644 --- a/engines/lure/scripts.cpp +++ b/engines/lure/scripts.cpp @@ -24,6 +24,7 @@ #include "lure/res.h" #include "lure/game.h" #include "common/stack.h" +#include "common/endian.h" namespace Lure { diff --git a/engines/lure/strings.cpp b/engines/lure/strings.cpp index d509e3842de..2e453298d9b 100644 --- a/engines/lure/strings.cpp +++ b/engines/lure/strings.cpp @@ -23,6 +23,7 @@ #include "lure/strings.h" #include "lure/disk.h" #include "lure/room.h" +#include "common/endian.h" namespace Lure { diff --git a/engines/lure/surface.cpp b/engines/lure/surface.cpp index 2205a7ea13a..19ad9330dae 100644 --- a/engines/lure/surface.cpp +++ b/engines/lure/surface.cpp @@ -27,6 +27,7 @@ #include "lure/screen.h" #include "lure/room.h" #include "lure/strings.h" +#include "common/endian.h" namespace Lure { diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp index a5c756e3667..6d68d6ac91e 100644 --- a/engines/queen/sound.cpp +++ b/engines/queen/sound.cpp @@ -21,6 +21,8 @@ */ #include "common/stdafx.h" +#include "common/endian.h" + #include "queen/sound.h" #include "queen/input.h" diff --git a/engines/queen/structs.h b/engines/queen/structs.h index 4f43950fa4f..65d373295a9 100644 --- a/engines/queen/structs.h +++ b/engines/queen/structs.h @@ -24,6 +24,7 @@ #define QUEENSTRUCTS_H #include "queen/defs.h" +#include "common/endian.h" namespace Queen { diff --git a/engines/saga/script.h b/engines/saga/script.h index bc11013b3fd..218d92c4c3d 100644 --- a/engines/saga/script.h +++ b/engines/saga/script.h @@ -27,6 +27,8 @@ #ifndef SAGA_SCRIPT_H #define SAGA_SCRIPT_H +#include "common/endian.h" + #include "saga/font.h" #include "saga/list.h" diff --git a/engines/scumm/file.cpp b/engines/scumm/file.cpp index bc213baa142..7a17d8c97bb 100644 --- a/engines/scumm/file.cpp +++ b/engines/scumm/file.cpp @@ -21,6 +21,7 @@ */ #include "scumm/file.h" +#include "common/endian.h" #include "common/util.h" #include "common/md5.h" diff --git a/engines/scumm/imuse/sysex_samnmax.cpp b/engines/scumm/imuse/sysex_samnmax.cpp index 0a01eb50656..9cf1ec32a4f 100644 --- a/engines/scumm/imuse/sysex_samnmax.cpp +++ b/engines/scumm/imuse/sysex_samnmax.cpp @@ -21,6 +21,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/util.h" /* diff --git a/engines/scumm/imuse/sysex_scumm.cpp b/engines/scumm/imuse/sysex_scumm.cpp index 2b11878522b..4d51cc4fba5 100644 --- a/engines/scumm/imuse/sysex_scumm.cpp +++ b/engines/scumm/imuse/sysex_scumm.cpp @@ -21,6 +21,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/util.h" /* diff --git a/engines/scumm/imuse_digi/dimuse_codecs.cpp b/engines/scumm/imuse_digi/dimuse_codecs.cpp index 116c78bf5c3..6f695eab0d4 100644 --- a/engines/scumm/imuse_digi/dimuse_codecs.cpp +++ b/engines/scumm/imuse_digi/dimuse_codecs.cpp @@ -21,6 +21,7 @@ #include "common/stdafx.h" #include "common/scummsys.h" +#include "common/endian.h" #include "common/util.h" namespace Scumm { diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index c5998736aa4..bd869d98681 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -25,6 +25,7 @@ #define SCUMM_H #include "base/engine.h" +#include "common/endian.h" #include "common/file.h" #include "common/rect.h" #include "common/str.h" diff --git a/engines/scumm/smush/codec1.cpp b/engines/scumm/smush/codec1.cpp index 04d55e2ed72..5b6a7b62f8b 100644 --- a/engines/scumm/smush/codec1.cpp +++ b/engines/scumm/smush/codec1.cpp @@ -21,7 +21,7 @@ */ #include "common/stdafx.h" -#include "common/scummsys.h" +#include "common/endian.h" namespace Scumm { diff --git a/engines/scumm/smush/codec37.cpp b/engines/scumm/smush/codec37.cpp index 732bffeeae2..ba323c03f2a 100644 --- a/engines/scumm/smush/codec37.cpp +++ b/engines/scumm/smush/codec37.cpp @@ -21,6 +21,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/util.h" #include "scumm/bomp.h" #include "scumm/smush/codec37.h" diff --git a/engines/scumm/smush/codec47.cpp b/engines/scumm/smush/codec47.cpp index ef10a282a9c..5e44492a8e5 100644 --- a/engines/scumm/smush/codec47.cpp +++ b/engines/scumm/smush/codec47.cpp @@ -21,6 +21,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/util.h" #include "scumm/bomp.h" #include "scumm/smush/codec47.h" diff --git a/engines/scumm/smush/saud_channel.cpp b/engines/scumm/smush/saud_channel.cpp index 22773365702..9969ac4bc90 100644 --- a/engines/scumm/smush/saud_channel.cpp +++ b/engines/scumm/smush/saud_channel.cpp @@ -21,6 +21,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "scumm/smush/channel.h" #include "scumm/smush/chunk.h" diff --git a/engines/sky/autoroute.cpp b/engines/sky/autoroute.cpp index 15c00ff028e..53c870f6f24 100644 --- a/engines/sky/autoroute.cpp +++ b/engines/sky/autoroute.cpp @@ -21,7 +21,9 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/util.h" + #include "sky/autoroute.h" #include "sky/compact.h" #include "sky/grid.h" diff --git a/engines/sky/compact.cpp b/engines/sky/compact.cpp index 7807c64f95e..057465c6e6e 100644 --- a/engines/sky/compact.cpp +++ b/engines/sky/compact.cpp @@ -21,6 +21,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/util.h" #include "common/file.h" #include "sky/compact.h" diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp index 59e7aa0e5ec..d5cdadd09f6 100644 --- a/engines/sky/control.cpp +++ b/engines/sky/control.cpp @@ -21,11 +21,13 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/config-manager.h" #include "common/file.h" #include "common/system.h" #include "common/savefile.h" #include "common/util.h" + #include "gui/message.h" #include "sky/compact.h" #include "sky/control.h" diff --git a/engines/sky/debug.cpp b/engines/sky/debug.cpp index cac1a53aba8..d7e8f6694c3 100644 --- a/engines/sky/debug.cpp +++ b/engines/sky/debug.cpp @@ -21,6 +21,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/util.h" #include "common/debugger.cpp" diff --git a/engines/sky/disk.cpp b/engines/sky/disk.cpp index 3c39a287d00..451b4d9058f 100644 --- a/engines/sky/disk.cpp +++ b/engines/sky/disk.cpp @@ -21,9 +21,10 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/file.h" #include "common/util.h" -#include "common/scummsys.h" + #include "sky/disk.h" #include "sky/rnc_deco.h" #include "sky/sky.h" diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp index ce6849fbd0e..9f8b56356e2 100644 --- a/engines/sky/intro.cpp +++ b/engines/sky/intro.cpp @@ -21,8 +21,10 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/util.h" #include "common/system.h" + #include "sky/disk.h" #include "sky/intro.h" #include "sky/music/musicbase.h" diff --git a/engines/sky/logic.cpp b/engines/sky/logic.cpp index 9ea560a5bfb..5c63c22f853 100644 --- a/engines/sky/logic.cpp +++ b/engines/sky/logic.cpp @@ -21,6 +21,8 @@ */ #include "common/stdafx.h" +#include "common/endian.h" + #include "sky/autoroute.h" #include "sky/compact.h" #include "sky/control.h" diff --git a/engines/sky/music/adlibchannel.cpp b/engines/sky/music/adlibchannel.cpp index 9b28f832bbe..1ea9a4a8c5e 100644 --- a/engines/sky/music/adlibchannel.cpp +++ b/engines/sky/music/adlibchannel.cpp @@ -21,6 +21,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/util.h" #include "sky/music/adlibchannel.h" #include "sky/sky.h" diff --git a/engines/sky/music/adlibmusic.cpp b/engines/sky/music/adlibmusic.cpp index e7ee4ecb6d7..7df70e4a0fe 100644 --- a/engines/sky/music/adlibmusic.cpp +++ b/engines/sky/music/adlibmusic.cpp @@ -20,6 +20,9 @@ * */ +#include "common/stdafx.h" +#include "common/endian.h" + #include "sky/music/adlibmusic.h" #include "sky/music/adlibchannel.h" #include "sound/mixer.h" diff --git a/engines/sky/rnc_deco.cpp b/engines/sky/rnc_deco.cpp index 06b7721d74f..6218c296c37 100644 --- a/engines/sky/rnc_deco.cpp +++ b/engines/sky/rnc_deco.cpp @@ -21,7 +21,7 @@ */ #include "common/stdafx.h" -#include "common/scummsys.h" +#include "common/endian.h" #include "sky/rnc_deco.h" namespace Sky { diff --git a/engines/sky/screen.cpp b/engines/sky/screen.cpp index 8688969de56..1b262f5659d 100644 --- a/engines/sky/screen.cpp +++ b/engines/sky/screen.cpp @@ -21,7 +21,9 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/system.h" + #include "sky/disk.h" #include "sky/logic.h" #include "sky/screen.h" diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp index 0cd015d49d5..c74e6f9c99b 100644 --- a/engines/sky/sound.cpp +++ b/engines/sky/sound.cpp @@ -21,6 +21,8 @@ */ #include "common/stdafx.h" +#include "common/endian.h" + #include "sky/disk.h" #include "sky/logic.h" #include "sky/sky.h" diff --git a/engines/sky/text.cpp b/engines/sky/text.cpp index 2c997340abc..d15bc554d1b 100644 --- a/engines/sky/text.cpp +++ b/engines/sky/text.cpp @@ -20,6 +20,9 @@ * */ +#include "common/stdafx.h" +#include "common/endian.h" + #include "sky/disk.h" #include "sky/logic.h" #include "sky/text.h" diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp index bf101e96389..aa6b216b35e 100644 --- a/engines/sword1/control.cpp +++ b/engines/sword1/control.cpp @@ -21,6 +21,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/file.h" #include "common/util.h" #include "common/savefile.h" diff --git a/engines/sword1/credits.cpp b/engines/sword1/credits.cpp index 117430b96ff..e5bda89e10e 100644 --- a/engines/sword1/credits.cpp +++ b/engines/sword1/credits.cpp @@ -21,6 +21,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "sword1/credits.h" #include "sword1/screen.h" diff --git a/engines/sword1/logic.cpp b/engines/sword1/logic.cpp index 0b789559e0d..2c619d6dc9a 100644 --- a/engines/sword1/logic.cpp +++ b/engines/sword1/logic.cpp @@ -21,6 +21,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/util.h" #include "sword1/logic.h" diff --git a/engines/sword1/mouse.cpp b/engines/sword1/mouse.cpp index a84708c6b96..f925984984b 100644 --- a/engines/sword1/mouse.cpp +++ b/engines/sword1/mouse.cpp @@ -21,6 +21,9 @@ */ #include "common/stdafx.h" +#include "common/endian.h" +#include "common/system.h" + #include "sword1/mouse.h" #include "sword1/menu.h" #include "sword1/screen.h" @@ -28,7 +31,6 @@ #include "sword1/resman.h" #include "sword1/objectman.h" #include "sword1/sworddefs.h" -#include "common/system.h" #include "sword1/swordres.h" #include "sword1/menu.h" diff --git a/engines/sword1/music.cpp b/engines/sword1/music.cpp index a5ed77d30d1..6ea75da4c77 100644 --- a/engines/sword1/music.cpp +++ b/engines/sword1/music.cpp @@ -21,13 +21,12 @@ */ #include "common/stdafx.h" - -#include "sword1/music.h" - -#include "common/util.h" +#include "common/endian.h" #include "common/file.h" +#include "common/util.h" #include "common/system.h" +#include "sword1/music.h" #include "sound/mixer.h" #include "sound/mp3.h" #include "sound/vorbis.h" diff --git a/engines/sword1/objectman.cpp b/engines/sword1/objectman.cpp index 330e5566ee2..bb21f25b135 100644 --- a/engines/sword1/objectman.cpp +++ b/engines/sword1/objectman.cpp @@ -21,9 +21,10 @@ */ #include "common/stdafx.h" -#include "sword1/objectman.h" -#include "common/scummsys.h" +#include "common/endian.h" #include "common/util.h" + +#include "sword1/objectman.h" #include "sword1/sworddefs.h" #include "sword1/swordres.h" #include "sword1/sword1.h" diff --git a/engines/sword1/resman.cpp b/engines/sword1/resman.cpp index fd86993dfa2..c7fe6bf3baf 100644 --- a/engines/sword1/resman.cpp +++ b/engines/sword1/resman.cpp @@ -21,14 +21,16 @@ */ #include "common/stdafx.h" -#include "common/scummsys.h" -#include "sword1/memman.h" -#include "sword1/resman.h" -#include "sword1/sworddefs.h" -#include "base/engine.h" +#include "common/endian.h" #include "common/config-manager.h" #include "common/util.h" #include "common/str.h" + +#include "base/engine.h" + +#include "sword1/memman.h" +#include "sword1/resman.h" +#include "sword1/sworddefs.h" #include "sword1/swordres.h" #include "gui/message.h" diff --git a/engines/sword1/router.cpp b/engines/sword1/router.cpp index 68f8ca6756a..57e72880f7b 100644 --- a/engines/sword1/router.cpp +++ b/engines/sword1/router.cpp @@ -21,9 +21,10 @@ */ #include "common/stdafx.h" -#include "sword1/router.h" +#include "common/endian.h" #include "common/util.h" -#include "common/scummsys.h" + +#include "sword1/router.h" #include "sword1/swordres.h" #include "sword1/sworddefs.h" #include "sword1/objectman.h" diff --git a/engines/sword1/screen.cpp b/engines/sword1/screen.cpp index 248f1d3227d..26672b3a3c5 100644 --- a/engines/sword1/screen.cpp +++ b/engines/sword1/screen.cpp @@ -21,9 +21,10 @@ */ #include "common/stdafx.h" -#include "common/scummsys.h" +#include "common/endian.h" #include "common/system.h" #include "common/util.h" + #include "sword1/screen.h" #include "sword1/logic.h" #include "sword1/sworddefs.h" diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp index 5275c5683e6..63494a936b4 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -21,8 +21,11 @@ */ #include "common/stdafx.h" -#include "sword1/sound.h" +#include "common/endian.h" + #include "common/util.h" + +#include "sword1/sound.h" #include "sword1/resman.h" #include "sword1/logic.h" #include "sword1/sword1.h" diff --git a/engines/sword1/text.cpp b/engines/sword1/text.cpp index d7e14073e93..f227ca11f9f 100644 --- a/engines/sword1/text.cpp +++ b/engines/sword1/text.cpp @@ -21,10 +21,12 @@ */ #include "common/stdafx.h" +#include "common/endian.h" +#include "common/util.h" + #include "sword1/text.h" #include "sword1/resman.h" #include "sword1/objectman.h" -#include "common/util.h" #include "sword1/swordres.h" #include "sword1/sworddefs.h" diff --git a/engines/sword2/header.h b/engines/sword2/header.h index f5cfec6416a..278d98b0b92 100644 --- a/engines/sword2/header.h +++ b/engines/sword2/header.h @@ -23,6 +23,7 @@ #define SWORD2_HEADER_H #include "common/stream.h" +#include "common/endian.h" namespace Sword2 { diff --git a/engines/sword2/interpreter.h b/engines/sword2/interpreter.h index 15a58331c7c..c4f352dfa20 100644 --- a/engines/sword2/interpreter.h +++ b/engines/sword2/interpreter.h @@ -22,6 +22,8 @@ #ifndef SWORD2_INTERPRETER_H #define SWORD2_INTERPRETER_H +#include "common/endian.h" + namespace Sword2 { // Interpreter return codes diff --git a/engines/sword2/logic.h b/engines/sword2/logic.h index c12ca735477..1e592f662ea 100644 --- a/engines/sword2/logic.h +++ b/engines/sword2/logic.h @@ -25,6 +25,7 @@ #define SWORD2_LOGIC_H #include "sword2/memory.h" +#include "common/endian.h" namespace Sword2 { diff --git a/engines/sword2/object.h b/engines/sword2/object.h index 7d82bbcdecd..829a3ab38ee 100644 --- a/engines/sword2/object.h +++ b/engines/sword2/object.h @@ -23,6 +23,7 @@ #define SWORD2_OBJECT_H #include "common/stream.h" +#include "common/endian.h" namespace Sword2 { diff --git a/engines/sword2/render.cpp b/engines/sword2/render.cpp index 261ba8b4069..4231c490254 100644 --- a/engines/sword2/render.cpp +++ b/engines/sword2/render.cpp @@ -20,6 +20,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/system.h" #include "graphics/primitives.h" diff --git a/graphics/ilbm.cpp b/graphics/ilbm.cpp index e0e67535508..1b1f53d2c15 100644 --- a/graphics/ilbm.cpp +++ b/graphics/ilbm.cpp @@ -20,6 +20,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/stream.h" #include "graphics/surface.h" diff --git a/sound/adpcm.cpp b/sound/adpcm.cpp index b1270d92208..d523bf84bcd 100644 --- a/sound/adpcm.cpp +++ b/sound/adpcm.cpp @@ -22,6 +22,8 @@ #include "common/stdafx.h" +#include "common/endian.h" + #include "sound/adpcm.h" #include "sound/audiostream.h" diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp index 26e2de48b4e..2af01f66e64 100644 --- a/sound/audiostream.cpp +++ b/sound/audiostream.cpp @@ -21,8 +21,10 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/file.h" #include "common/util.h" + #include "sound/audiostream.h" #include "sound/mixer.h" #include "sound/mp3.h" diff --git a/sound/midiparser.h b/sound/midiparser.h index aefbb1900c7..24ffd1b461a 100644 --- a/sound/midiparser.h +++ b/sound/midiparser.h @@ -26,6 +26,7 @@ #define INCLUDED_MIDIPARSER #include "common/scummsys.h" +#include "common/endian.h" class MidiParser; class MidiDriver; diff --git a/sound/voc.cpp b/sound/voc.cpp index 051a3ee4293..86abca3ce2b 100644 --- a/sound/voc.cpp +++ b/sound/voc.cpp @@ -22,6 +22,7 @@ */ #include "common/stdafx.h" +#include "common/endian.h" #include "common/util.h" #include "common/stream.h"