diff options
| author | Strangerke | 2013-09-05 01:55:08 +0200 |
|---|---|---|
| committer | Strangerke | 2013-09-05 01:55:08 +0200 |
| commit | e5cc0fa49510880def04c30ce1f982c1c281b974 (patch) | |
| tree | c6f9043e5c5b74fe703a7954acc6d911a6c5b94f /engines | |
| parent | 71af29e9794eb9bc4d597068a44e19e06d0bb28e (diff) | |
| download | scummvm-rg350-e5cc0fa49510880def04c30ce1f982c1c281b974.tar.gz scummvm-rg350-e5cc0fa49510880def04c30ce1f982c1c281b974.tar.bz2 scummvm-rg350-e5cc0fa49510880def04c30ce1f982c1c281b974.zip | |
AVALANCHE: Fix more warnings reported by CppCheck
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/avalanche/dropdown2.cpp | 6 | ||||
| -rw-r--r-- | engines/avalanche/scrolls2.cpp | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/engines/avalanche/dropdown2.cpp b/engines/avalanche/dropdown2.cpp index 54727e7b8c..5fba99257a 100644 --- a/engines/avalanche/dropdown2.cpp +++ b/engines/avalanche/dropdown2.cpp @@ -494,15 +494,15 @@ void Dropdown::setupMenuObjects() { } void Dropdown::setupMenuWith() { - Common::String verb; - char vbchar; - _activeMenuItem.reset(); if (_vm->_gyro->thinkthing) { findWhatYouCanDoWithIt(); for (byte i = 0; i < _vm->_gyro->verbstr.size(); i++) { + char vbchar; + Common::String verb; + _vm->_acci->verbOpt(_vm->_gyro->verbstr[i], verb, vbchar); _activeMenuItem.setupOption(verb, vbchar, "", true); } diff --git a/engines/avalanche/scrolls2.cpp b/engines/avalanche/scrolls2.cpp index 4159a88ba6..3ad8f50cfb 100644 --- a/engines/avalanche/scrolls2.cpp +++ b/engines/avalanche/scrolls2.cpp @@ -223,21 +223,25 @@ void Scrolls::music_scroll() { // Since there are no sounds in the game yet, it's pretty pointless to implement this function further. // For now we act like the player just played the right tone. - //if (they_match(played)) { +#if 0 + if (they_match(played)) { +#endif _vm->_gyro->screturn = true; _vm->_gyro->off(); state(0); _vm->_gyro->seescroll = false; _vm->_timeout->set_up_timer(8, _vm->_timeout->procjacques_wakes_up, _vm->_timeout->reason_jacques_waking_up); + warning("STUB: Scrolls::music_scroll()"); return; - //} - warning("STUB: Scrolls::music_scroll()"); - +#if 0 + } + _vm->_gyro->screturn = false; _vm->_gyro->off(); state(0); _vm->_gyro->seescroll = false; +#endif } /* ThatsAll, so put us back to */ /*$F-*/ |