SpaceCadetPinball/loader.cpp

@@ -142,34 +142,27 @@ int loader::get_sound_id(int groupIndex)
 			                                                            FieldTypes::ShortValue));
 			if (value && *value == 202)
 			{
-				// File name is in lower case, while game data is usually in upper case.
 				std::string fileName = loader_table->field(soundGroupId, FieldTypes::String);
+
+				// File name is in lower case, while game data is in upper case.				
+				std::transform(fileName.begin(), fileName.end(), fileName.begin(),
+				               [](unsigned char c) { return std::toupper(c); });
 				if (pb::FullTiltMode)
 				{
 					// FT sounds are in SOUND subfolder
 					fileName.insert(0, 1, PathSeparator);
-					fileName.insert(0, "sound");
+					fileName.insert(0, "SOUND");
 				}
 
-				std::string filePath;
 				float duration = -1;
-				for (int i = 0; i < 2; i++)
+				auto filePath = pb::make_path_name(fileName);
+				auto file = fopenu(filePath.c_str(), "rb");
+				if (file)
 				{
-					if (i == 1)
+					fread(&wavHeader, 1, sizeof wavHeader, file);
-						std::transform(fileName.begin(), fileName.end(), fileName.begin(),
+					fclose(file);
-						               [](unsigned char c) { return std::toupper(c); });
+					auto sampleCount = wavHeader.data_size / (wavHeader.channels * (wavHeader.bits_per_sample / 8.0));
-
+					duration = static_cast<float>(sampleCount / wavHeader.sample_rate);
-					filePath = pb::make_path_name(fileName);
-					auto file = fopenu(filePath.c_str(), "rb");
-					if (file)
-					{
-						fread(&wavHeader, 1, sizeof wavHeader, file);
-						fclose(file);
-						auto sampleCount = wavHeader.data_size / (wavHeader.channels * (wavHeader.bits_per_sample /
-							8.0));
-						duration = static_cast<float>(sampleCount / wavHeader.sample_rate);
-						break;
-					}
 				}
 
 				sound_list[soundIndex].Duration = duration;

SpaceCadetPinball/midi.cpp

@@ -107,6 +107,7 @@ void midi::SetVolume(int volume)
 
 Mix_Music* midi::load_track(std::string fileName)
 {
+	Mix_Music* audio = nullptr;
 	if (pb::FullTiltMode)
 	{
 		// FT sounds are in SOUND subfolder
@@ -114,47 +115,29 @@ Mix_Music* midi::load_track(std::string fileName)
 		fileName.insert(0, "SOUND");
 	}
 
-	auto audio = load_track_sub(fileName, true);
-	if (!audio)
-		audio = load_track_sub(fileName, false);
-
-	if (!audio)
-		return nullptr;
-
-	LoadedTracks.push_back(audio);
-	return audio;
-}
-
-Mix_Music* midi::load_track_sub(std::string fileName, bool isMidi)
-{
 	// FT has music in two formats, depending on game version: MIDI in 16bit, MIDS in 32bit.
 	// 3DPB music is MIDI only.
-	Mix_Music* audio = nullptr;
+	auto basePath = pb::make_path_name(fileName);
-	fileName += isMidi ? ".MID" : ".MDS";
+	for (int i = 0; i <= 1 && !audio; i++)
-	for (int i = 0; i < 2; i++)
 	{
-		if (i == 1)
+		if (i == 0)
-			std::transform(fileName.begin(), fileName.end(), fileName.begin(),
-			               [](unsigned char c) { return std::tolower(c); });
-		if (isMidi)
 		{
-			auto filePath = pb::make_path_name(fileName);
+			auto filePath = basePath + ".MID";
 			auto fileHandle = fopenu(filePath.c_str(), "rb");
 			if (fileHandle)
 			{
 				fclose(fileHandle);
 				auto rw = SDL_RWFromFile(filePath.c_str(), "rb");
 				audio = Mix_LoadMUS_RW(rw, 1);
-				break;
 			}
 		}
 		else
 		{
-			auto midi = MdsToMidi(pb::make_path_name(fileName));
+			auto midi = MdsToMidi(basePath + ".MDS");
 			if (midi)
 			{
 				// Dump converted MIDI file
-				/*auto filePath = fileName + ".midi";
+				/*auto filePath = basePath + ".midi";
 				FILE* fileHandle = fopenu(filePath.c_str(), "wb");
 				fwrite(midi->data(), 1, midi->size(), fileHandle);
 				fclose(fileHandle);*/
@@ -162,11 +145,14 @@ Mix_Music* midi::load_track_sub(std::string fileName, bool isMidi)
 				auto rw = SDL_RWFromMem(midi->data(), static_cast<int>(midi->size()));
 				audio = Mix_LoadMUS_RW(rw, 1); // This call seems to leak memory no matter what.
 				delete midi;
-				break;
 			}
 		}
 	}
 
+	if (!audio)
+		return nullptr;
+
+	LoadedTracks.push_back(audio);
 	return audio;
 }
 

SpaceCadetPinball/midi.h

@@ -110,7 +110,6 @@ private:
 
 	static void StopPlayback();
 	static Mix_Music* load_track(std::string fileName);
-	static Mix_Music* load_track_sub(std::string fileName, bool isMidi);
 	static Mix_Music* TrackToMidi(MidiTracks track);
 	static std::vector<uint8_t>* MdsToMidi(std::string file);
 };

SpaceCadetPinball/pb.cpp

@@ -140,36 +140,27 @@ void pb::SelectDatFile(const std::vector<const char*>& dataSearchPaths)
 
 	// Default game data test order: CADET.DAT, PINBALL.DAT, DEMO.DAT
 	if (options::Options.Prefer3DPBGameData)
-	{
 		std::swap(datFileNames[0], datFileNames[1]);
-	}
 	for (auto path : dataSearchPaths)
 	{
-		if (!path)
+		if (DatFileName.empty() && path)
-			continue;
-
-		BasePath = path;
-		for (const auto& datFileName : datFileNames)
 		{
-			auto fileName = datFileName;
+			BasePath = path;
-			for (int i = 0; i < 2; i++)
+			for (auto datFileName : datFileNames)
 			{
-				if (i == 1)
+				auto datFilePath = make_path_name(datFileName);
-					std::transform(fileName.begin(), fileName.end(), fileName.begin(),
-					               [](unsigned char c) { return std::tolower(c); });
-
-				auto datFilePath = make_path_name(fileName);
 				auto datFile = fopenu(datFilePath.c_str(), "r");
 				if (datFile)
 				{
 					fclose(datFile);
-					DatFileName = fileName;
+					DatFileName = datFileName;
 					if (datFileName == "CADET.DAT")
 						FullTiltMode = true;
 					if (datFileName == "DEMO.DAT")
 						FullTiltDemoMode = FullTiltMode = true;
+
 					printf("Loading game from: %s\n", datFilePath.c_str());
-					return;
+					break;
 				}
 			}
 		}