Use extrapath in Sword1 engine (from 0.6.0 branch). More verbose errors to go with the forthcoming new manual. Sword1 CD swapping doesn't work as expected HERE, either :)

svn-id: r14188

1 files changed, 15 insertions, 4 deletions

diff --git a/sword1/sword1.cpp b/sword1/sword1.cpp
index da41398659..b29ad6f09b 100644
--- a/sword1/sword1.cpp
+++ b/sword1/sword1.cpp
@@ -41,6 +41,9 @@
 #include "music.h"
 #include "control.h"
 
+#include "gui/message.h"
+#include "gui/newgui.h"
+
 using namespace Sword1;
 
 /* Broken Sword 1 */
@@ -1062,8 +1065,12 @@ void SwordEngine::checkCdFiles(void) { // check if we're running from cd, hdd or
 			_systemVars.runningFromCd = false;
 			_systemVars.playSpeech = true;
 			return ;
-		} else
-			error("SPEECH2.CLU not found.\nPlease copy the SPEECH.CLU from CD2 and rename it to SPEECH2.CLU");
+		} else {
+			const char msg[] = "SPEECH2.CLU not found.\nPlease copy the SPEECH.CLU from CD2 and rename it to SPEECH2.CLU";
+                        GUI::MessageDialog dialog(msg);
+			dialog.runModal();
+			error(msg);
+		}
 	} else { // speech1.clu & speech2.clu not present. are we running from cd?
 		if (test.open("cd1.id")) {
 			_systemVars.runningFromCd = true;
@@ -1073,8 +1080,12 @@ void SwordEngine::checkCdFiles(void) { // check if we're running from cd, hdd or
 			_systemVars.runningFromCd = true;
 			_systemVars.currentCD = 2;
 			test.close();
-		} else
-			error("Unable to find files.\nPlease read the instructions again");
+		} else {
+			const char msg[] = "Unable to find the game files.\nPlease read the ScummVM documentation";
+                        GUI::MessageDialog dialog(msg);
+			dialog.runModal();
+			error(msg);
+		}
 	}
 }