diff options
author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-02-01 14:50:09 +0100 |
---|---|---|
committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-02-01 14:50:09 +0100 |
commit | ef196ec22f7da0e38c04422c1587b2b4b9cd91ab (patch) | |
tree | ffe1fc20288890be6b807b66a5baaf39931edecd | |
parent | sprintf() begone! Replaced with StringUtils' Printf() (diff) | |
download | cuberite-ef196ec22f7da0e38c04422c1587b2b4b9cd91ab.tar cuberite-ef196ec22f7da0e38c04422c1587b2b4b9cd91ab.tar.gz cuberite-ef196ec22f7da0e38c04422c1587b2b4b9cd91ab.tar.bz2 cuberite-ef196ec22f7da0e38c04422c1587b2b4b9cd91ab.tar.lz cuberite-ef196ec22f7da0e38c04422c1587b2b4b9cd91ab.tar.xz cuberite-ef196ec22f7da0e38c04422c1587b2b4b9cd91ab.tar.zst cuberite-ef196ec22f7da0e38c04422c1587b2b4b9cd91ab.zip |
-rw-r--r-- | source/cChunk.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/cChunk.cpp b/source/cChunk.cpp index 83f7a0ffc..3a143b5f3 100644 --- a/source/cChunk.cpp +++ b/source/cChunk.cpp @@ -910,7 +910,7 @@ bool cChunk::LoadFromDisk() if (f.Read(m_BlockData, sizeof(m_BlockData)) != sizeof(m_BlockData))
{
- LOGERROR("ERROR READING FROM FILE %s", SourceFile);
+ LOGERROR("ERROR READING FROM FILE %s", SourceFile.c_str());
return false;
}
@@ -927,7 +927,7 @@ bool cChunk::LoadFromDisk() cChestEntity * ChestEntity = new cChestEntity( 0, 0, 0, this );
if (!ChestEntity->LoadFromFile(f))
{
- LOGERROR("ERROR READING CHEST FROM FILE %s", SourceFile );
+ LOGERROR("ERROR READING CHEST FROM FILE %s", SourceFile.c_str());
delete ChestEntity;
return false;
}
@@ -940,7 +940,7 @@ bool cChunk::LoadFromDisk() cFurnaceEntity* FurnaceEntity = new cFurnaceEntity( 0, 0, 0, this );
if (!FurnaceEntity->LoadFromFile(f))
{
- LOGERROR("ERROR READING FURNACE FROM FILE %s", SourceFile );
+ LOGERROR("ERROR READING FURNACE FROM FILE %s", SourceFile.c_str());
delete FurnaceEntity;
return false;
}
@@ -955,7 +955,7 @@ bool cChunk::LoadFromDisk() cSignEntity * SignEntity = new cSignEntity(BlockType, 0, 0, 0, this );
if (!SignEntity->LoadFromFile( f ) )
{
- LOGERROR("ERROR READING SIGN FROM FILE %s", SourceFile );
+ LOGERROR("ERROR READING SIGN FROM FILE %s", SourceFile.c_str());
delete SignEntity;
return false;
}
@@ -976,11 +976,11 @@ bool cChunk::LoadFromDisk() // Delete old format file
if (std::remove(SourceFile.c_str()) != 0)
{
- LOGERROR("Could not delete file %s", SourceFile );
+ LOGERROR("Could not delete file %s", SourceFile.c_str());
}
else
{
- LOGINFO("Successfully deleted old format file \"%s\"", SourceFile );
+ LOGINFO("Successfully deleted old format file \"%s\"", SourceFile.c_str());
}
return true;
}
@@ -993,7 +993,7 @@ bool cChunk::SaveToDisk() {
assert(!"Old save format not supported anymore"); // Remove the call to this function
- return true; //no more saving old format!
+ return false; //no more saving old format!
}
|