diff --git a/src/files/WorldFiles.cpp b/src/files/WorldFiles.cpp index d2f4d81f..49d33168 100644 --- a/src/files/WorldFiles.cpp +++ b/src/files/WorldFiles.cpp @@ -56,12 +56,10 @@ float bytes2Float(ubyte* src, uint offset){ } WorldFiles::WorldFiles(std::string directory, size_t mainBufferCapacity) : directory(directory){ - mainBufferIn = new ubyte[CHUNK_DATA_LEN * 2]; compressionBuffer = new ubyte[CHUNK_DATA_LEN * 2]; } WorldFiles::~WorldFiles(){ - delete[] mainBufferIn; delete[] compressionBuffer; for (auto it = regions.begin(); it != regions.end(); it++){ WorldRegion region = it->second; @@ -224,12 +222,12 @@ void WorldFiles::writePlayer(Player* player){ dst[offset++] = player->flight * PLAYER_FLAG_FLIGHT | player->noclip * PLAYER_FLAG_NOCLIP; - files::write_binary_file(getPlayerFile(), (const char*)dst, sizeof(dst)); + files::write_bytes(getPlayerFile(), (const char*)dst, sizeof(dst)); } bool WorldFiles::readPlayer(Player* player) { size_t length = 0; - ubyte* data = (ubyte*)files::read_binary_file(getPlayerFile(), length); + ubyte* data = (ubyte*)files::read_bytes(getPlayerFile(), length); if (data == nullptr){ std::cerr << "could not to read player.bin (ignored)" << std::endl; return false; diff --git a/src/files/WorldFiles.h b/src/files/WorldFiles.h index 221058da..4c0bbad5 100644 --- a/src/files/WorldFiles.h +++ b/src/files/WorldFiles.h @@ -29,7 +29,6 @@ class WorldFiles { public: std::unordered_map regions; std::string directory; - ubyte* mainBufferIn; ubyte* compressionBuffer; WorldFiles(std::string directory, size_t mainBufferCapacity); diff --git a/src/files/files.cpp b/src/files/files.cpp index 595ea936..a36fc42c 100644 --- a/src/files/files.cpp +++ b/src/files/files.cpp @@ -11,7 +11,7 @@ using std::unique_ptr; using std::ifstream; using std::ofstream; -bool files::write_binary_file(string filename, const char* data, size_t size) { +bool files::write_bytes(string filename, const char* data, size_t size) { ofstream output(filename, ios::binary); if (!output.is_open()) return false; @@ -20,17 +20,17 @@ bool files::write_binary_file(string filename, const char* data, size_t size) { return true; } -unsigned int files::append_binary_file(string filename, const char* data, size_t size) { +uint files::append_bytes(string filename, const char* data, size_t size) { ofstream output(filename, ios::binary | ios::app); if (!output.is_open()) return 0; - unsigned int position = output.tellp(); + uint position = output.tellp(); output.write(data, size); output.close(); return position; } -bool files::read_binary_file(string filename, char* data, size_t size) { +bool files::read(string filename, char* data, size_t size) { ifstream output(filename, ios::binary); if (!output.is_open()) return false; @@ -39,7 +39,7 @@ bool files::read_binary_file(string filename, char* data, size_t size) { return true; } -char* files::read_binary_file(string filename, size_t& length) { +char* files::read_bytes(string filename, size_t& length) { ifstream input(filename, ios::binary); if (!input.is_open()) return nullptr; @@ -55,7 +55,7 @@ char* files::read_binary_file(string filename, size_t& length) { std::string files::read_string(string filename) { size_t size; - unique_ptr chars (read_binary_file(filename, size)); + unique_ptr chars (read_bytes(filename, size)); return string(chars.get(), size); } diff --git a/src/files/files.h b/src/files/files.h index a11cd29f..8c473b69 100644 --- a/src/files/files.h +++ b/src/files/files.h @@ -5,10 +5,10 @@ #include "../typedefs.h" namespace files { - extern bool write_binary_file(std::string filename, const char* data, size_t size); - extern unsigned int append_binary_file(std::string filename, const char* data, size_t size); - extern bool read_binary_file(std::string filename, char* data, size_t size); - extern char* read_binary_file(std::string filename, size_t& length); + extern bool write_bytes(std::string filename, const char* data, size_t size); + extern uint append_bytes(std::string filename, const char* data, size_t size); + extern bool read(std::string filename, char* data, size_t size); + extern char* read_bytes(std::string filename, size_t& length); extern std::string read_string(std::string filename); extern bool write_string(std::string filename, const std::string content); }