[Scummvm-cvs-logs] scummvm master -> db2e0fb0423b575151fde09256c9ccb10ee824e5

[lordhoto]

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:
db2e0fb042 KYRA: Slight cleanup in the transfer party code.


Commit: db2e0fb0423b575151fde09256c9ccb10ee824e5
    https://github.com/scummvm/scummvm/commit/db2e0fb0423b575151fde09256c9ccb10ee824e5
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-12-27T16:51:09-08:00

Commit Message:
KYRA: Slight cleanup in the transfer party code.

Changed paths:
    engines/kyra/chargen.cpp



diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 50153d7..1093bec 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -1529,14 +1529,13 @@ bool TransferPartyWiz::start() {
 }
 
 bool TransferPartyWiz::selectAndLoadTransferFile() {
-	for (int numLoops = 1; numLoops; numLoops--) {
+	do {
 		_screen->copyPage(12, 0);
 		_vm->_savegameFilename = transferFileDialogue();
-		if (_vm->_savegameFilename.empty()) {
-			if (_vm->_gui->confirmDialogue2(15, 68, 1))
-				numLoops++;
-		}
-	}
+	} while (_vm->_savegameFilename.empty() && _vm->_gui->confirmDialogue2(15, 68, 1));
+
+	if (_vm->_savegameFilename.empty())
+		return false;
 
 	if (_vm->_savegameFilename.equals(_vm->_saveLoadStrings[1]))
 		return false;
@@ -1586,7 +1585,7 @@ Common::String TransferPartyWiz::transferFileDialogue() {
 			targets.push_back(*i);
 	}
 
-	if (targets.begin() == targets.end())
+	if (targets.empty())
 		return tfile;
 
 	Common::String target = _vm->_gui->transferTargetMenu(targets);