diff options
| author | Max Horn | 2009-02-15 14:46:42 +0000 |
|---|---|---|
| committer | Max Horn | 2009-02-15 14:46:42 +0000 |
| commit | 9daed50e0165f387f597fec4d06b57805e1f717c (patch) | |
| tree | eca2f45cf9f2b90ef83be380e42d32e99ecb1862 /engines/sci/sfx/core.cpp | |
| parent | 0082a84b8d956bf25c6aaef153d401d641f0923d (diff) | |
| download | scummvm-rg350-9daed50e0165f387f597fec4d06b57805e1f717c.tar.gz scummvm-rg350-9daed50e0165f387f597fec4d06b57805e1f717c.tar.bz2 scummvm-rg350-9daed50e0165f387f597fec4d06b57805e1f717c.zip | |
Fixed lots of warnings and errors (on my system) by backporting a patch I had sent the FreeSCI folks some time ago (but apparently it never made it, or only made it to a branch not imported?)
svn-id: r38245
Diffstat (limited to 'engines/sci/sfx/core.cpp')
| -rw-r--r-- | engines/sci/sfx/core.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/engines/sci/sfx/core.cpp b/engines/sci/sfx/core.cpp index 5555af4dfe..1516af3b21 100644 --- a/engines/sci/sfx/core.cpp +++ b/engines/sci/sfx/core.cpp @@ -863,8 +863,6 @@ static const int MIDI_cmdlen[16] = {0, 0, 0, 0, 0, 0, 0, 0, static const song_handle_t midi_send_base = 0xffff0000; -static song_handle_t midi_send_handle = 0xffff0000; - int sfx_send_midi(sfx_state_t *self, song_handle_t handle, int channel, int command, int arg1, int arg2) @@ -875,7 +873,7 @@ sfx_send_midi(sfx_state_t *self, song_handle_t handle, int channel, /* Yes, in that order. SCI channel mutes are actually done via a counting semaphore. 0 means to decrement the counter, 1 to increment it. */ - static char *channel_state[] = {"ON","OFF"}; + static const char *channel_state[] = {"ON","OFF"}; if (command == 0xb0 && arg1 == SCI_MIDI_CHANNEL_MUTE) |