PEGASUS: Push the sound spots file name to subclasses

scummvm · Sep 28, 2011 · d0914e6 · d0914e6
1 parent c581cb1
commit d0914e6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 36 deletions.
diff --git a/engines/pegasus/neighborhood/neighborhood.cpp b/engines/pegasus/neighborhood/neighborhood.cpp
@@ -131,7 +131,7 @@ void Neighborhood::init() {
 	_navMovie.initFromMovieFile(getNavMovieName());
 	_navMovie.setVolume(_vm->getSoundFXLevel());
 
-	loadSoundSpots();
+	_spotSounds.initFromQuickTime(getSoundSpotsName());
 	_spotSounds.setVolume(_vm->getSoundFXLevel());
 
 	_navMovie.setDisplayOrder(kNavMovieOrder);
@@ -367,40 +367,6 @@ void Neighborhood::createNeighborhoodSpots() {
 	delete hotspotList;
 }
 
-void Neighborhood::loadSoundSpots() {
-	// TODO: Eventually push to the subclasses
-
-	Common::String fileName = "Sounds/";
-
-	switch (getObjectID()) {
-	case kCaldoriaID:
-		fileName += "Caldoria/Caldoria Spots";
-		break;
-	case kFullTSAID:
-	case kFinalTSAID:
-	case kTinyTSAID:
-		fileName += "TSA/TSA Spots";
-		break;
-	case kPrehistoricID:
-		fileName += "Prehistoric/Prehistoric Spots";
-		break;
-	case kMarsID:
-		fileName += "Mars/Mars Spots";
-		break;
-	case kWSCID:
-		fileName += "World Science Center/WSC Spots";
-		break;
-	case kNoradAlphaID:
-		fileName += "Norad/Norad Alpha Spots";
-		break;
-	case kNoradDeltaID:
-		fileName += "Norad/Norad Delta Spots";
-		break;
-	}
-
-	_spotSounds.initFromQuickTime(fileName);
-}
-
 void Neighborhood::popActionQueue() {	
 	if (!_actionQueue.empty()) {
 		tQueueRequest topRequest = _actionQueue.pop();

diff --git a/engines/pegasus/neighborhood/neighborhood.h b/engines/pegasus/neighborhood/neighborhood.h
@@ -253,7 +253,7 @@ friend void timerFunction(FunctionPtr *, void *);
 	PegasusEngine *_vm;
 	Common::String _resName;
 
-	virtual void loadSoundSpots();
+	virtual Common::String getSoundSpotsName() = 0;
 	virtual Common::String getNavMovieName() = 0;
 
 	// Notification function.

diff --git a/engines/pegasus/neighborhood/prehistoric.cpp b/engines/pegasus/neighborhood/prehistoric.cpp
@@ -682,4 +682,8 @@ Common::String Prehistoric::getNavMovieName() {
 	return "Images/Prehistoric/Prehistoric.movie";
 }
 
+Common::String Prehistoric::getSoundSpotsName() {
+	return "Sounds/Prehistoric/Prehistoric Spots";
+}
+
 } // End of namespace Pegasus
diff --git a/engines/pegasus/neighborhood/prehistoric.h b/engines/pegasus/neighborhood/prehistoric.h
@@ -150,6 +150,7 @@ class Prehistoric : public Neighborhood {
 	FlagsArray<byte, kNumPrehistoricPrivateFlags> _privateFlags;
 
 	Common::String getNavMovieName();
+	Common::String getSoundSpotsName();
 };
 
 } // End of namespace Pegasus