aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/tattoo/tattoo_user_interface.cpp
diff options
context:
space:
mode:
authorStrangerke2015-09-14 00:23:07 +0200
committerStrangerke2015-09-14 00:23:07 +0200
commitdab5cd387dd10e7c75987bac97e974216806bba3 (patch)
tree9c9b18fb12a9700c1aaa9e883932ab9de1d03ff6 /engines/sherlock/tattoo/tattoo_user_interface.cpp
parent4ee421f29d1f6bdd2df2e1c7bea012aed5125a25 (diff)
downloadscummvm-rg350-dab5cd387dd10e7c75987bac97e974216806bba3.tar.gz
scummvm-rg350-dab5cd387dd10e7c75987bac97e974216806bba3.tar.bz2
scummvm-rg350-dab5cd387dd10e7c75987bac97e974216806bba3.zip
SHERLOCK: Reduce the scope of several variables.
Diffstat (limited to 'engines/sherlock/tattoo/tattoo_user_interface.cpp')
-rw-r--r--engines/sherlock/tattoo/tattoo_user_interface.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index 6ed0bf66db..da4a277ba3 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -85,7 +85,6 @@ void TattooUserInterface::lookAtObject() {
Talk &talk = *_vm->_talk;
Common::Point mousePos = events.mousePos();
Common::String desc;
- int cAnimSpeed = 0;
_lookPos = mousePos;
_menuMode = LOOK_MODE;
@@ -95,7 +94,7 @@ void TattooUserInterface::lookAtObject() {
} else {
// Check if there is a Look animation
if (_bgShape->_lookcAnim != 0) {
- cAnimSpeed = _bgShape->_lookcAnim & 0xe0;
+ int cAnimSpeed = _bgShape->_lookcAnim & 0xe0;
cAnimSpeed >>= 5;
++cAnimSpeed;
@@ -377,7 +376,6 @@ void TattooUserInterface::doStandardControl() {
TattooScene &scene = *(TattooScene *)_vm->_scene;
Talk &talk = *_vm->_talk;
Common::Point mousePos = events.mousePos();
- bool noDesc = false;
// Don't do any input processing whilst the prolog is running
if (vm._runningProlog)
@@ -458,6 +456,7 @@ void TattooUserInterface::doStandardControl() {
if (_arrowZone == -1 || events._rightReleased)
freeMenu();
+ bool noDesc = false;
if (_personFound) {
if (people[_bgFound - 1000]._description.empty() || people[_bgFound - 1000]._description.hasPrefix(" "))
noDesc = true;