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

[drmccoy at users.sourceforge.net]

Revision: 55647
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55647&view=rev
Author:   drmccoy
Date:     2011-01-30 00:03:35 +0000 (Sun, 30 Jan 2011)

Log Message:
-----------
GOB: Add a sanity check to the copyFile stub

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

Modified: scummvm/trunk/engines/gob/inter_playtoons.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_playtoons.cpp	2011-01-30 00:03:12 UTC (rev 55646)
+++ scummvm/trunk/engines/gob/inter_playtoons.cpp	2011-01-30 00:03:35 UTC (rev 55647)
@@ -366,9 +366,17 @@
 }
 
 void Inter_Playtoons::oPlaytoons_copyFile() {
-	Common::String file1 = _vm->_game->_script->evalString();
-	Common::String file2 = _vm->_game->_script->evalString();
+	Common::String path1 = _vm->_game->_script->evalString();
+	Common::String path2 = _vm->_game->_script->evalString();
 
+	Common::String file1 = getFile(path1.c_str());
+	Common::String file2 = getFile(path2.c_str());
+
+	if (file1.equalsIgnoreCase(file2)) {
+		warning("oPlaytoons_copyFile(): \"%s\" == \"%s\"", path1.c_str(), path2.c_str());
+		return;
+	}
+
 	warning("Playtoons Stub: copy file from \"%s\" to \"%s\"", file1.c_str(), file2.c_str());
 }
 


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