From e86c71ae20f7aa1f0f7b11c11779e3419acb0d99 Mon Sep 17 00:00:00 2001
From: Scott Percival
Date: Wed, 18 Dec 2019 00:01:56 +0800
Subject: DIRECTOR: Remove target for a test archive

This reverts commit 127c3468167e6e60866920751c35580c984abbbb.
---
 engines/director/detection.cpp      |  1 -
 engines/director/detection_tables.h | 13 -------------
 engines/director/director.h         |  3 +--
 engines/director/resource.cpp       |  4 +---
 4 files changed, 2 insertions(+), 19 deletions(-)

(limited to 'engines')

diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index 354c34c402..9e71e7dca4 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -73,7 +73,6 @@ bool DirectorEngine::hasFeature(EngineFeature f) const {
 static const PlainGameDescriptor directorGames[] = {
 	{ "director",	"Macromedia Director Game" },
 	{ "directortest",	"Macromedia Director Test Target" },
-	{ "directortestarch",	"Macromedia Director Test Archive" },
 	{ "theapartment",	"The Apartment, Interactive demo" },
 	{ "gundam0079",	"Gundam 0079: The War for Earth" },
 	{ "jewels",		"Jewels of the Oracle" },
diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index dd780e4d6a..fc8d8e246e 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -46,19 +46,6 @@ static const DirectorGameDescription gameDescriptions[] = {
 		GID_TEST,
 		3
 	},
-	{
-		{
-			"directortestarch",
-			"",
-			AD_ENTRY1("test.dir", 0),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_ARCHIVE,
-		4
-	},
 
 	// Generic D3 Mac entry
 	MACGAME("director", "", "D3-mac", 0, -1, 3),
diff --git a/engines/director/director.h b/engines/director/director.h
index cc26993cd1..765dabb042 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -45,8 +45,7 @@ namespace Director {
 
 enum DirectorGameID {
 	GID_GENERIC,
-	GID_TEST,
-	GID_ARCHIVE
+	GID_TEST
 };
 
 class Archive;
diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index f7e84fdb08..22b33e7bcc 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -48,9 +48,7 @@ Archive *DirectorEngine::createArchive() {
 }
 
 void DirectorEngine::loadInitialMovie(const Common::String movie) {
-	if (getGameID() == GID_ARCHIVE)
-		openMainArchive(movie);
-	else if (getPlatform() == Common::kPlatformWindows)
+	if (getPlatform() == Common::kPlatformWindows)
 		loadEXE(movie);
 	else
 		loadMac(movie);
-- 
cgit v1.2.3