[Scummvm-cvs-logs] SF.net SVN: scummvm:[45228] scummvm/trunk/engines/gob/videoplayer.cpp

[strangerke at users.sourceforge.net]

Revision: 45228
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45228&view=rev
Author:   strangerke
Date:     2009-10-18 17:28:02 +0000 (Sun, 18 Oct 2009)

Log Message:
-----------
gob - Cleanup of previous modification

Modified Paths:
--------------
    scummvm/trunk/engines/gob/videoplayer.cpp

Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp	2009-10-18 17:28:00 UTC (rev 45227)
+++ scummvm/trunk/engines/gob/videoplayer.cpp	2009-10-18 17:28:02 UTC (rev 45228)
@@ -167,15 +167,11 @@
 
 bool VideoPlayer::findFile(char *fileName, Type &which) {
 	char *extStart = strrchr(fileName, '.');
-	// There's no empty extension
-	if (extStart == (fileName + strlen(fileName) - 1)) {
+	// There's no empty extension, Or the filename with its current extension is not found
+	if ((extStart == (fileName + strlen(fileName) - 1)) || (!_vm->_dataIO->existData(fileName))) {
 		*extStart = 0;
 		extStart = 0;
-	} else
-		if (!_vm->_dataIO->existData(fileName)) {
-			*extStart = 0;
-			extStart = 0;
-		}
+	}
 
 	if (extStart) {
 		// The requested file already has an extension. Verifying.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.