aboutsummaryrefslogtreecommitdiff
path: root/engines/made
diff options
context:
space:
mode:
Diffstat (limited to 'engines/made')
-rw-r--r--engines/made/database.cpp12
-rw-r--r--engines/made/database.h14
-rw-r--r--engines/made/detection.cpp6
-rw-r--r--engines/made/graphics.cpp7
-rw-r--r--engines/made/graphics.h9
-rw-r--r--engines/made/made.cpp34
-rw-r--r--engines/made/made.h23
-rw-r--r--engines/made/music.cpp7
-rw-r--r--engines/made/music.h6
-rw-r--r--engines/made/pmvplayer.cpp10
-rw-r--r--engines/made/pmvplayer.h22
-rw-r--r--engines/made/redreader.cpp3
-rw-r--r--engines/made/redreader.h9
-rw-r--r--engines/made/resource.cpp16
-rw-r--r--engines/made/resource.h22
-rw-r--r--engines/made/screen.cpp8
-rw-r--r--engines/made/screen.h11
-rw-r--r--engines/made/screenfx.cpp5
-rw-r--r--engines/made/screenfx.h13
-rw-r--r--engines/made/script.cpp8
-rw-r--r--engines/made/script.h3
-rw-r--r--engines/made/scriptfuncs.cpp22
-rw-r--r--engines/made/scriptfuncs.h10
-rw-r--r--engines/made/sound.cpp6
-rw-r--r--engines/made/sound.h3
25 files changed, 142 insertions, 147 deletions
diff --git a/engines/made/database.cpp b/engines/made/database.cpp
index 004f1462a6..b0cd4bb262 100644
--- a/engines/made/database.cpp
+++ b/engines/made/database.cpp
@@ -20,13 +20,15 @@
*
*/
-#include "common/system.h"
+#include "made/database.h"
+#include "made/redreader.h"
+
#include "common/endian.h"
-#include "common/util.h"
+#include "common/stream.h"
+#include "common/debug.h"
+#include "common/file.h"
#include "common/savefile.h"
-#include "common/textconsole.h"
-
-#include "made/database.h"
+#include "common/system.h"
namespace Made {
diff --git a/engines/made/database.h b/engines/made/database.h
index 3bf69ca116..63f0557196 100644
--- a/engines/made/database.h
+++ b/engines/made/database.h
@@ -23,18 +23,18 @@
#ifndef MADE_DATABASE_H
#define MADE_DATABASE_H
-#include "common/array.h"
#include "common/hashmap.h"
-#include "common/util.h"
-#include "common/file.h"
-#include "common/stream.h"
-#include "common/str.h"
-#include "made/made.h"
-#include "made/redreader.h"
+namespace Common {
+class SeekableReadStream;
+class WriteStream;
+class String;
+}
namespace Made {
+class MadeEngine;
+
class Object {
public:
diff --git a/engines/made/detection.cpp b/engines/made/detection.cpp
index fa08923e44..f653e95a54 100644
--- a/engines/made/detection.cpp
+++ b/engines/made/detection.cpp
@@ -20,13 +20,9 @@
*
*/
-#include "base/plugins.h"
-
-#include "engines/advancedDetector.h"
-#include "common/file.h"
-
#include "made/made.h"
+#include "engines/advancedDetector.h"
namespace Made {
diff --git a/engines/made/graphics.cpp b/engines/made/graphics.cpp
index 3ac73617c1..30496d8595 100644
--- a/engines/made/graphics.cpp
+++ b/engines/made/graphics.cpp
@@ -20,11 +20,14 @@
*
*/
-#include "common/debug.h"
+#include "made/graphics.h"
+
#include "common/endian.h"
#include "common/textconsole.h"
+#include "common/debug.h"
+#include "common/util.h"
-#include "made/graphics.h"
+#include "graphics/surface.h"
namespace Made {
diff --git a/engines/made/graphics.h b/engines/made/graphics.h
index 691f1127c2..15704c7792 100644
--- a/engines/made/graphics.h
+++ b/engines/made/graphics.h
@@ -23,10 +23,11 @@
#ifndef MADE_GRAPHICS_H
#define MADE_GRAPHICS_H
-#include "common/util.h"
-#include "common/file.h"
-#include "common/stream.h"
-#include "graphics/surface.h"
+#include "common/scummsys.h"
+
+namespace Graphics {
+struct Surface;
+}
namespace Made {
diff --git a/engines/made/made.cpp b/engines/made/made.cpp
index 75d39fa205..3843040961 100644
--- a/engines/made/made.cpp
+++ b/engines/made/made.cpp
@@ -20,31 +20,23 @@
*
*/
-#include "common/events.h"
-#include "common/keyboard.h"
-#include "common/config-manager.h"
-#include "common/stream.h"
-
-#include "graphics/cursorman.h"
-
-#include "engines/util.h"
-
-#include "backends/audiocd/audiocd.h"
-
-#include "base/plugins.h"
-#include "base/version.h"
-
-#include "audio/mixer.h"
-
#include "made/made.h"
-#include "made/database.h"
+#include "made/console.h"
#include "made/pmvplayer.h"
#include "made/resource.h"
#include "made/screen.h"
+#include "made/database.h"
#include "made/script.h"
-#include "made/sound.h"
#include "made/music.h"
-#include "made/redreader.h"
+
+#include "common/config-manager.h"
+#include "common/events.h"
+#include "common/system.h"
+#include "common/error.h"
+
+#include "engines/util.h"
+
+#include "backends/audiocd/audiocd.h"
namespace Made {
@@ -143,6 +135,10 @@ int16 MadeEngine::getTicks() {
return g_system->getMillis() * 30 / 1000;
}
+GUI::Debugger *MadeEngine::getDebugger() {
+ return _console;
+}
+
int16 MadeEngine::getTimer(int16 timerNum) {
if (timerNum > 0 && timerNum <= ARRAYSIZE(_timers) && _timers[timerNum - 1] != -1)
return (getTicks() - _timers[timerNum - 1]);
diff --git a/engines/made/made.h b/engines/made/made.h
index e377f42478..c0b86bb0a8 100644
--- a/engines/made/made.h
+++ b/engines/made/made.h
@@ -23,27 +23,11 @@
#ifndef MADE_MADE_H
#define MADE_MADE_H
-#include "common/scummsys.h"
-#include "common/endian.h"
-#include "common/events.h"
-#include "common/file.h"
-#include "common/hash-str.h"
-#include "common/keyboard.h"
-#include "common/random.h"
-#include "common/savefile.h"
-#include "common/system.h"
-#include "common/util.h"
-
-#include "graphics/surface.h"
-
-#include "audio/audiostream.h"
-#include "audio/mixer.h"
-#include "audio/decoders/voc.h"
+#include "made/sound.h"
#include "engines/engine.h"
-#include "made/sound.h"
-#include "made/console.h"
+#include "common/random.h"
/**
* This is the namespace of the Made engine.
@@ -82,6 +66,7 @@ class Screen;
class ScriptInterpreter;
class GameDatabase;
class MusicPlayer;
+class MadeConsole;
class MadeEngine : public ::Engine {
int _gameId;
@@ -98,7 +83,7 @@ public:
virtual bool hasFeature(EngineFeature f) const;
virtual void syncSoundSettings();
- GUI::Debugger *getDebugger() { return _console; }
+ virtual GUI::Debugger *getDebugger();
int getGameId() {
return _gameId;
diff --git a/engines/made/music.cpp b/engines/made/music.cpp
index 146d8d6371..04ac13eeda 100644
--- a/engines/made/music.cpp
+++ b/engines/made/music.cpp
@@ -24,11 +24,10 @@
// MIDI and digital music class
-#include "audio/audiostream.h"
-#include "audio/mididrv.h"
-#include "audio/midiparser.h"
-
#include "made/music.h"
+#include "made/resource.h"
+
+#include "audio/midiparser.h"
namespace Made {
diff --git a/engines/made/music.h b/engines/made/music.h
index 1a5bae3040..3cfbd50ce7 100644
--- a/engines/made/music.h
+++ b/engines/made/music.h
@@ -26,13 +26,11 @@
#define MADE_MUSIC_H
#include "audio/midiplayer.h"
-#include "audio/midiparser.h"
-#include "common/mutex.h"
-
-#include "made/resource.h"
namespace Made {
+class GenericResource;
+
enum MusicFlags {
MUSIC_NORMAL = 0,
MUSIC_LOOP = 1
diff --git a/engines/made/pmvplayer.cpp b/engines/made/pmvplayer.cpp
index 386d618273..6c4749f44d 100644
--- a/engines/made/pmvplayer.cpp
+++ b/engines/made/pmvplayer.cpp
@@ -21,9 +21,19 @@
*/
#include "made/pmvplayer.h"
+#include "made/made.h"
#include "made/screen.h"
+#include "made/graphics.h"
+
+#include "common/file.h"
+#include "common/debug.h"
+#include "common/system.h"
+#include "common/events.h"
#include "audio/decoders/raw.h"
+#include "audio/audiostream.h"
+
+#include "graphics/surface.h"
namespace Made {
diff --git a/engines/made/pmvplayer.h b/engines/made/pmvplayer.h
index 58b6eafd2b..1c111538c0 100644
--- a/engines/made/pmvplayer.h
+++ b/engines/made/pmvplayer.h
@@ -23,20 +23,24 @@
#ifndef MADE_PMVPLAYER_H
#define MADE_PMVPLAYER_H
-#include "common/system.h"
-#include "common/events.h"
-#include "common/file.h"
-#include "common/endian.h"
-#include "graphics/surface.h"
#include "audio/mixer.h"
-#include "audio/audiostream.h"
-#include "made/graphics.h"
-#include "made/sound.h"
-#include "made/made.h"
+namespace Common {
+class File;
+}
+
+namespace Graphics {
+class Surface;
+}
+
+namespace Audio {
+class QueuingAudioStream;
+}
namespace Made {
+class MadeEngine;
+
class PmvPlayer {
public:
PmvPlayer(MadeEngine *vm, Audio::Mixer *mixer);
diff --git a/engines/made/redreader.cpp b/engines/made/redreader.cpp
index a18c719110..7e92cfe71b 100644
--- a/engines/made/redreader.cpp
+++ b/engines/made/redreader.cpp
@@ -21,8 +21,9 @@
*/
#include "made/redreader.h"
+
+#include "common/file.h"
#include "common/memstream.h"
-#include "common/textconsole.h"
namespace Made {
diff --git a/engines/made/redreader.h b/engines/made/redreader.h
index 84181fb722..3025d31ce1 100644
--- a/engines/made/redreader.h
+++ b/engines/made/redreader.h
@@ -23,9 +23,12 @@
#ifndef MADE_REDREADER_H
#define MADE_REDREADER_H
-#include "common/util.h"
-#include "common/file.h"
-#include "common/stream.h"
+#include "common/scummsys.h"
+
+namespace Common {
+class SeekableReadStream;
+class File;
+}
namespace Made {
diff --git a/engines/made/resource.cpp b/engines/made/resource.cpp
index 246241561c..28fee8ce57 100644
--- a/engines/made/resource.cpp
+++ b/engines/made/resource.cpp
@@ -20,15 +20,17 @@
*
*/
-#include "common/debug.h"
-#include "common/endian.h"
-#include "common/memstream.h"
-#include "audio/mixer.h"
-#include "audio/decoders/raw.h"
-
#include "made/resource.h"
#include "made/graphics.h"
-#include "made/sound.h"
+
+#include "common/file.h"
+#include "common/memstream.h"
+#include "common/debug.h"
+
+#include "graphics/surface.h"
+
+#include "audio/decoders/raw.h"
+#include "audio/audiostream.h"
namespace Made {
diff --git a/engines/made/resource.h b/engines/made/resource.h
index 8ffebfef50..1ce01aab6f 100644
--- a/engines/made/resource.h
+++ b/engines/made/resource.h
@@ -23,15 +23,23 @@
#ifndef MADE_RESOURCE_H
#define MADE_RESOURCE_H
-#include "common/util.h"
-#include "common/file.h"
-#include "common/stream.h"
+#include "made/sound.h"
+
+#include "common/endian.h"
+#include "common/array.h"
#include "common/hashmap.h"
-#include "common/textconsole.h"
-#include "graphics/surface.h"
-#include "audio/audiostream.h"
-#include "made/sound.h"
+namespace Common {
+class File;
+}
+
+namespace Audio {
+class AudioStream;
+}
+
+namespace Graphics {
+class Surface;
+}
namespace Made {
diff --git a/engines/made/screen.cpp b/engines/made/screen.cpp
index 7a8b4603dc..dbe2f1c7ba 100644
--- a/engines/made/screen.cpp
+++ b/engines/made/screen.cpp
@@ -20,12 +20,16 @@
*
*/
-#include "made/made.h"
#include "made/screen.h"
-#include "made/resource.h"
+#include "made/made.h"
+#include "made/screenfx.h"
#include "made/database.h"
+#include "common/system.h"
+
+#include "graphics/surface.h"
#include "graphics/palette.h"
+#include "graphics/cursorman.h"
namespace Made {
diff --git a/engines/made/screen.h b/engines/made/screen.h
index 8485c1c4d7..a61ecabdce 100644
--- a/engines/made/screen.h
+++ b/engines/made/screen.h
@@ -23,15 +23,9 @@
#ifndef MADE_SCREEN_H
#define MADE_SCREEN_H
-#include "common/endian.h"
-#include "common/util.h"
-#include "common/rect.h"
-
-#include "graphics/surface.h"
-#include "graphics/cursorman.h"
-
#include "made/resource.h"
-#include "made/screenfx.h"
+
+#include "common/rect.h"
namespace Made {
@@ -56,6 +50,7 @@ struct SpriteListItem {
};
class MadeEngine;
+class ScreenEffects;
static const byte defaultMouseCursor[256] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/engines/made/screenfx.cpp b/engines/made/screenfx.cpp
index 77220a0ff5..ff0d393885 100644
--- a/engines/made/screenfx.cpp
+++ b/engines/made/screenfx.cpp
@@ -20,9 +20,10 @@
*
*/
-#include "made/made.h"
-#include "made/screen.h"
#include "made/screenfx.h"
+#include "made/screen.h"
+
+#include "graphics/surface.h"
namespace Made {
diff --git a/engines/made/screenfx.h b/engines/made/screenfx.h
index 6011da7d6f..1fcdd5f0d4 100644
--- a/engines/made/screenfx.h
+++ b/engines/made/screenfx.h
@@ -23,17 +23,16 @@
#ifndef MADE_SCREENFX_H
#define MADE_SCREENFX_H
-#include "common/endian.h"
-#include "common/util.h"
-#include "common/rect.h"
+#include "common/scummsys.h"
-#include "graphics/surface.h"
-
-#include "made/made.h"
-#include "made/screen.h"
+namespace Graphics {
+struct Surface;
+}
namespace Made {
+class Screen;
+
struct BlendedPaletteStatus {
bool _active;
byte *_palette, *_newPalette;
diff --git a/engines/made/script.cpp b/engines/made/script.cpp
index 2776008828..7658d20eb5 100644
--- a/engines/made/script.cpp
+++ b/engines/made/script.cpp
@@ -20,15 +20,13 @@
*
*/
-#include "common/endian.h"
-#include "common/util.h"
-
-#include "made/made.h"
#include "made/script.h"
-#include "made/database.h"
#include "made/scriptfuncs.h"
+#include "made/made.h"
+#include "made/database.h"
#include "made/screen.h"
+#include "common/util.h"
namespace Made {
diff --git a/engines/made/script.h b/engines/made/script.h
index 0a7cf8e974..f3db43485f 100644
--- a/engines/made/script.h
+++ b/engines/made/script.h
@@ -23,9 +23,6 @@
#ifndef MADE_SCRIPT_H
#define MADE_SCRIPT_H
-#include "common/util.h"
-#include "common/file.h"
-#include "common/stream.h"
#include "common/textconsole.h"
namespace Made {
diff --git a/engines/made/scriptfuncs.cpp b/engines/made/scriptfuncs.cpp
index aa172bbe74..de7b5b70f9 100644
--- a/engines/made/scriptfuncs.cpp
+++ b/engines/made/scriptfuncs.cpp
@@ -20,21 +20,19 @@
*
*/
-#include "common/util.h"
-
-#include "backends/audiocd/audiocd.h"
-#include "graphics/cursorman.h"
-#include "audio/softsynth/pcspk.h"
-
+#include "made/scriptfuncs.h"
#include "made/made.h"
-#include "made/resource.h"
-#include "made/database.h"
#include "made/screen.h"
-#include "made/script.h"
-#include "made/sound.h"
-#include "made/pmvplayer.h"
-#include "made/scriptfuncs.h"
#include "made/music.h"
+#include "made/database.h"
+#include "made/pmvplayer.h"
+
+#include "audio/softsynth/pcspk.h"
+
+#include "backends/audiocd/audiocd.h"
+
+#include "graphics/cursorman.h"
+#include "graphics/surface.h"
namespace Made {
diff --git a/engines/made/scriptfuncs.h b/engines/made/scriptfuncs.h
index 481c131248..6b3301755d 100644
--- a/engines/made/scriptfuncs.h
+++ b/engines/made/scriptfuncs.h
@@ -23,13 +23,13 @@
#ifndef MADE_SCRIPTFUNCS_H
#define MADE_SCRIPTFUNCS_H
-#include "common/util.h"
-#include "common/file.h"
-#include "common/func.h"
-#include "common/stream.h"
-
#include "made/resource.h"
+#include "audio/mixer.h"
+
+#include "common/debug.h"
+#include "common/system.h"
+
namespace Audio {
class PCSpeaker;
}
diff --git a/engines/made/sound.cpp b/engines/made/sound.cpp
index 54333eb3d4..f73c580560 100644
--- a/engines/made/sound.cpp
+++ b/engines/made/sound.cpp
@@ -20,12 +20,10 @@
*
*/
-#include "common/endian.h"
-#include "common/list.h"
-#include "common/util.h"
-
#include "made/sound.h"
+#include "common/endian.h"
+
namespace Made {
void ManholeEgaSoundDecompressor::decompress(byte *source, byte *dest, uint32 size) {
diff --git a/engines/made/sound.h b/engines/made/sound.h
index 8358d279cf..b8399fd90a 100644
--- a/engines/made/sound.h
+++ b/engines/made/sound.h
@@ -24,9 +24,6 @@
#define MADE_SOUND_H
#include "common/array.h"
-#include "common/util.h"
-#include "common/file.h"
-#include "common/stream.h"
namespace Made {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 04:58:40 +0000