github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-20 21:33:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated ResourceMgr to develop changes

Browse source
This commit is contained in:
Kevin Alexis Contreras 2022-06-13 10:17:48 -05:00
commit 9e851ebd93
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libultraship/libultraship/ResourceMgr.cpp
View file

@ -186,7 +186,7 @@ namespace Ship {
gameVersion = newGameVersion; gameVersion = newGameVersion;
} }
std::shared_ptr<File> ResourceMgr::LoadFileAsync(std::string FilePath) { std::shared_ptr<File> ResourceMgr::LoadFileAsync(const std::string& FilePath) {
const std::lock_guard<std::mutex> Lock(FileLoadMutex); const std::lock_guard<std::mutex> Lock(FileLoadMutex);
// File NOT already loaded...? // File NOT already loaded...?
auto fileCacheFind = FileCache.find(FilePath); auto fileCacheFind = FileCache.find(FilePath);

2
libultraship/libultraship/ResourceMgr.h
View file

@ -32,7 +32,7 @@ namespace Ship
uint32_t GetGameVersion(); uint32_t GetGameVersion();
void SetGameVersion(uint32_t newGameVersion); void SetGameVersion(uint32_t newGameVersion);
std::shared_ptr<File> LoadFileAsync(std::string FilePath); std::shared_ptr<File> LoadFileAsync(const std::string& FilePath);
std::shared_ptr<File> LoadFile(const std::string& FilePath); std::shared_ptr<File> LoadFile(const std::string& FilePath);
std::shared_ptr<Ship::Resource> GetCachedFile(const char* FilePath) const; std::shared_ptr<Ship::Resource> GetCachedFile(const char* FilePath) const;
std::shared_ptr<Resource> LoadResource(const char* FilePath); std::shared_ptr<Resource> LoadResource(const char* FilePath);

6
soh/soh.vcxproj.filters
View file

@ -3768,12 +3768,12 @@
<ItemGroup> <ItemGroup>
<Image Include="SHIPOFHARKINIAN.ico" /> <Image Include="SHIPOFHARKINIAN.ico" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="include\macro.inc" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="Resource.rc"> <ResourceCompile Include="Resource.rc">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</ResourceCompile> </ResourceCompile>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="include\macro.inc" />
</ItemGroup>
</Project> </Project>