diff options
| author | Paul Gilbert | 2015-05-08 22:54:32 -0400 | 
|---|---|---|
| committer | Paul Gilbert | 2015-05-08 22:54:32 -0400 | 
| commit | 7ca37bef9f6b16f175f39908c8dfbb1761d42aa3 (patch) | |
| tree | 3aa8ba372ed4cc8b4fed868b480b0bdc15d48611 | |
| parent | 263f33a9f83f9d1d00a100b7532dd28e59ee3a6b (diff) | |
| download | scummvm-rg350-7ca37bef9f6b16f175f39908c8dfbb1761d42aa3.tar.gz scummvm-rg350-7ca37bef9f6b16f175f39908c8dfbb1761d42aa3.tar.bz2 scummvm-rg350-7ca37bef9f6b16f175f39908c8dfbb1761d42aa3.zip | |
SHERLOCK: Simplify detection entry
| -rw-r--r-- | engines/sherlock/detection.cpp | 8 | ||||
| -rw-r--r-- | engines/sherlock/detection_tables.h | 8 | ||||
| -rw-r--r-- | engines/sherlock/sherlock.h | 1 | 
3 files changed, 2 insertions, 15 deletions
| diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp index 734db007ba..aae8b0ad0e 100644 --- a/engines/sherlock/detection.cpp +++ b/engines/sherlock/detection.cpp @@ -33,7 +33,6 @@ struct SherlockGameDescription {  	ADGameDescription desc;  	int gameID; -	uint32 features;  };  /** @@ -44,13 +43,6 @@ uint32 SherlockEngine::getGameID() const {  }  /** - * 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   */  Common::Platform SherlockEngine::getPlatform() const { diff --git a/engines/sherlock/detection_tables.h b/engines/sherlock/detection_tables.h index 1d7326058e..401ede3b07 100644 --- 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 index 06d38cbf89..79a3c11135 100644 --- a/engines/sherlock/sherlock.h +++ b/engines/sherlock/sherlock.h @@ -122,7 +122,6 @@ public:  	int getGameType() const;  	uint32 getGameID() const; -	uint32 getGameFeatures() const;  	Common::Language getLanguage() const;  	Common::Platform getPlatform() const; | 
