Merge pull request #80 from OutpostUniverse/updateGetFileList

Update NAS2D for `Filesystem` update to use `std::filesystem::path`
OutpostUniverse · Oct 5, 2022 · cf3d917 · cf3d917
2 parents a06d001 + cbad297
commit cf3d917
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/OP2-Landlord/StartState.cpp b/OP2-Landlord/StartState.cpp
@@ -273,16 +273,17 @@ void StartState::fillMapMenu()
  */
 StringList StartState::getFileList(const std::string& directory)
 {
-	StringList fileList = Utility<Filesystem>::get().directoryList(directory);
+	auto fileList = Utility<Filesystem>::get().directoryList(directory);
 	StringList returnList;
 
 	Filesystem& f = Utility<Filesystem>::get();
 
-	for (size_t i = 0; i < fileList.size(); i++)
+	for (const auto& file : fileList)
 	{
-		if (!f.isDirectory(directory + fileList[i]))
+		const auto fileString = file.string();
+		if (!f.isDirectory(directory + fileString))
 		{
-			returnList.push_back(fileList[i]);
+			returnList.push_back(fileString);
 		}
 	}
 

diff --git a/nas2d-core b/nas2d-core