aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorMax Horn2009-05-26 11:30:21 +0000
committerMax Horn2009-05-26 11:30:21 +0000
commit7d5f3e1714dff2f0beed0f10bcce01be8204f377 (patch)
tree7a361b49a88617531c9b983c3e07fc73069b2207 /engines/scumm
parent94dfc8f6386ebf0f4a13094e68eaec289a974347 (diff)
downloadscummvm-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/scumm')
-rw-r--r--engines/scumm/imuse_digi/dimuse_codecs.cpp1
-rw-r--r--engines/scumm/player_v2a.cpp1
-rw-r--r--engines/scumm/sound.cpp2
3 files changed, 1 insertions, 3 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_codecs.cpp b/engines/scumm/imuse_digi/dimuse_codecs.cpp
index e4bce827c4..22796f3152 100644
--- a/engines/scumm/imuse_digi/dimuse_codecs.cpp
+++ b/engines/scumm/imuse_digi/dimuse_codecs.cpp
@@ -22,7 +22,6 @@
* $Id$
*/
-
#include "common/scummsys.h"
#include "common/endian.h"
#include "common/util.h"
diff --git a/engines/scumm/player_v2a.cpp b/engines/scumm/player_v2a.cpp
index 719328d23f..73fc8d1b8a 100644
--- a/engines/scumm/player_v2a.cpp
+++ b/engines/scumm/player_v2a.cpp
@@ -23,7 +23,6 @@
*
*/
-
#include "engines/engine.h"
#include "scumm/player_v2a.h"
#include "scumm/scumm.h"
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 4f9c02322a..f1be5e0b17 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -1292,7 +1292,7 @@ int ScummEngine::readSoundResource(int idx) {
}
// Adlib MIDI-SYSEX to set MIDI instruments for small header games.
-static byte ADLIB_INSTR_MIDI_HACK[95] = {
+static const byte ADLIB_INSTR_MIDI_HACK[95] = {
0x00, 0xf0, 0x14, 0x7d, 0x00, // sysex 00: part on/off
0x00, 0x00, 0x03, // part/channel (offset 5)
0x00, 0x00, 0x07, 0x0f, 0x00, 0x00, 0x08, 0x00,