diff options
| author | Max Horn | 2009-05-26 11:30:21 +0000 |
|---|---|---|
| committer | Max Horn | 2009-05-26 11:30:21 +0000 |
| commit | 7d5f3e1714dff2f0beed0f10bcce01be8204f377 (patch) | |
| tree | 7a361b49a88617531c9b983c3e07fc73069b2207 /engines/sci/sfx | |
| parent | 94dfc8f6386ebf0f4a13094e68eaec289a974347 (diff) | |
| download | scummvm-rg350-7d5f3e1714dff2f0beed0f10bcce01be8204f377.tar.gz scummvm-rg350-7d5f3e1714dff2f0beed0f10bcce01be8204f377.tar.bz2 scummvm-rg350-7d5f3e1714dff2f0beed0f10bcce01be8204f377.zip | |
Turned some static tables into static const tables; added some FIXME comments to global static vars that should be removed (many more exist in SCI, Tinsel, and some other engines)
svn-id: r40908
Diffstat (limited to 'engines/sci/sfx')
| -rw-r--r-- | engines/sci/sfx/iterator.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/sfx/iterator.cpp b/engines/sci/sfx/iterator.cpp index 96bdee84b5..6992107b8a 100644 --- a/engines/sci/sfx/iterator.cpp +++ b/engines/sci/sfx/iterator.cpp @@ -1368,9 +1368,9 @@ TeeSongIterator::~TeeSongIterator() { int TeeSongIterator::nextCommand(byte *buf, int *result) { - static int ready_masks[2] = {TEE_LEFT_READY, TEE_RIGHT_READY}; - static int active_masks[2] = {TEE_LEFT_ACTIVE, TEE_RIGHT_ACTIVE}; - static int pcm_masks[2] = {TEE_LEFT_PCM, TEE_RIGHT_PCM}; + static const int ready_masks[2] = {TEE_LEFT_READY, TEE_RIGHT_READY}; + static const int active_masks[2] = {TEE_LEFT_ACTIVE, TEE_RIGHT_ACTIVE}; + static const int pcm_masks[2] = {TEE_LEFT_PCM, TEE_RIGHT_PCM}; int i; int retid; @@ -1497,7 +1497,7 @@ int TeeSongIterator::nextCommand(byte *buf, int *result) { } Audio::AudioStream *TeeSongIterator::getAudioStream() { - static int pcm_masks[2] = {TEE_LEFT_PCM, TEE_RIGHT_PCM}; + static const int pcm_masks[2] = {TEE_LEFT_PCM, TEE_RIGHT_PCM}; int i; for (i = TEE_LEFT; i <= TEE_RIGHT; i++) |