aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2014-02-10 07:56:35 +0100
committerStrangerke2014-02-10 07:56:35 +0100
commit9608a521625122e1499d5fae60d3c7ecd0456f90 (patch)
tree7d670415187a97ff058759c30eed29b5a75f81d4
parent26f5475136143a5ea88b767d4f5206e4931b1e73 (diff)
downloadscummvm-rg350-9608a521625122e1499d5fae60d3c7ecd0456f90.tar.gz
scummvm-rg350-9608a521625122e1499d5fae60d3c7ecd0456f90.tar.bz2
scummvm-rg350-9608a521625122e1499d5fae60d3c7ecd0456f90.zip
VOYEUR: Reduce the scope of a couple of variables
-rw-r--r--engines/voyeur/files_threads.cpp3
-rw-r--r--engines/voyeur/voyeur.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp
index 7635a9dea2..ab639021a4 100644
--- a/engines/voyeur/files_threads.cpp
+++ b/engines/voyeur/files_threads.cpp
@@ -718,7 +718,6 @@ const byte *ThreadResource::cardPerform(const byte *card) {
uint16 id = *card++;
int varD = 5;
uint32 v2;
- int v3;
byte bVal;
uint32 idx1, idx2;
debugC(DEBUG_BASIC, kDebugScripts, "cardPerform - %d", id);
@@ -765,7 +764,7 @@ const byte *ThreadResource::cardPerform(const byte *card) {
}
case 7: {
- v3 = *card++;
+ int v3 = *card++;
v2 = READ_LE_UINT32(card);
card += 4;
int &v = _vm->_controlPtr->_state->_vals[v3];
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index 6ef47051df..5b93b460ea 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -223,7 +223,6 @@ void VoyeurEngine::showConversionScreen() {
bool VoyeurEngine::doLock() {
bool result = true;
- bool flag = false;
int buttonVocSize, wrongVocSize;
byte *buttonVoc = _filesManager.fload("button.voc", &buttonVocSize);
byte *wrongVoc = _filesManager.fload("wrong.voc", &wrongVocSize);
@@ -273,6 +272,7 @@ bool VoyeurEngine::doLock() {
bool firstLoop = true;
bool breakFlag = false;
+ bool flag = false;
while (!breakFlag && !shouldQuit()) {
(*_graphicsManager._vPort)->setupViewPort();
flipPageAndWait();