diff options
| author | Kari Salminen | 2007-08-09 17:26:41 +0000 |
|---|---|---|
| committer | Kari Salminen | 2007-08-09 17:26:41 +0000 |
| commit | ae1f66994e1e5ac2217a601472d8945785896bd4 (patch) | |
| tree | 574078ffc76e96a4a6985d6342fab2b470c911b0 /engines | |
| parent | 89c30c871f3819a14cb3bd79701f8a8db87509b1 (diff) | |
| download | scummvm-rg350-ae1f66994e1e5ac2217a601472d8945785896bd4.tar.gz scummvm-rg350-ae1f66994e1e5ac2217a601472d8945785896bd4.tar.bz2 scummvm-rg350-ae1f66994e1e5ac2217a601472d8945785896bd4.zip | |
Brought back and changed some variables from inside a #if 0 ... #endif
svn-id: r28507
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/agi/sound.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp index 24602822f7..0d2bb853cf 100644 --- a/engines/agi/sound.cpp +++ b/engines/agi/sound.cpp @@ -110,11 +110,9 @@ struct IIgsSampleHeader { IIgsInstrumentHeader instrument; }; -#if 0 -static SoundInstrument *instruments; -static int numInstruments; -static uint8 *wave; -#endif +static IIgsInstrumentHeader g_instruments[MAX_INSTRUMENTS]; +static uint g_numInstruments = 0; +static int16 g_wave[SIERRASTANDARD_SIZE]; // FIXME? Should this be allocated from the heap? (Size is 128KiB) bool readIIgsEnvelope(IIgsEnvelope &envelope, Common::SeekableReadStream &stream) { for (int segNum = 0; segNum < ENVELOPE_SEGMENT_COUNT; segNum++) { |