diff options
| author | Walter van Niftrik | 2016-05-31 19:50:54 +0200 |
|---|---|---|
| committer | Walter van Niftrik | 2016-06-06 20:35:49 +0200 |
| commit | 9967ae8c521716083f9edd1228a65f5d2eaee65d (patch) | |
| tree | 1922ad3065a8d51afe5345abf7c0ba4ba4501707 /engines | |
| parent | 0c2d2b2c925e1a6ec639f6d59fe086b03cb440c2 (diff) | |
| download | scummvm-rg350-9967ae8c521716083f9edd1228a65f5d2eaee65d.tar.gz scummvm-rg350-9967ae8c521716083f9edd1228a65f5d2eaee65d.tar.bz2 scummvm-rg350-9967ae8c521716083f9edd1228a65f5d2eaee65d.zip | |
ADL: Fix more GCC 4.9 shadow warnings
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/adl/adl.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp index de1f8aa526..b6af54962e 100644 --- a/engines/adl/adl.cpp +++ b/engines/adl/adl.cpp @@ -880,23 +880,23 @@ void AdlEngine::getInput(uint &verb, uint &noun) { return; uint index = 0; - Common::String verbStr = getWord(line, index); + Common::String verbString = getWord(line, index); - if (!_verbs.contains(verbStr)) { - _display->printString(formatVerbError(verbStr)); + if (!_verbs.contains(verbString)) { + _display->printString(formatVerbError(verbString)); continue; } - verb = _verbs[verbStr]; + verb = _verbs[verbString]; - Common::String nounStr = getWord(line, index); + Common::String nounString = getWord(line, index); - if (!_nouns.contains(nounStr)) { - _display->printString(formatNounError(verbStr, nounStr)); + if (!_nouns.contains(nounString)) { + _display->printString(formatNounError(verbString, nounString)); continue; } - noun = _nouns[nounStr]; + noun = _nouns[nounString]; return; } } |