[Scummvm-cvs-logs] scummvm master -> 2eaa78b54b535a3d1e95b2bc8c3bb6c13315e3f4

[Strangerke]

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:
2eaa78b54b CRUISE: Fix a couple of CppCheck warnings in Volume


Commit: 2eaa78b54b535a3d1e95b2bc8c3bb6c13315e3f4
    https://github.com/scummvm/scummvm/commit/2eaa78b54b535a3d1e95b2bc8c3bb6c13315e3f4
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-06-06T07:12:54+02:00

Commit Message:
CRUISE: Fix a couple of CppCheck warnings in Volume

Changed paths:
    engines/cruise/volume.cpp



diff --git a/engines/cruise/volume.cpp b/engines/cruise/volume.cpp
index 3f7a133..99d86e4 100644
--- a/engines/cruise/volume.cpp
+++ b/engines/cruise/volume.cpp
@@ -202,24 +202,25 @@ int16 findFileInList(char *fileName) {
 void askDisk(int16 discNumber) {
 	char fileName[256];
 	char string[256];
-	char messageDrawn = 0;
 
 	if (discNumber != -1) {
 		currentDiskNumber = discNumber;
 	}
-	// skip drive selection stuff
 
 	sprintf(fileName, "VOL.%d", currentDiskNumber);
-
 	sprintf(string, "INSERER LE DISQUE %d EN ", currentDiskNumber);
 
-	//while (Common::File::exists((const char*)fileName))
-	{
+#if 0 // skip drive selection stuff
+	bool messageDrawn = false;
+	while (Common::File::exists((const char*)fileName)) {
 		if (!messageDrawn) {
 			drawMsgString(string);
-			messageDrawn = 1;
+			messageDrawn = true;
 		}
 	}
+#else
+	drawMsgString(string);
+#endif
 
 	changeCursor(currentCursor);
 }