HUGO: Fix decryption in H2 DOS, plus some cleanup

svn-id: r52525

1 files changed, 27 insertions, 1 deletions

diff --git a/engines/hugo/hugo.cpp b/engines/hugo/hugo.cpp
index 32dd841929..58f4dc444e 100644
--- a/engines/hugo/hugo.cpp
+++ b/engines/hugo/hugo.cpp
@@ -141,7 +141,6 @@ Common::Error HugoEngine::run() {
 	initGraphics(320, 200, false);
 
 	_fileManager = new FileManager(*this);
-	_scheduler = new Scheduler(*this);
 	_screen = new Screen(*this);
 	_mouseHandler = new MouseHandler(*this);
 	_inventoryHandler = new InventoryHandler(*this);
@@ -149,6 +148,33 @@ Common::Error HugoEngine::run() {
 	_route = new Route(*this);
 	_soundHandler = new SoundHandler(*this);
 
+	switch (_gameVariant) {
+	case 0:
+		_scheduler = new Scheduler_v2(*this);
+		_introHandler = new intro_1w(*this);
+		break;
+	case 1:
+		_scheduler = new Scheduler_v2(*this);
+		_introHandler = new intro_2w(*this);
+		break;
+	case 2:
+		_scheduler = new Scheduler_v2(*this);
+		_introHandler = new intro_3w(*this);
+		break;
+	case 3:
+		_scheduler = new Scheduler_v1(*this);
+		_introHandler = new intro_1d(*this);
+		break;
+	case 4:
+		_scheduler = new Scheduler_v1(*this);
+		_introHandler = new intro_2d(*this);
+		break;
+	case 5:
+		_scheduler = new Scheduler_v2(*this);
+		_introHandler = new intro_3d(*this);
+		break;
+	}
+
 	if (!loadHugoDat())
 		return Common::kUnknownError;