diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/advancedDetector.h | 2 | ||||
-rw-r--r-- | engines/agi/agi.h | 1 | ||||
-rw-r--r-- | engines/engine.h | 2 | ||||
-rw-r--r-- | engines/game.cpp | 1 | ||||
-rw-r--r-- | engines/game.h | 3 | ||||
-rw-r--r-- | engines/gob/databases.h | 2 | ||||
-rw-r--r-- | engines/kyra/kyra_v1.h | 3 | ||||
-rw-r--r-- | engines/kyra/screen.h | 1 | ||||
-rw-r--r-- | engines/queen/input.h | 2 | ||||
-rw-r--r-- | engines/queen/queen.cpp | 1 | ||||
-rw-r--r-- | engines/queen/resource.h | 3 | ||||
-rw-r--r-- | engines/scumm/detection.h | 3 | ||||
-rw-r--r-- | engines/scumm/detection_tables.h | 1 | ||||
-rw-r--r-- | engines/scumm/help.h | 1 | ||||
-rw-r--r-- | engines/scumm/scumm.h | 2 | ||||
-rw-r--r-- | engines/sword1/detection.cpp | 1 | ||||
-rw-r--r-- | engines/sword2/sword2.cpp | 3 | ||||
-rw-r--r-- | engines/sword25/util/lua/scummvm_file.cpp | 2 | ||||
-rw-r--r-- | engines/touche/graphics.h | 2 |
19 files changed, 27 insertions, 9 deletions
diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h index c31c8bd66e..3bb00618b1 100644 --- a/engines/advancedDetector.h +++ b/engines/advancedDetector.h @@ -26,6 +26,8 @@ #include "engines/metaengine.h" #include "engines/engine.h" +#include "common/gui_options.h" // FIXME: Temporary hack? + namespace Common { class Error; class FSList; diff --git a/engines/agi/agi.h b/engines/agi/agi.h index ea3afa5ca3..55b4805022 100644 --- a/engines/agi/agi.h +++ b/engines/agi/agi.h @@ -28,6 +28,7 @@ #include "common/util.h" #include "common/file.h" #include "common/rect.h" +#include "common/rendermode.h" #include "common/stack.h" #include "common/system.h" diff --git a/engines/engine.h b/engines/engine.h index a020dc4951..4f4223384a 100644 --- a/engines/engine.h +++ b/engines/engine.h @@ -24,6 +24,8 @@ #include "common/scummsys.h" #include "common/str.h" +#include "common/language.h" +#include "common/platform.h" class OSystem; diff --git a/engines/game.cpp b/engines/game.cpp index be15240745..4bfd8f3bf2 100644 --- a/engines/game.cpp +++ b/engines/game.cpp @@ -21,6 +21,7 @@ */ #include "engines/game.h" +#include "common/gui_options.h" const PlainGameDescriptor *findPlainGameDescriptor(const char *gameid, const PlainGameDescriptor *list) { diff --git a/engines/game.h b/engines/game.h index d5136936bc..3417203ea7 100644 --- a/engines/game.h +++ b/engines/game.h @@ -26,7 +26,8 @@ #include "common/array.h" #include "common/hash-str.h" #include "common/str.h" -#include "common/util.h" +#include "common/language.h" +#include "common/platform.h" /** * A simple structure used to map gameids (like "monkey", "sword1", ...) to diff --git a/engines/gob/databases.h b/engines/gob/databases.h index fb65d8cf96..cde123e6a8 100644 --- a/engines/gob/databases.h +++ b/engines/gob/databases.h @@ -26,7 +26,7 @@ #include "common/str.h" #include "common/hashmap.h" #include "common/hash-str.h" -#include "common/util.h" +#include "common/language.h" #include "gob/dbase.h" diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h index 499f575a0c..11173a45c7 100644 --- a/engines/kyra/kyra_v1.h +++ b/engines/kyra/kyra_v1.h @@ -28,8 +28,9 @@ #include "common/array.h" #include "common/error.h" #include "common/events.h" -#include "common/random.h" #include "common/hashmap.h" +#include "common/random.h" +#include "common/rendermode.h" #include "audio/mixer.h" diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h index a0cf5742c6..b064c72bb0 100644 --- a/engines/kyra/screen.h +++ b/engines/kyra/screen.h @@ -28,6 +28,7 @@ #include "common/list.h" #include "common/array.h" #include "common/rect.h" +#include "common/rendermode.h" #include "common/stream.h" class OSystem; diff --git a/engines/queen/input.h b/engines/queen/input.h index 0aa04dd026..b3bf811cd1 100644 --- a/engines/queen/input.h +++ b/engines/queen/input.h @@ -23,7 +23,7 @@ #ifndef QUEEN_INPUT_H #define QUEEN_INPUT_H -#include "common/util.h" +#include "common/language.h" #include "common/rect.h" #include "common/events.h" #include "queen/defs.h" diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index c610ef9921..d17268e16b 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -25,6 +25,7 @@ #include "common/config-manager.h" #include "common/file.h" #include "common/fs.h" +#include "common/gui_options.h" #include "common/savefile.h" #include "common/system.h" #include "common/events.h" diff --git a/engines/queen/resource.h b/engines/queen/resource.h index ef8e463631..7317ec5134 100644 --- a/engines/queen/resource.h +++ b/engines/queen/resource.h @@ -25,7 +25,8 @@ #include "common/file.h" #include "common/str-array.h" -#include "common/util.h" +#include "common/language.h" +#include "common/platform.h" #include "queen/defs.h" namespace Queen { diff --git a/engines/scumm/detection.h b/engines/scumm/detection.h index ad8b3cec12..b6dfa757bb 100644 --- a/engines/scumm/detection.h +++ b/engines/scumm/detection.h @@ -23,7 +23,8 @@ #ifndef SCUMM_DETECTION_H #define SCUMM_DETECTION_H -#include "common/util.h" +#include "common/language.h" +#include "common/platform.h" namespace Scumm { diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h index a44497f193..d7eedc3a83 100644 --- a/engines/scumm/detection_tables.h +++ b/engines/scumm/detection_tables.h @@ -24,6 +24,7 @@ #define SCUMM_DETECTION_TABLES_H #include "engines/obsolete.h" +#include "common/gui_options.h" #include "common/rect.h" #include "common/util.h" diff --git a/engines/scumm/help.h b/engines/scumm/help.h index 5ba6bdc65c..a3948566c4 100644 --- a/engines/scumm/help.h +++ b/engines/scumm/help.h @@ -24,6 +24,7 @@ #define SCUMM_HELP_H #include "common/str.h" +#include "common/platform.h" namespace Scumm { diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index 2f1e536f0a..cacf8c214e 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -24,6 +24,7 @@ #define SCUMM_H #include "engines/engine.h" + #include "common/endian.h" #include "common/events.h" #include "common/file.h" @@ -31,6 +32,7 @@ #include "common/keyboard.h" #include "common/random.h" #include "common/rect.h" +#include "common/rendermode.h" #include "common/str.h" #include "common/textconsole.h" #include "graphics/surface.h" diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp index 2214e72067..087dcd09d8 100644 --- a/engines/sword1/detection.cpp +++ b/engines/sword1/detection.cpp @@ -25,6 +25,7 @@ #include "base/plugins.h" #include "common/fs.h" +#include "common/gui_options.h" #include "common/savefile.h" #include "common/system.h" #include "graphics/thumbnail.h" diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp index bdfc388c5f..c395186570 100644 --- a/engines/sword2/sword2.cpp +++ b/engines/sword2/sword2.cpp @@ -25,9 +25,10 @@ #include "base/plugins.h" #include "common/config-manager.h" +#include "common/events.h" #include "common/file.h" #include "common/fs.h" -#include "common/events.h" +#include "common/gui_options.h" #include "common/savefile.h" #include "common/system.h" #include "common/textconsole.h" diff --git a/engines/sword25/util/lua/scummvm_file.cpp b/engines/sword25/util/lua/scummvm_file.cpp index 33053a71cb..b5f1388129 100644 --- a/engines/sword25/util/lua/scummvm_file.cpp +++ b/engines/sword25/util/lua/scummvm_file.cpp @@ -22,7 +22,7 @@ #include "sword25/util/lua/scummvm_file.h" #include "common/config-manager.h" -#include "common/util.h" +#include "common/language.h" namespace Sword25 { diff --git a/engines/touche/graphics.h b/engines/touche/graphics.h index 4b769b0a66..5b2ea39a24 100644 --- a/engines/touche/graphics.h +++ b/engines/touche/graphics.h @@ -23,7 +23,7 @@ #ifndef TOUCHE_GRAPHICS_H #define TOUCHE_GRAPHICS_H -#include "common/util.h" +#include "common/language.h" namespace Touche { |