- Added Inter_Woodruff, alongside with the first Stub (OpcodeFunc 0x18)

- Yet another safety check
- Removed another hard-coded screen height

svn-id: r28205

1 files changed, 22 insertions, 22 deletions

diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index 18cbb9f551..8c3bb76413 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -261,60 +261,60 @@ bool GobEngine::initGameParts() {
 			_saveLoad = new SaveLoad_v2(this, _targetName.c_str());
 			break;
 
-		case kGameTypeGob3:
-			_init = new Init_v3(this);
+		case kGameTypeBargon:
+			_init = new Init_v2(this);
 			_video = new Video_v2(this);
-			_inter = new Inter_v3(this);
+			_inter = new Inter_Bargon(this);
 			_parse = new Parse_v2(this);
 			_mult = new Mult_v2(this);
-			_draw = new Draw_v2(this);
+			_draw = new Draw_Bargon(this);
 			_game = new Game_v2(this);
 			_map = new Map_v2(this);
-			_goblin = new Goblin_v3(this);
+			_goblin = new Goblin_v2(this);
 			_scenery = new Scenery_v2(this);
-			_saveLoad = new SaveLoad_v3(this, _targetName.c_str());
+			_saveLoad = new SaveLoad_v2(this, _targetName.c_str());
 			break;
 
-		case kGameTypeWoodruff:
-			_init = new Init_v3(this);
+		case kGameTypeWeen:
+			_init = new Init_v2(this);
 			_video = new Video_v2(this);
-			_inter = new Inter_v3(this);
+			_inter = new Inter_v2(this);
 			_parse = new Parse_v2(this);
 			_mult = new Mult_v2(this);
 			_draw = new Draw_v2(this);
 			_game = new Game_v2(this);
 			_map = new Map_v2(this);
-			_goblin = new Goblin_v3(this);
+			_goblin = new Goblin_v2(this);
 			_scenery = new Scenery_v2(this);
-			_saveLoad = new SaveLoad_v3(this, _targetName.c_str());
+			_saveLoad = new SaveLoad_v2(this, _targetName.c_str());
 			break;
 
-		case kGameTypeBargon:
-			_init = new Init_v2(this);
+		case kGameTypeGob3:
+			_init = new Init_v3(this);
 			_video = new Video_v2(this);
-			_inter = new Inter_Bargon(this);
+			_inter = new Inter_v3(this);
 			_parse = new Parse_v2(this);
 			_mult = new Mult_v2(this);
-			_draw = new Draw_Bargon(this);
+			_draw = new Draw_v2(this);
 			_game = new Game_v2(this);
 			_map = new Map_v2(this);
-			_goblin = new Goblin_v2(this);
+			_goblin = new Goblin_v3(this);
 			_scenery = new Scenery_v2(this);
-			_saveLoad = new SaveLoad_v2(this, _targetName.c_str());
+			_saveLoad = new SaveLoad_v3(this, _targetName.c_str());
 			break;
 
-		case kGameTypeWeen:
-			_init = new Init_v2(this);
+		case kGameTypeWoodruff:
+			_init = new Init_v3(this);
 			_video = new Video_v2(this);
-			_inter = new Inter_v2(this);
+			_inter = new Inter_Woodruff(this);
 			_parse = new Parse_v2(this);
 			_mult = new Mult_v2(this);
 			_draw = new Draw_v2(this);
 			_game = new Game_v2(this);
 			_map = new Map_v2(this);
-			_goblin = new Goblin_v2(this);
+			_goblin = new Goblin_v3(this);
 			_scenery = new Scenery_v2(this);
-			_saveLoad = new SaveLoad_v2(this, _targetName.c_str());
+			_saveLoad = new SaveLoad_v3(this, _targetName.c_str());
 			break;
 
 		default: