aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2015-05-09 09:17:30 -0400
committerPaul Gilbert2015-05-09 09:17:30 -0400
commit5d41f0f9aa5d4df586949362fcedec447d1d6094 (patch)
tree2bce5e832ad5f51ce150b1d50badcc67f5dafe06
parent47bcb5358acddc3ef75f5a4af59ba43f06027490 (diff)
downloadscummvm-rg350-5d41f0f9aa5d4df586949362fcedec447d1d6094.tar.gz
scummvm-rg350-5d41f0f9aa5d4df586949362fcedec447d1d6094.tar.bz2
scummvm-rg350-5d41f0f9aa5d4df586949362fcedec447d1d6094.zip
SHERLOCK: Give the GTYPE constants an explicit enum type
-rw-r--r--engines/sherlock/detection.cpp6
-rw-r--r--engines/sherlock/sherlock.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index dd02bd7694..82ac5a4c3d 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -32,18 +32,18 @@ namespace Sherlock {
struct SherlockGameDescription {
ADGameDescription desc;
- int gameID;
+ GameType gameID;
};
/**
* Returns the Id of the game
*/
-uint32 SherlockEngine::getGameID() const {
+GameType SherlockEngine::getGameID() const {
return _gameDescription->gameID;
}
/**
- * Return's the platform the game's datafiles are for
+ * Returns the platform the game's datafiles are for
*/
Common::Platform SherlockEngine::getPlatform() const {
return _gameDescription->desc.platform;
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 79a3c11135..a516e52ae7 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -57,7 +57,7 @@ enum {
kDebugScript = 1 << 0
};
-enum {
+enum GameType {
GType_SerratedScalpel = 0,
GType_RoseTattoo = 1
};
@@ -121,7 +121,7 @@ public:
virtual void syncSoundSettings();
int getGameType() const;
- uint32 getGameID() const;
+ GameType getGameID() const;
Common::Language getLanguage() const;
Common::Platform getPlatform() const;