[Scummvm-cvs-logs] SF.net SVN: scummvm:[45229] scummvm/branches/branch-1-0-0/engines/gob/ videoplayer.cpp

strangerke at users.sourceforge.net strangerke at users.sourceforge.net
Sun Oct 18 20:09:23 CEST 2009


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

Log Message:
-----------
backport of r45226 and r45228: gob - "Windows" Gob3 has errors in scripts, calling .IMD videos instead of .VMD ones. This modification fixes that.

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/gob/videoplayer.cpp

Modified: scummvm/branches/branch-1-0-0/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/gob/videoplayer.cpp	2009-10-18 17:28:02 UTC (rev 45228)
+++ scummvm/branches/branch-1-0-0/engines/gob/videoplayer.cpp	2009-10-18 18:09:23 UTC (rev 45229)
@@ -167,8 +167,8 @@
 
 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;
 	}


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




More information about the Scummvm-git-logs mailing list