[Scummvm-cvs-logs] CVS: scummvm/sword2/driver driver96.h,1.60,1.61 misc.cpp,1.15,NONE

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv18697/driver

Modified Files:
	driver96.h 
Removed Files:
	misc.cpp 
Log Message:
Re-enabled the CD swapping code, after rewriting it a bit.

If a cluster file isn't found the resource manager will first check if it's
one of the files that it expects to find on the hard disk. If so, it's
considered a fatal error.

Otherwise it will present the user with an "Insert CD1" or "Insert CD2"
message, just like the original did. Unlike the original, the user will
have to press a button or click the mouse to indicate when he's done. I
don't know if we even can detect the CD automatically in any portable way.

As far as I can see, we'll need at least two separate path settings for
this to actually work: one for the HD install directory, and one or two for
the CDs. The file that are supposed to be found on the HD are only on one
of the CDs, so the amount of CD swapping would probably be unbearable
otherwise.

As a consequence, I haven't actually tried running the game from CD yet.

By the way, the old caching code has been removed completely now. All it
did was to copy the cluster file to HD for faster access. ScummVM never did
that, but so far no one has complained.


Index: driver96.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/driver96.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- driver96.h	12 Nov 2003 08:20:27 -0000	1.60
+++ driver96.h	13 Nov 2003 07:59:52 -0000	1.61
@@ -32,15 +32,6 @@
 //	-------
 //
 
-#ifndef WIN32
-
-// FIXME: Get rid of these
-
-#define FILE_ATTRIBUTE_NORMAL 0x80
-#define _MAX_PATH 260
-
-#endif
-
 enum {
 	// Generic error codes
 
@@ -284,13 +275,6 @@
 extern int32 GetLanguageVersion(uint8 *version);
 extern int32 SetLanguageVersion(uint8 version);
 //-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-//	Misc functions - from misc.cpp
-//-----------------------------------------------------------------------------
-extern void SVM_SetFileAttributes(char *file, uint32 atrib);
-extern void SVM_DeleteFile(char *file);
-extern int32 SVM_GetVolumeInformation(char *cdPath, char *sCDName, uint32 maxPath, uint8 *, uint32 *dwMaxCompLength, uint32 *dwFSFlags, uint8 *, uint32 a);
 
 #define MAX_MOUSE_EVENTS 16
 

--- misc.cpp DELETED ---