From 9e851ebd9371a9c2241a0e87973923c2db69b537 Mon Sep 17 00:00:00 2001 From: Kevin Alexis Contreras <36680385+KiritoDv@users.noreply.github.com> Date: Mon, 13 Jun 2022 10:17:48 -0500 Subject: [PATCH] Updated ResourceMgr to develop changes --- libultraship/libultraship/ResourceMgr.cpp | 2 +- libultraship/libultraship/ResourceMgr.h | 2 +- soh/soh.vcxproj.filters | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libultraship/libultraship/ResourceMgr.cpp b/libultraship/libultraship/ResourceMgr.cpp index b4f2d04a7..8d7b6a10d 100644 --- a/libultraship/libultraship/ResourceMgr.cpp +++ b/libultraship/libultraship/ResourceMgr.cpp @@ -186,7 +186,7 @@ namespace Ship { gameVersion = newGameVersion; } - std::shared_ptr ResourceMgr::LoadFileAsync(std::string FilePath) { + std::shared_ptr ResourceMgr::LoadFileAsync(const std::string& FilePath) { const std::lock_guard Lock(FileLoadMutex); // File NOT already loaded...? auto fileCacheFind = FileCache.find(FilePath); diff --git a/libultraship/libultraship/ResourceMgr.h b/libultraship/libultraship/ResourceMgr.h index 77a708692..09e9979d1 100644 --- a/libultraship/libultraship/ResourceMgr.h +++ b/libultraship/libultraship/ResourceMgr.h @@ -32,7 +32,7 @@ namespace Ship uint32_t GetGameVersion(); void SetGameVersion(uint32_t newGameVersion); - std::shared_ptr LoadFileAsync(std::string FilePath); + std::shared_ptr LoadFileAsync(const std::string& FilePath); std::shared_ptr LoadFile(const std::string& FilePath); std::shared_ptr GetCachedFile(const char* FilePath) const; std::shared_ptr LoadResource(const char* FilePath); diff --git a/soh/soh.vcxproj.filters b/soh/soh.vcxproj.filters index 53c677a47..898bc2a90 100644 --- a/soh/soh.vcxproj.filters +++ b/soh/soh.vcxproj.filters @@ -3768,12 +3768,12 @@ - - - Resource Files + + + \ No newline at end of file