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

1 files changed, 0 insertions, 5 deletions

diff --git a/sword2/build_display.cpp b/sword2/build_display.cpp
index 34951bca3d..32be4bdb81 100644
--- a/sword2/build_display.cpp
+++ b/sword2/build_display.cpp
@@ -257,11 +257,6 @@ void Sword2Engine::displayMsg(uint8 *text, int time) {
 
 	uint32 targetTime = _system->get_msecs() + (time * 1000);
 
-	// Keep the message there even when the user task swaps.
-	rv = g_graphics->drawSprite(&spriteInfo);
-	if (rv)
-		error("Driver Error %.8x (in DisplayMsg)", rv);
-
 	sleepUntil(targetTime);
 
 	g_graphics->setPalette(0, 256, (uint8 *) oldPal, RDPAL_FADE);