aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2013-10-04 17:55:40 +0200
committerStrangerke2013-10-04 17:55:40 +0200
commit1cbe175a74099a4ca54503933b12c84352a98e82 (patch)
tree9feb38e1ff7d8d6bf2d4bbb69fdc591959c32374
parent300859aa43bf4f14afc005fdcebb392cf2a88000 (diff)
downloadscummvm-rg350-1cbe175a74099a4ca54503933b12c84352a98e82.tar.gz
scummvm-rg350-1cbe175a74099a4ca54503933b12c84352a98e82.tar.bz2
scummvm-rg350-1cbe175a74099a4ca54503933b12c84352a98e82.zip
AVALANCHE: Fix naming conventions in getItem()
-rw-r--r--engines/avalanche/avalot.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index ef33b4c563..f45341ea34 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -1567,7 +1567,7 @@ Common::String AvalancheEngine::getItem(byte which) {
"an onion"
};
- Common::String get_better_result;
+ Common::String result;
if (which > 150)
which -= 149;
@@ -1577,28 +1577,28 @@ Common::String AvalancheEngine::getItem(byte which) {
case 0:
case 1:
case 4:
- get_better_result = items[which - 1];
+ result = items[which - 1];
break;
case 3:
- get_better_result = "some vinegar";
+ result = "some vinegar";
break;
}
break;
case kObjectOnion:
if (_rottenOnion)
- get_better_result = "a rotten onion";
+ result = "a rotten onion";
else if (_onionInVinegar)
- get_better_result = "a pickled onion (in the vinegar)";
+ result = "a pickled onion (in the vinegar)";
else
- get_better_result = items[which - 1];
+ result = items[which - 1];
break;
default:
if ((which < kObjectNum) && (which > 0))
- get_better_result = items[which - 1];
+ result = items[which - 1];
else
- get_better_result = "";
+ result = "";
}
- return get_better_result;
+ return result;
}
Common::String AvalancheEngine::f5Does() {