flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

StatSerializer: use std::move

Browse Source
This commit is contained in:
Tiger Wang 2020-08-21 18:15:34 +01:00
parent e23dcffaff
commit 8620f6a13e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/WorldStorage/StatSerializer.cpp
View File

@ -106,7 +106,7 @@ static const std::unordered_map<std::string_view, Statistic> LegacyMapping
namespace StatSerializer namespace StatSerializer
{ {
auto MakeStatisticsDirectory(const std::string & WorldPath, std::string FileName) auto MakeStatisticsDirectory(const std::string & WorldPath, std::string && FileName)
{ {
// Even though stats are shared between worlds, they are (usually) saved // Even though stats are shared between worlds, they are (usually) saved
// inside the folder of the default world. // inside the folder of the default world.
@ -196,10 +196,10 @@ namespace StatSerializer
void Load(cStatManager & Manager, const std::string & WorldPath, std::string FileName) void Load(cStatManager & Manager, const std::string & WorldPath, std::string && FileName)
{ {
Json::Value Root; Json::Value Root;
InputFileStream(MakeStatisticsDirectory(WorldPath, FileName)) >> Root; InputFileStream(MakeStatisticsDirectory(WorldPath, std::move(FileName))) >> Root;
LoadLegacyFromJSON(Manager, Root); LoadLegacyFromJSON(Manager, Root);
LoadCustomStatFromJSON(Manager, Root["stats"]["custom"]); LoadCustomStatFromJSON(Manager, Root["stats"]["custom"]);
@ -209,13 +209,13 @@ namespace StatSerializer
void Save(const cStatManager & Manager, const std::string & WorldPath, std::string FileName) void Save(const cStatManager & Manager, const std::string & WorldPath, std::string && FileName)
{ {
Json::Value Root; Json::Value Root;
SaveStatToJSON(Manager, Root["stats"]); SaveStatToJSON(Manager, Root["stats"]);
Root["DataVersion"] = NamespaceSerializer::DataVersion(); Root["DataVersion"] = NamespaceSerializer::DataVersion();
OutputFileStream(MakeStatisticsDirectory(WorldPath, FileName)) << Root; OutputFileStream(MakeStatisticsDirectory(WorldPath, std::move(FileName))) << Root;
} }
} }

4
src/WorldStorage/StatSerializer.h
View File

@ -24,8 +24,8 @@ namespace Json { class Value; }
namespace StatSerializer namespace StatSerializer
{ {
/* Try to load the player statistics. */ /* Try to load the player statistics. */
void Load(cStatManager & Manager, const std::string & WorldPath, std::string FileName); void Load(cStatManager & Manager, const std::string & WorldPath, std::string && FileName);
/* Try to save the player statistics. */ /* Try to save the player statistics. */
void Save(const cStatManager & Manager, const std::string & WorldPath, std::string FileName); void Save(const cStatManager & Manager, const std::string & WorldPath, std::string && FileName);
} }