This commit is contained in:
MihailRis
2023-11-16 20:28:20 +03:00
parent 0ec7f3348e
commit 47e24cb468
3 changed files with 11 additions and 11 deletions
+2 -2
View File
@@ -227,13 +227,13 @@ void WorldFiles::writeWorldInfo(const WorldInfo& info) {
bool WorldFiles::readWorldInfo(WorldInfo& info) {
size_t length = 0;
ubyte* data = (ubyte*)files::read_bytes(getPlayerFile(), length);
ubyte* data = (ubyte*)files::read_bytes(getWorldFile(), length);
if (data == nullptr){
std::cerr << "could not to read world.bin (ignored)" << std::endl;
return false;
}
BinaryReader inp(data, length);
inp.checkMagic(WORLD_FORMAT_MAGIC, length);
inp.checkMagic(WORLD_FORMAT_MAGIC, 8);
/*ubyte version = */inp.get();
while (inp.hasNext()) {
ubyte section = inp.get();
+1 -1
View File
@@ -128,7 +128,7 @@ float BinaryReader::getFloat32() {
string BinaryReader::getString() {
uint16_t length = (uint16_t)getInt16();
if (pos+length >= size) {
if (pos+length > size) {
throw std::underflow_error("unexpected end");
}
pos += length;