diff options
author | Max Horn | 2010-11-16 09:53:55 +0000 |
---|---|---|
committer | Max Horn | 2010-11-16 09:53:55 +0000 |
commit | 1dbf8d73d56052654522cf4076490090a41f336b (patch) | |
tree | 4ec9fd566c75859793a1fe72b78d025a87ac03d0 /engines/tinsel/music.cpp | |
parent | ada9c9af608f1af9d00289f4aa2b7be868e2944f (diff) | |
download | scummvm-rg350-1dbf8d73d56052654522cf4076490090a41f336b.tar.gz scummvm-rg350-1dbf8d73d56052654522cf4076490090a41f336b.tar.bz2 scummvm-rg350-1dbf8d73d56052654522cf4076490090a41f336b.zip |
TINSEL: Mark all (?) global vars with a FIXME comment
Use of global vars is what prevents RTL from working in Tinsel (and
probably in other engines). More specifically, the fact that many
global vars are not explicitly inited when the engine is (re)launched.
svn-id: r54262
Diffstat (limited to 'engines/tinsel/music.cpp')
-rw-r--r-- | engines/tinsel/music.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index e86c9b4ddf..c20b456711 100644 --- a/engines/tinsel/music.cpp +++ b/engines/tinsel/music.cpp @@ -62,6 +62,8 @@ struct SOUND_BUFFER { uint32 size; // size of the buffer }; +// FIXME: Avoid non-const global vars + // get set when music driver is installed //static MDI_DRIVER *mDriver; //static HSEQUENCE mSeqHandle; @@ -168,7 +170,7 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) { } // the index and length of the last tune loaded - static uint32 dwLastMidiIndex = 0; + static uint32 dwLastMidiIndex = 0; // FIXME: Avoid non-const global vars //static uint32 dwLastSeqLen; uint32 dwSeqLen = 0; // length of the sequence @@ -308,7 +310,7 @@ int GetMidiVolume() { void SetMidiVolume(int vol) { assert(vol >= 0 && vol <= Audio::Mixer::kMaxChannelVolume); - static int priorVolMusic = 0; + static int priorVolMusic = 0; // FIXME: Avoid non-const global vars if (vol == 0 && priorVolMusic == 0) { // Nothing to do |