SHERLOCK: Simplify detection entry

scummvm · May 9, 2015 · 7ca37be · 7ca37be
1 parent 263f33a
commit 7ca37be
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
@@ -33,7 +33,6 @@ struct SherlockGameDescription {
 	ADGameDescription desc;
 
 	int gameID;
-	uint32 features;
 };
 
 /**
@@ -43,13 +42,6 @@ uint32 SherlockEngine::getGameID() const {
 	return _gameDescription->gameID;
 }
 
-/**
- * Returns the features the currently playing game has
- */
-uint32 SherlockEngine::getGameFeatures() const {
-	return _gameDescription->features;
-}
-
 /**
  * Return's the platform the game's datafiles are for
  */

diff --git a/engines/sherlock/detection_tables.h b/engines/sherlock/detection_tables.h
@@ -28,20 +28,16 @@ static const SherlockGameDescription gameDescriptions[] = {
 		{
 			"scalpel",
 			0,
-			{
-				{ "talk.lib", 0, "ad0c4d6865edf15da4e9204c08815875", 238928 },
-				AD_LISTEND
-			},
+			AD_ENTRY1s("talk.lib", "ad0c4d6865edf15da4e9204c08815875", 238928),
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
 			GUIO1(GUIO_NOSPEECH)
 		},
 		GType_SerratedScalpel,
-		0
 	},
 
-	{ AD_TABLE_END_MARKER, 0, 0 }
+	{ AD_TABLE_END_MARKER }
 };
 
 } // End of namespace MADS
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
@@ -122,7 +122,6 @@ class SherlockEngine : public Engine {
 
 	int getGameType() const;
 	uint32 getGameID() const;
-	uint32 getGameFeatures() const;
 	Common::Language getLanguage() const;
 	Common::Platform getPlatform() const;