diff options
| author | Strangerke | 2013-09-04 18:34:58 +0200 |
|---|---|---|
| committer | Strangerke | 2013-09-04 18:34:58 +0200 |
| commit | 08e8e92e3a0206b963dacfeecc96b75008c88c02 (patch) | |
| tree | ccdfd371fed0911692dac47e0fb856b20f06af70 /engines/avalanche/acci2.cpp | |
| parent | 97843d9e943325a29c1dc50ab681a80fac96e6d8 (diff) | |
| download | scummvm-rg350-08e8e92e3a0206b963dacfeecc96b75008c88c02.tar.gz scummvm-rg350-08e8e92e3a0206b963dacfeecc96b75008c88c02.tar.bz2 scummvm-rg350-08e8e92e3a0206b963dacfeecc96b75008c88c02.zip | |
AVALANCHE: Fix even more GCC warnings
Diffstat (limited to 'engines/avalanche/acci2.cpp')
| -rw-r--r-- | engines/avalanche/acci2.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci2.cpp index 673539745f..01c7d9a1a4 100644 --- a/engines/avalanche/acci2.cpp +++ b/engines/avalanche/acci2.cpp @@ -1372,8 +1372,8 @@ void Acci::doThat() { case kVerbCodeTalk: if (_person == kPardon) { if (_vm->_gyro->subjnumber == 99) // They typed "say password". - _vm->_scrolls->display(Common::String("Yes, but kWhat ") + _vm->_scrolls->kControlItalic + "is" + _vm->_scrolls->kControlRoman + " the password?"); - else if (((1 <= _vm->_gyro->subjnumber) && (_vm->_gyro->subjnumber <= 49)) || (_vm->_gyro->subjnumber == 253) || (_vm->_gyro->subjnumber == 449)) { + _vm->_scrolls->display(Common::String("Yes, but what ") + _vm->_scrolls->kControlItalic + "is" + _vm->_scrolls->kControlRoman + " the password?"); + else if (((1 <= _vm->_gyro->subjnumber) && (_vm->_gyro->subjnumber <= 49)) || (_vm->_gyro->subjnumber == 253) || (_vm->_gyro->subjnumber == 249)) { _thats.deleteChar(0); for (byte i = 0; i < 10; i++) @@ -1890,9 +1890,10 @@ void Acci::doThat() { for (byte i = 0; i < _thats.size(); i++) { Common::String temp = _realWords[i]; temp.toUppercase(); - for (byte i = 0; i < kVocabulary[_vm->_gyro->dna.pass_num + kFirstPassword]._word.size(); i++) - if (kVocabulary[_vm->_gyro->dna.pass_num + kFirstPassword]._word[i] != temp[i]) + for (byte j = 0; j < kVocabulary[_vm->_gyro->dna.pass_num + kFirstPassword]._word.size(); j++) { + if (kVocabulary[_vm->_gyro->dna.pass_num + kFirstPassword]._word[j] != temp[j]) ok = false; + } } if (ok) { |