diff options
author | Torbjörn Andersson | 2010-01-21 23:05:33 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2010-01-21 23:05:33 +0000 |
commit | 1928a7ba38bed50b2342fa0946538b6dc5330755 (patch) | |
tree | f00a042f11e56e422b47f7555fb29bd75c04ccfa /engines/agi | |
parent | 8257b1106cf8c037c56ee855edc3d8dd32d12dd8 (diff) | |
download | scummvm-rg350-1928a7ba38bed50b2342fa0946538b6dc5330755.tar.gz scummvm-rg350-1928a7ba38bed50b2342fa0946538b6dc5330755.tar.bz2 scummvm-rg350-1928a7ba38bed50b2342fa0946538b6dc5330755.zip |
Silenced some cppcheck warnings.
svn-id: r47427
Diffstat (limited to 'engines/agi')
-rw-r--r-- | engines/agi/console.cpp | 2 | ||||
-rw-r--r-- | engines/agi/sound.cpp | 18 | ||||
-rw-r--r-- | engines/agi/wagparser.cpp | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/engines/agi/console.cpp b/engines/agi/console.cpp index e093445087..a0621f80dd 100644 --- a/engines/agi/console.cpp +++ b/engines/agi/console.cpp @@ -257,7 +257,7 @@ bool Console::Cmd_BT(int argc, const char **argv) { int num; Common::Array<ScriptPos>::iterator it; - for (it = _vm->_game.execStack.begin(); it != _vm->_game.execStack.end(); it++) { + for (it = _vm->_game.execStack.begin(); it != _vm->_game.execStack.end(); ++it) { code = _vm->_game.logics[it->script].data; op = code[it->curIP]; num = logicNamesCmd[op].numArgs; diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp index 53777d4dd2..35360eebc4 100644 --- a/engines/agi/sound.cpp +++ b/engines/agi/sound.cpp @@ -428,7 +428,7 @@ void SoundMgr::stopSound() { void IIgsSoundMgr::stopSounds() { // Stops all sounds on all MIDI channels - for (iterator iter = _midiChannels.begin(); iter != _midiChannels.end(); iter++) + for (iterator iter = _midiChannels.begin(); iter != _midiChannels.end(); ++iter) iter->stopSounds(); } @@ -445,7 +445,7 @@ bool IIgsSoundMgr::playSampleSound(const IIgsSampleHeader &sampleHeader, const i void IIgsMidiChannel::stopSounds() { // Stops all sounds on this single MIDI channel - for (iterator iter = _gsChannels.begin(); iter != _gsChannels.end(); iter++) + for (iterator iter = _gsChannels.begin(); iter != _gsChannels.end(); ++iter) iter->stop(); _gsChannels.clear(); @@ -690,7 +690,7 @@ void IIgsSoundMgr::setProgramChangeMapping(const MidiProgramChangeMapping *mappi } void IIgsSoundMgr::removeStoppedSounds() { - for (Common::Array<IIgsMidiChannel>::iterator iter = _midiChannels.begin(); iter != _midiChannels.end(); iter++) + for (Common::Array<IIgsMidiChannel>::iterator iter = _midiChannels.begin(); iter != _midiChannels.end(); ++iter) iter->removeStoppedSounds(); } @@ -703,7 +703,7 @@ void IIgsMidiChannel::removeStoppedSounds() { uint IIgsSoundMgr::activeSounds() const { uint result = 0; - for (Common::Array<IIgsMidiChannel>::const_iterator iter = _midiChannels.begin(); iter != _midiChannels.end(); iter++) + for (Common::Array<IIgsMidiChannel>::const_iterator iter = _midiChannels.begin(); iter != _midiChannels.end(); ++iter) result += iter->activeSounds(); return result; @@ -712,7 +712,7 @@ uint IIgsSoundMgr::activeSounds() const { uint IIgsMidiChannel::activeSounds() const { uint result = 0; - for (const_iterator iter = _gsChannels.begin(); iter != _gsChannels.end(); iter++) + for (const_iterator iter = _gsChannels.begin(); iter != _gsChannels.end(); ++iter) if (!iter->end) result++; @@ -724,7 +724,7 @@ void IIgsMidiChannel::setInstrument(const IIgsInstrumentHeader *instrument, cons _sample = sample; // Set program on each Apple IIGS channel playing on this MIDI channel - for (iterator iter = _gsChannels.begin(); iter != _gsChannels.end(); iter++) + for (iterator iter = _gsChannels.begin(); iter != _gsChannels.end(); ++iter) iter->setInstrument(instrument, sample); } @@ -732,14 +732,14 @@ void IIgsMidiChannel::setVolume(uint8 volume) { _volume = volume; // Set volume on each Apple IIGS channel playing on this MIDI channel - for (iterator iter = _gsChannels.begin(); iter != _gsChannels.end(); iter++) + for (iterator iter = _gsChannels.begin(); iter != _gsChannels.end(); ++iter) iter->setChannelVolume(volume); } void IIgsMidiChannel::noteOff(uint8 note, uint8 velocity) { // Go through all the notes playing on this MIDI channel // and turn off the ones that are playing the given note - for (iterator iter = _gsChannels.begin(); iter != _gsChannels.end(); iter++) + for (iterator iter = _gsChannels.begin(); iter != _gsChannels.end(); ++iter) if (iter->origNote == note) iter->noteOff(velocity); } @@ -1195,7 +1195,7 @@ struct fsnodeNameEqualsIgnoreCase : public Common::UnaryFunction<const Common::F fsnodeNameEqualsIgnoreCase(const Common::StringList &str) : _str(str) {} fsnodeNameEqualsIgnoreCase(const Common::String str) { _str.push_back(str); } bool operator()(const Common::FSNode ¶m) const { - for (Common::StringList::const_iterator iter = _str.begin(); iter != _str.end(); iter++) + for (Common::StringList::const_iterator iter = _str.begin(); iter != _str.end(); ++iter) if (param.getName().equalsIgnoreCase(*iter)) return true; return false; diff --git a/engines/agi/wagparser.cpp b/engines/agi/wagparser.cpp index d243439dff..1d60524070 100644 --- a/engines/agi/wagparser.cpp +++ b/engines/agi/wagparser.cpp @@ -213,7 +213,7 @@ bool WagFileParser::parse(const Common::FSNode &node) { } const WagProperty *WagFileParser::getProperty(const WagProperty::WagPropertyCode code) const { - for (PropertyList::const_iterator iter = _propList.begin(); iter != _propList.end(); iter++) + for (PropertyList::const_iterator iter = _propList.begin(); iter != _propList.end(); ++iter) if (iter->getCode() == code) return iter; return NULL; } |