aboutsummaryrefslogtreecommitdiff
path: root/sky/music
diff options
context:
space:
mode:
authorMax Horn2003-09-10 12:40:41 +0000
committerMax Horn2003-09-10 12:40:41 +0000
commit65a6bcb90bfb98522325c77b50b43e28ed6ddfd1 (patch)
tree65b68821d8d37408a1cedbec90e0b05a14dd20c5 /sky/music
parentc832c55f90891463668169df0e5c26378d096775 (diff)
downloadscummvm-rg350-65a6bcb90bfb98522325c77b50b43e28ed6ddfd1.tar.gz
scummvm-rg350-65a6bcb90bfb98522325c77b50b43e28ed6ddfd1.tar.bz2
scummvm-rg350-65a6bcb90bfb98522325c77b50b43e28ed6ddfd1.zip
moved declaration of error/warning/debug from engine.h to util.h
svn-id: r10154
Diffstat (limited to 'sky/music')
-rw-r--r--sky/music/gmchannel.cpp1
-rw-r--r--sky/music/gmchannel.h1
-rw-r--r--sky/music/mt32music.cpp2
-rw-r--r--sky/music/mt32music.h1
-rw-r--r--sky/music/musicbase.cpp2
-rw-r--r--sky/music/musicbase.h2
6 files changed, 4 insertions, 5 deletions
diff --git a/sky/music/gmchannel.cpp b/sky/music/gmchannel.cpp
index badf4b6837..7ef5ac0e6f 100644
--- a/sky/music/gmchannel.cpp
+++ b/sky/music/gmchannel.cpp
@@ -21,6 +21,7 @@
#include "common/util.h"
#include "gmchannel.h"
+#include "common/util.h"
SkyGmChannel::SkyGmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pMidiDrv, byte *pInstMap, uint8 *veloTab)
{
diff --git a/sky/music/gmchannel.h b/sky/music/gmchannel.h
index 1cf2e02177..af984056d1 100644
--- a/sky/music/gmchannel.h
+++ b/sky/music/gmchannel.h
@@ -24,7 +24,6 @@
#include "stdafx.h"
#include "sound/mididrv.h"
-#include "common/engine.h"
#include "sky/music/musicbase.h"
typedef struct {
diff --git a/sky/music/mt32music.cpp b/sky/music/mt32music.cpp
index 11a18c4685..97e3fdfab5 100644
--- a/sky/music/mt32music.cpp
+++ b/sky/music/mt32music.cpp
@@ -19,8 +19,8 @@
*
*/
-#include "common/util.h"
#include "sky/music/mt32music.h"
+#include "common/util.h"
void SkyMT32Music::passTimerFunc(void *param) {
diff --git a/sky/music/mt32music.h b/sky/music/mt32music.h
index c547c565fe..d9624229b3 100644
--- a/sky/music/mt32music.h
+++ b/sky/music/mt32music.h
@@ -23,7 +23,6 @@
#define MT32MUSIC_H
#include "stdafx.h"
-#include "common/engine.h"
#include "musicbase.h"
#include "sound/mididrv.h"
#include "gmchannel.h"
diff --git a/sky/music/musicbase.cpp b/sky/music/musicbase.cpp
index e7b467691c..c0672d70b5 100644
--- a/sky/music/musicbase.cpp
+++ b/sky/music/musicbase.cpp
@@ -19,8 +19,8 @@
*
*/
-#include "common/util.h"
#include "musicbase.h"
+#include "common/util.h"
SkyMusicBase::SkyMusicBase(SkyDisk *pSkyDisk, OSystem *system) {
diff --git a/sky/music/musicbase.h b/sky/music/musicbase.h
index db69647f5d..1fa34be2bf 100644
--- a/sky/music/musicbase.h
+++ b/sky/music/musicbase.h
@@ -23,8 +23,8 @@
#define MUSICBASE_H
#include "stdafx.h"
-#include "common/engine.h"
#include "sky/disk.h"
+#include "common/system.h"
#define FILES_PER_SECTION 4