[Scummvm-cvs-logs] scummvm master -> 4e68a6761363ba62c8e7d20995727cdc4a93831f
Strangerke
Strangerke at scummvm.org
Tue Mar 4 08:28:21 CET 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
4e68a67613 VOYEUR: Fix the new password behavior (still not saved, just as in the original)
Commit: 4e68a6761363ba62c8e7d20995727cdc4a93831f
https://github.com/scummvm/scummvm/commit/4e68a6761363ba62c8e7d20995727cdc4a93831f
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-03T23:26:37-08:00
Commit Message:
VOYEUR: Fix the new password behavior (still not saved, just as in the original)
Changed paths:
engines/voyeur/voyeur.cpp
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index 24752a1..6af57c6 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -278,7 +278,6 @@ bool VoyeurEngine::doLock() {
bool firstLoop = true;
bool breakFlag = false;
- bool flag = false;
while (!breakFlag && !shouldQuit()) {
(*_graphicsManager->_vPort)->setupViewPort();
flipPageAndWait();
@@ -340,24 +339,16 @@ bool VoyeurEngine::doLock() {
}
} else if (key == 10) {
// Accept key
- if (!flag) {
- if ((password.empty() && displayString.empty()) || (password == displayString)) {
- breakFlag = true;
- result = true;
- break;
- }
- } else {
- if (displayString.size() > 0) {
- result = true;
- breakFlag = true;
- break;
- }
+ if ((password.empty() && displayString.empty()) || (password == displayString)) {
+ breakFlag = true;
+ result = true;
+ break;
}
} else if (key == 11) {
// New code
if ((password.empty() && displayString.empty()) || (password != displayString)) {
(*_graphicsManager->_vPort)->setupViewPort();
- flag = true;
+ password = displayString;
displayString = "";
continue;
}
More information about the Scummvm-git-logs
mailing list