diff options
| author | Max Horn | 2005-01-10 22:06:49 +0000 |
|---|---|---|
| committer | Max Horn | 2005-01-10 22:06:49 +0000 |
| commit | cffd917165a14e981d61342458a9d054d3c14705 (patch) | |
| tree | 3aa6658993fa842477a7ab10b2a21dbf7625a531 /sky | |
| parent | e79458130835528ddf693fba868243cbbfb4ee9a (diff) | |
| download | scummvm-rg350-cffd917165a14e981d61342458a9d054d3c14705.tar.gz scummvm-rg350-cffd917165a14e981d61342458a9d054d3c14705.tar.bz2 scummvm-rg350-cffd917165a14e981d61342458a9d054d3c14705.zip | |
system.h was being included in tons of places, without any good reason; reduced this (total dependencies on system.h went down from 193 to 85 files)
svn-id: r16527
Diffstat (limited to 'sky')
| -rw-r--r-- | sky/intro.cpp | 1 | ||||
| -rw-r--r-- | sky/music/mt32music.cpp | 6 | ||||
| -rw-r--r-- | sky/music/musicbase.cpp | 1 | ||||
| -rw-r--r-- | sky/music/musicbase.h | 4 | ||||
| -rw-r--r-- | sky/sky.cpp | 1 |
5 files changed, 9 insertions, 4 deletions
diff --git a/sky/intro.cpp b/sky/intro.cpp index b51582425e..39f06688dc 100644 --- a/sky/intro.cpp +++ b/sky/intro.cpp @@ -21,6 +21,7 @@ #include "stdafx.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/sky/music/mt32music.cpp b/sky/music/mt32music.cpp index 9b384bcca8..6f941499d1 100644 --- a/sky/music/mt32music.cpp +++ b/sky/music/mt32music.cpp @@ -22,6 +22,7 @@ #include "sky/music/mt32music.h" #include "sky/music/gmchannel.h" #include "common/util.h" +#include "common/system.h" #include "sound/mididrv.h" namespace Sky { @@ -96,7 +97,8 @@ bool MT32Music::processPatchSysEx(uint8 *sysExData) { uint8 sysExBuf[15]; uint8 crc = 0; - if (sysExData[0] & 0x80) return false; + if (sysExData[0] & 0x80) + return false; // decompress data from stream sysExBuf[0] = 0x41; sysExBuf[1] = 0x10; sysExBuf[2] = 0x16; sysExBuf[3] = 0x12; sysExBuf[4] = 0x5; @@ -113,7 +115,7 @@ bool MT32Music::processPatchSysEx(uint8 *sysExData) { crc -= sysExBuf[cnt]; sysExBuf[14] = crc & 0x7F; // crc _midiDrv->sysEx(sysExBuf, 15); - g_system->delayMillis (5); + g_system->delayMillis(5); return true; } diff --git a/sky/music/musicbase.cpp b/sky/music/musicbase.cpp index 8138ccd0bb..104b132103 100644 --- a/sky/music/musicbase.cpp +++ b/sky/music/musicbase.cpp @@ -22,6 +22,7 @@ #include "sky/music/musicbase.h" #include "sky/disk.h" #include "common/util.h" +#include "common/system.h" namespace Sky { diff --git a/sky/music/musicbase.h b/sky/music/musicbase.h index f33f3ec9bb..f3e88dc1f2 100644 --- a/sky/music/musicbase.h +++ b/sky/music/musicbase.h @@ -24,7 +24,7 @@ #include "stdafx.h" #include "common/scummsys.h" -#include "common/system.h" +#include "common/mutex.h" class OSystem; @@ -77,7 +77,7 @@ protected: uint32 _aktTime; Actions _onNextPoll; ChannelBase *_channels[10]; - OSystem::MutexRef _mutex; + Common::MutexRef _mutex; virtual void setupPointers(void) = 0; virtual void setupChannels(uint8 *channelData) = 0; diff --git a/sky/sky.cpp b/sky/sky.cpp index cf9d2e46e7..5e398dd812 100644 --- a/sky/sky.cpp +++ b/sky/sky.cpp @@ -28,6 +28,7 @@ #include "common/config-manager.h" #include "common/file.h" +#include "common/system.h" #include "common/timer.h" #include "sky/control.h" |