diff options
| author | Martin Kiewitz | 2010-06-22 15:45:59 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-06-22 15:45:59 +0000 |
| commit | 3c4bfa6caccb8beeb5c603865879da7f6b31c556 (patch) | |
| tree | 44c0ab87c2209041211633e4d11961fd07e3cf54 /engines/sci | |
| parent | 66c286d096503bf54cce16a1920fa96b9a46228e (diff) | |
| download | scummvm-rg350-3c4bfa6caccb8beeb5c603865879da7f6b31c556.tar.gz scummvm-rg350-3c4bfa6caccb8beeb5c603865879da7f6b31c556.tar.bz2 scummvm-rg350-3c4bfa6caccb8beeb5c603865879da7f6b31c556.zip | |
SCI: removing unneeded capacity uint from r50143
svn-id: r50147
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/sound/music.cpp | 8 | ||||
| -rw-r--r-- | engines/sci/sound/music.h | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp index 8ee43fea64..0d1f0f4db9 100644 --- a/engines/sci/sound/music.cpp +++ b/engines/sci/sound/music.cpp @@ -47,8 +47,7 @@ SciMusic::SciMusic(SciVersion soundVersion) for (int i = 0; i < 16; i++) _usedChannel[i] = 0; - _queuedCommandCapacity = 1000; - _queuedCommands.reserve(_queuedCommandCapacity); + _queuedCommands.reserve(1000); } SciMusic::~SciMusic() { @@ -126,11 +125,6 @@ void SciMusic::putMidiCommandInQueue(byte status, byte firstOp, byte secondOp) { } void SciMusic::putMidiCommandInQueue(uint32 midi) { - if (_queuedCommands.size() == _queuedCommandCapacity) { - // We need more space - _queuedCommandCapacity *= 2; - _queuedCommands.reserve(_queuedCommandCapacity); - } _queuedCommands.push_back(midi); } diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h index 0a6662a7ce..a29b6edee2 100644 --- a/engines/sci/sound/music.h +++ b/engines/sci/sound/music.h @@ -225,7 +225,6 @@ private: byte _masterVolume; MusicEntry *_usedChannel[16]; - uint _queuedCommandCapacity; MidiCommandQueue _queuedCommands; int _driverFirstChannel; |