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.

svn-id: r11273

2 files changed, 0 insertions, 56 deletions

diff --git a/sword2/driver/driver96.h b/sword2/driver/driver96.h
index 47253ac03a..89f9725532 100644
--- a/sword2/driver/driver96.h
+++ b/sword2/driver/driver96.h
@@ -32,15 +32,6 @@ namespace Sword2 {
 //	-------
 //
 
-#ifndef WIN32
-
-// FIXME: Get rid of these
-
-#define FILE_ATTRIBUTE_NORMAL 0x80
-#define _MAX_PATH 260
-
-#endif
-
 enum {
 	// Generic error codes
 
@@ -285,13 +276,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
 
 // Key buffer size
diff --git a/sword2/driver/misc.cpp b/sword2/driver/misc.cpp
deleted file mode 100644
index 5ccf5ca09a..0000000000
--- a/sword2/driver/misc.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright (C) 2003 The ScummVM project
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * $Header$
- */
-
-#include "stdafx.h"
-#include "sword2/driver/driver96.h"
-#include "sword2/sword2.h"
-
-namespace Sword2 {
-
-void SVM_SetFileAttributes(char *file, uint32 atrib) {
-	warning("stub SetFileAttributes");
-}
-
-void SVM_DeleteFile(char *file) {
-	warning("stub DeleteFile");
-}
-
-int32 SVM_GetVolumeInformation(char *cdPath, char *sCDName, uint32 maxPath, uint8 *, uint32 *dwMaxCompLength, uint32 *dwFSFlags, uint8 *, uint32 a) {
-	warning("stub GetVolumeInformation %s", cdPath);
-	strcpy(sCDName, CD1_LABEL);
-	return 1;
-}
-
-} // End of namespace Sword2