[Scummvm-cvs-logs] SF.net SVN: scummvm:[47778] scummvm/trunk/engines/sci/engine/kfile.cpp

waltervn at users.sourceforge.net waltervn at users.sourceforge.net
Sun Jan 31 22:11:36 CET 2010


Revision: 47778
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47778&view=rev
Author:   waltervn
Date:     2010-01-31 21:11:36 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
SCI: Fix regression in KQ5CD caused by r47775.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kfile.cpp

Modified: scummvm/trunk/engines/sci/engine/kfile.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kfile.cpp	2010-01-31 19:52:05 UTC (rev 47777)
+++ scummvm/trunk/engines/sci/engine/kfile.cpp	2010-01-31 21:11:36 UTC (rev 47778)
@@ -346,7 +346,7 @@
 	K_DEVICE_INFO_GET_CURRENT_DEVICE = 1,
 	K_DEVICE_INFO_PATHS_EQUAL = 2,
 	K_DEVICE_INFO_IS_FLOPPY = 3,
-	K_DEVICE_INFO_GET_CONFIG_DISK = 5,
+	K_DEVICE_INFO_GET_CONFIG_PATH = 5,
 	K_DEVICE_INFO_GET_SAVECAT_NAME = 7,
 	K_DEVICE_INFO_GET_SAVEFILE_NAME = 8
 };
@@ -381,9 +381,10 @@
 		debug(3, "K_DEVICE_INFO_IS_FLOPPY(%s)", input_str.c_str());
 		return NULL_REG; /* Never */
 	}
-	case K_DEVICE_INFO_GET_CONFIG_DISK: {
-		// Return drive that resource.cfg was loaded from
-		return make_reg(0, 'C');
+	case K_DEVICE_INFO_GET_CONFIG_PATH: {
+		// Early versions return drive letter, later versions a path string
+		// FIXME: Implement if needed, for now return NULL_REG
+		return NULL_REG;
 	}
 	/* SCI uses these in a less-than-portable way to delete savegames.
 	** Read http://www-plan.cs.colorado.edu/creichen/freesci-logs/2005.10/log20051019.html


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