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 /sword2/driver | |
| 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 'sword2/driver')
| -rw-r--r-- | sword2/driver/_mouse.cpp | 1 | ||||
| -rw-r--r-- | sword2/driver/animation.cpp | 1 | ||||
| -rw-r--r-- | sword2/driver/d_draw.cpp | 1 | ||||
| -rw-r--r-- | sword2/driver/d_sound.cpp | 1 | ||||
| -rw-r--r-- | sword2/driver/d_sound.h | 2 | ||||
| -rw-r--r-- | sword2/driver/menu.cpp | 4 | ||||
| -rw-r--r-- | sword2/driver/palette.cpp | 1 | ||||
| -rw-r--r-- | sword2/driver/rdwin.cpp | 1 | ||||
| -rw-r--r-- | sword2/driver/render.cpp | 1 |
9 files changed, 10 insertions, 3 deletions
diff --git a/sword2/driver/_mouse.cpp b/sword2/driver/_mouse.cpp index bde0896df2..dd9c42c88f 100644 --- a/sword2/driver/_mouse.cpp +++ b/sword2/driver/_mouse.cpp @@ -18,6 +18,7 @@ */ #include "common/stdafx.h" +#include "common/system.h" #include "sword2/sword2.h" #include "sword2/driver/d_draw.h" diff --git a/sword2/driver/animation.cpp b/sword2/driver/animation.cpp index ff5dac2375..3a1a30f630 100644 --- a/sword2/driver/animation.cpp +++ b/sword2/driver/animation.cpp @@ -22,6 +22,7 @@ #include "common/stdafx.h" #include "common/file.h" #include "common/config-manager.h" +#include "common/system.h" #include "sound/vorbis.h" #include "sound/mp3.h" diff --git a/sword2/driver/d_draw.cpp b/sword2/driver/d_draw.cpp index 293a2da838..822d858e35 100644 --- a/sword2/driver/d_draw.cpp +++ b/sword2/driver/d_draw.cpp @@ -18,6 +18,7 @@ */ #include "common/stdafx.h" +#include "common/system.h" #include "sword2/sword2.h" #include "sword2/driver/d_draw.h" #include "sword2/driver/menu.h" diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp index 495fcf24b0..c61a349d28 100644 --- a/sword2/driver/d_sound.cpp +++ b/sword2/driver/d_sound.cpp @@ -25,6 +25,7 @@ #include "common/stdafx.h" #include "common/file.h" +#include "common/system.h" #include "sound/mp3.h" #include "sound/vorbis.h" #include "sound/flac.h" diff --git a/sword2/driver/d_sound.h b/sword2/driver/d_sound.h index 96a6689ff6..77d8f753d0 100644 --- a/sword2/driver/d_sound.h +++ b/sword2/driver/d_sound.h @@ -59,7 +59,7 @@ class Sound : public AudioStream { private: Sword2Engine *_vm; - OSystem::MutexRef _mutex; + Common::MutexRef _mutex; int32 _panTable[33]; bool _soundOn; diff --git a/sword2/driver/menu.cpp b/sword2/driver/menu.cpp index e8b39d0d37..98a430e11c 100644 --- a/sword2/driver/menu.cpp +++ b/sword2/driver/menu.cpp @@ -55,10 +55,10 @@ void Graphics::processMenu(void) { static int32 lastTime = 0; if (lastTime == 0) { - lastTime = _vm->_system->getMillis(); + lastTime = _vm->getMillis(); frameCount = 1; } else { - int32 delta = _vm->_system->getMillis() - lastTime; + int32 delta = _vm->getMillis() - lastTime; if (delta > 250) { lastTime += delta; diff --git a/sword2/driver/palette.cpp b/sword2/driver/palette.cpp index 285c463e14..2423d38ae3 100644 --- a/sword2/driver/palette.cpp +++ b/sword2/driver/palette.cpp @@ -18,6 +18,7 @@ */ #include "common/stdafx.h" +#include "common/system.h" #include "sword2/sword2.h" #include "sword2/driver/d_draw.h" diff --git a/sword2/driver/rdwin.cpp b/sword2/driver/rdwin.cpp index 45405b47d0..51ae28569b 100644 --- a/sword2/driver/rdwin.cpp +++ b/sword2/driver/rdwin.cpp @@ -18,6 +18,7 @@ */ #include "common/stdafx.h" +#include "common/system.h" #include "sword2/sword2.h" #include "sword2/driver/d_draw.h" #include "sword2/driver/menu.h" diff --git a/sword2/driver/render.cpp b/sword2/driver/render.cpp index 4f7f8947cf..9a07cb0431 100644 --- a/sword2/driver/render.cpp +++ b/sword2/driver/render.cpp @@ -18,6 +18,7 @@ */ #include "common/stdafx.h" +#include "common/system.h" #include "sword2/sword2.h" #include "sword2/driver/animation.h" #include "sword2/driver/d_draw.h" |