STARTREK: Put CD ROM detection into features field

4 files changed, 7 insertions, 23 deletions

diff --git a/engines/startrek/detection.cpp b/engines/startrek/detection.cpp
index 287c54b5e3..47ddcf0a3c 100644
--- a/engines/startrek/detection.cpp
+++ b/engines/startrek/detection.cpp
@@ -42,7 +42,6 @@ struct StarTrekGameDescription {
 
 	uint8 gameType;
 	uint32 features;
-	bool isCDEdition;
 };
 
 uint32 StarTrekEngine::getFeatures() const {
@@ -53,10 +52,6 @@ Common::Platform StarTrekEngine::getPlatform() const {
 	return _gameDescription->desc.platform;
 }
 
-bool StarTrekEngine::isCDEdition() const {
-	return _gameDescription->isCDEdition;
-}
-
 uint8 StarTrekEngine::getGameType() const {
 	return _gameDescription->gameType;
 }
@@ -91,8 +86,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
 			GUIO0()
 		},
 		GType_ST25,
-		0,
-		true,
+		GF_CDROM,
 	},
 
 	{ // ST25 DOS floppy edition (EN)
@@ -107,7 +101,6 @@ static const StarTrekGameDescription gameDescriptions[] = {
 		},
 		GType_ST25,
 		0,
-		false,
 	},
 
 	{ // ST25 DOS floppy edition (GER)
@@ -122,7 +115,6 @@ static const StarTrekGameDescription gameDescriptions[] = {
 		},
 		GType_ST25,
 		0,
-		false,
 	},
 
 	{ // ST25 Amiga ? (EN)
@@ -137,7 +129,6 @@ static const StarTrekGameDescription gameDescriptions[] = {
 		},
 		GType_ST25,
 		0,
-		false,
 	},
 
 	{ // ST25 Amiga ? (GER)
@@ -152,7 +143,6 @@ static const StarTrekGameDescription gameDescriptions[] = {
 		},
 		GType_ST25,
 		0,
-		false,
 	},
 
 	{ // ST25 Amiga ? (FR)
@@ -167,7 +157,6 @@ static const StarTrekGameDescription gameDescriptions[] = {
 		},
 		GType_ST25,
 		0,
-		false,
 	},
 
 	{ // ST25 Mac ? (EN)
@@ -182,7 +171,6 @@ static const StarTrekGameDescription gameDescriptions[] = {
 		},
 		GType_ST25,
 		0,
-		false,
 	},
 
 	{ // ST25 Mac floppy edition (EN)
@@ -197,7 +185,6 @@ static const StarTrekGameDescription gameDescriptions[] = {
 		},
 		GType_ST25,
 		0,
-		false,
 	},
 
 	{ // ST25 DOS demo ? (EN)
@@ -212,7 +199,6 @@ static const StarTrekGameDescription gameDescriptions[] = {
 		},
 		GType_ST25,
 		GF_DEMO,
-		false,
 	},
 
 	{ // ST25 MAC demo ? (EN)
@@ -227,7 +213,6 @@ static const StarTrekGameDescription gameDescriptions[] = {
 		},
 		GType_ST25,
 		GF_DEMO,
-		false,
 	},
 
 	{ // STJR DOS CD-ROM edition (EN)
@@ -241,11 +226,10 @@ static const StarTrekGameDescription gameDescriptions[] = {
 			GUIO0()
 		},
 		GType_STJR,
-		0,
-		true,
+		GF_CDROM,
 	},
 
-	{ AD_TABLE_END_MARKER, 0, 0, 0 }
+	{ AD_TABLE_END_MARKER, 0, 0 }
 };
 
 } // End of namespace StarTrek
diff --git a/engines/startrek/sound.cpp b/engines/startrek/sound.cpp
index 2c4abff30c..46967593ef 100644
--- a/engines/startrek/sound.cpp
+++ b/engines/startrek/sound.cpp
@@ -63,7 +63,7 @@ Sound::Sound(StarTrekEngine *vm) : _vm(vm) {
 		_midiSlotList.push_back(&_midiSlots[i]);
 	}
 
-	if (!_vm->isCDEdition())
+	if (!(_vm->getFeatures() & GF_CDROM))
 		_vm->_sfxWorking = false;
 	else if (!SearchMan.hasFile("voc/speech.mrk")) {
 		warning("Couldn't find 'voc/speech.mrk'. The 'trekcd/voc/' directory should be dumped from the CD. Continuing without CD audio");
diff --git a/engines/startrek/startrek.cpp b/engines/startrek/startrek.cpp
index c201e3fa54..b6960740d2 100644
--- a/engines/startrek/startrek.cpp
+++ b/engines/startrek/startrek.cpp
@@ -529,7 +529,7 @@ void StarTrekEngine::runTransportSequence(const Common::String &name) {
 }
 
 void StarTrekEngine::playSoundEffectIndex(int index) {
-	if (!isCDEdition())
+	if (!(getFeatures() & GF_CDROM))
 		_sound->playMidiTrack(index);
 	else {
 		switch (index) {
diff --git a/engines/startrek/startrek.h b/engines/startrek/startrek.h
index c1f2cf6875..2fcf6a2a4a 100644
--- a/engines/startrek/startrek.h
+++ b/engines/startrek/startrek.h
@@ -121,7 +121,8 @@ enum StarTrekGameType {
 };
 
 enum StarTrekGameFeatures {
-	GF_DEMO = (1 << 0)
+	GF_DEMO  = (1 << 0),
+	GF_CDROM = (1 << 1)
 };
 
 enum kDebugLevels {
@@ -639,7 +640,6 @@ public:
 public:
 	const StarTrekGameDescription *_gameDescription;
 	uint32 getFeatures() const;
-	bool isCDEdition() const;
 	Common::Platform getPlatform() const;
 	uint8 getGameType() const;
 	Common::Language getLanguage() const;