From d3740df7cd04b2904eada261cb250dde9fe834a2 Mon Sep 17 00:00:00 2001 From: WHR Date: Sat, 12 Nov 2022 18:29:05 +0800 Subject: [PATCH] Allow loading data files with lowercase name --- SpaceCadetPinball/pb.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/SpaceCadetPinball/pb.cpp b/SpaceCadetPinball/pb.cpp index 6746580..0180247 100644 --- a/SpaceCadetPinball/pb.cpp +++ b/SpaceCadetPinball/pb.cpp @@ -131,16 +131,22 @@ void pb::SelectDatFile(const std::vector& dataSearchPaths) DatFileName.clear(); FullTiltDemoMode = FullTiltMode = false; - std::string datFileNames[3] + std::string datFileNames[] { "CADET.DAT", "PINBALL.DAT", "DEMO.DAT", + "cadet.dat", + "pinball.dat", + "demo.dat", }; // Default game data test order: CADET.DAT, PINBALL.DAT, DEMO.DAT if (options::Options.Prefer3DPBGameData) + { std::swap(datFileNames[0], datFileNames[1]); + std::swap(datFileNames[3], datFileNames[4]); + } for (auto path : dataSearchPaths) { if (DatFileName.empty() && path) @@ -154,11 +160,10 @@ void pb::SelectDatFile(const std::vector& dataSearchPaths) { fclose(datFile); DatFileName = datFileName; - if (datFileName == "CADET.DAT") + if (strcasecmp(datFileName.c_str(), "cadet.dat") == 0) FullTiltMode = true; - if (datFileName == "DEMO.DAT") + else if (strcasecmp(datFileName.c_str(), "demo.dat") == 0) FullTiltDemoMode = FullTiltMode = true; - printf("Loading game from: %s\n", datFilePath.c_str()); break; }