[Scummvm-cvs-logs] SF.net SVN: scummvm:[34855] scummvm/trunk/engines/saga/saga.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sun Oct 26 19:40:59 CET 2008


Revision: 34855
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34855&view=rev
Author:   thebluegr
Date:     2008-10-26 18:40:59 +0000 (Sun, 26 Oct 2008)

Log Message:
-----------
Using getChild() with getChild() throws an assertion (a regression of the latest FS node changes). Commenting out this line with a FIXME so that SAGA games can work once again under Windows

Modified Paths:
--------------
    scummvm/trunk/engines/saga/saga.cpp

Modified: scummvm/trunk/engines/saga/saga.cpp
===================================================================
--- scummvm/trunk/engines/saga/saga.cpp	2008-10-26 16:42:08 UTC (rev 34854)
+++ scummvm/trunk/engines/saga/saga.cpp	2008-10-26 18:40:59 UTC (rev 34855)
@@ -102,7 +102,10 @@
 
 	// The Multi-OS version puts the voices file in the root directory of
 	// the CD. The rest of the data files are in game/itedata
-	Common::File::addDefaultDirectory(_gameDataDir.getChild("game").getChild("itedata"));
+	// FIXME: This stops games from working under Windows. An assert is thrown when
+	// starting the games (_realNode is null in FSNode::getPath() in common/fs.cpp line 113)
+	// Commenting it out for now
+	//Common::File::addDefaultDirectory(_gameDataDir.getChild("game").getChild("itedata"));
 
 	// Mac CD Wyrmkeep
 	Common::File::addDefaultDirectory(_gameDataDir.getChild("patch"));


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