summaryrefslogtreecommitdiffstats
path: root/src/WorldStorage
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-05-09 09:25:09 +0200
committerMattes D <github@xoft.cz>2015-05-09 12:58:54 +0200
commitc13b1931ff26a5643c9fe68ab32b1e362cfacd70 (patch)
tree0c19db714a5dd08eb2775b39487e96cf317cf867 /src/WorldStorage
parentRabbit and cooked rabbit now stackable (diff)
downloadcuberite-c13b1931ff26a5643c9fe68ab32b1e362cfacd70.tar
cuberite-c13b1931ff26a5643c9fe68ab32b1e362cfacd70.tar.gz
cuberite-c13b1931ff26a5643c9fe68ab32b1e362cfacd70.tar.bz2
cuberite-c13b1931ff26a5643c9fe68ab32b1e362cfacd70.tar.lz
cuberite-c13b1931ff26a5643c9fe68ab32b1e362cfacd70.tar.xz
cuberite-c13b1931ff26a5643c9fe68ab32b1e362cfacd70.tar.zst
cuberite-c13b1931ff26a5643c9fe68ab32b1e362cfacd70.zip
Diffstat (limited to 'src/WorldStorage')
-rw-r--r--src/WorldStorage/FastNBT.h2
-rw-r--r--src/WorldStorage/MapSerializer.cpp8
-rw-r--r--src/WorldStorage/ScoreboardSerializer.cpp2
-rw-r--r--src/WorldStorage/StatSerializer.cpp2
-rwxr-xr-xsrc/WorldStorage/WSSAnvil.cpp8
5 files changed, 11 insertions, 11 deletions
diff --git a/src/WorldStorage/FastNBT.h b/src/WorldStorage/FastNBT.h
index c6225eacf..35e47c8e4 100644
--- a/src/WorldStorage/FastNBT.h
+++ b/src/WorldStorage/FastNBT.h
@@ -164,7 +164,7 @@ public:
/** Returns the direct child tag of the specified name, or -1 if no such tag. */
int FindChildByName(int a_Tag, const char * a_Name, size_t a_NameLength = 0) const;
- /** Returns the child tag of the specified path (Name1/Name2/Name3...), or -1 if no such tag. */
+ /** Returns the child tag of the specified path (Name1 / Name2 / Name3...), or -1 if no such tag. */
int FindTagByPath(int a_Tag, const AString & a_Path) const;
eTagType GetType(int a_Tag) const { return m_Tags[(size_t)a_Tag].m_Type; }
diff --git a/src/WorldStorage/MapSerializer.cpp b/src/WorldStorage/MapSerializer.cpp
index f2d35b318..6f0449041 100644
--- a/src/WorldStorage/MapSerializer.cpp
+++ b/src/WorldStorage/MapSerializer.cpp
@@ -19,9 +19,9 @@ cMapSerializer::cMapSerializer(const AString& a_WorldName, cMap * a_Map)
: m_Map(a_Map)
{
AString DataPath;
- Printf(DataPath, "%s/data", a_WorldName.c_str());
+ Printf(DataPath, "%s%cdata", a_WorldName.c_str(), cFile::PathSeparator);
- Printf(m_Path, "%s/map_%i.dat", DataPath.c_str(), a_Map->GetID());
+ Printf(m_Path, "%s%cmap_%i.dat", DataPath.c_str(), cFile::PathSeparator, a_Map->GetID());
cFile::CreateFolder(FILE_IO_PREFIX + DataPath);
}
@@ -203,9 +203,9 @@ bool cMapSerializer::LoadMapFromNBT(const cParsedNBT & a_NBT)
cIDCountSerializer::cIDCountSerializer(const AString & a_WorldName) : m_MapCount(0)
{
AString DataPath;
- Printf(DataPath, "%s/data", a_WorldName.c_str());
+ Printf(DataPath, "%s%cdata", a_WorldName.c_str(), cFile::PathSeparator);
- Printf(m_Path, "%s/idcounts.dat", DataPath.c_str());
+ Printf(m_Path, "%s%cidcounts.dat", DataPath.c_str(), cFile::PathSeparator);
cFile::CreateFolder(FILE_IO_PREFIX + DataPath);
}
diff --git a/src/WorldStorage/ScoreboardSerializer.cpp b/src/WorldStorage/ScoreboardSerializer.cpp
index 404604382..0d8730e49 100644
--- a/src/WorldStorage/ScoreboardSerializer.cpp
+++ b/src/WorldStorage/ScoreboardSerializer.cpp
@@ -18,7 +18,7 @@ cScoreboardSerializer::cScoreboardSerializer(const AString & a_WorldName, cScore
: m_ScoreBoard(a_ScoreBoard)
{
AString DataPath;
- Printf(DataPath, "%s/data", a_WorldName.c_str());
+ Printf(DataPath, "%s%cdata", a_WorldName.c_str(), cFile::PathSeparator);
m_Path = DataPath + "/scoreboard.dat";
diff --git a/src/WorldStorage/StatSerializer.cpp b/src/WorldStorage/StatSerializer.cpp
index 74113941c..99a702c39 100644
--- a/src/WorldStorage/StatSerializer.cpp
+++ b/src/WorldStorage/StatSerializer.cpp
@@ -18,7 +18,7 @@ cStatSerializer::cStatSerializer(const AString & a_WorldName, const AString & a_
// inside the folder of the default world.
AString StatsPath;
- Printf(StatsPath, "%s/stats", a_WorldName.c_str());
+ Printf(StatsPath, "%s%cstats", a_WorldName.c_str(), cFile::PathSeparator);
m_Path = StatsPath + "/" + a_PlayerName + ".json";
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index 948a0c9a0..f389e7cbf 100755
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -95,7 +95,7 @@ cWSSAnvil::cWSSAnvil(cWorld * a_World, int a_CompressionFactor) :
{
// Create a level.dat file for mapping tools, if it doesn't already exist:
AString fnam;
- Printf(fnam, "%s/level.dat", a_World->GetName().c_str());
+ Printf(fnam, "%s%clevel.dat", a_World->GetName().c_str(), cFile::PathSeparator);
if (!cFile::Exists(fnam))
{
cFastNBTWriter Writer;
@@ -251,7 +251,7 @@ cWSSAnvil::cMCAFile * cWSSAnvil::LoadMCAFile(const cChunkCoords & a_Chunk)
// Load it anew:
AString FileName;
- Printf(FileName, "%s/region", m_World->GetName().c_str());
+ Printf(FileName, "%s%cregion", m_World->GetName().c_str(), cFile::PathSeparator);
cFile::CreateFolder(FILE_IO_PREFIX + FileName);
AppendPrintf(FileName, "/r.%d.%d.mca", RegionX, RegionZ);
cMCAFile * f = new cMCAFile(FileName, RegionX, RegionZ);
@@ -323,7 +323,7 @@ bool cWSSAnvil::SaveChunkToData(const cChunkCoords & a_Chunk, AString & a_Data)
bool cWSSAnvil::LoadChunkFromNBT(const cChunkCoords & a_Chunk, const cParsedNBT & a_NBT)
{
- // The data arrays, in MCA-native y/z/x ordering (will be reordered for the final chunk data)
+ // The data arrays, in MCA-native y / z / x ordering (will be reordered for the final chunk data)
cChunkDef::BlockTypes BlockTypes;
cChunkDef::BlockNibbles MetaData;
cChunkDef::BlockNibbles BlockLight;
@@ -879,7 +879,7 @@ cBlockEntity * cWSSAnvil::LoadBeaconFromNBT(const cParsedNBT & a_NBT, int a_TagI
Beacon->SetSecondaryEffect((cEntityEffect::eType)a_NBT.GetInt(CurrentLine));
}
- // We are better than mojang, we load/save the beacon inventory!
+ // We are better than mojang, we load / save the beacon inventory!
int Items = a_NBT.FindChildByName(a_TagIdx, "Items");
if ((Items >= 0) && (a_NBT.GetType(Items) == TAG_List))
{