Fix loading bugs

heimskr · May 5, 2023 · d849d3b · d849d3b
1 parent 8bcd377
commit d849d3b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/include/util/GL.h b/include/util/GL.h
@@ -103,8 +103,6 @@ namespace GL {
 			throw std::runtime_error("Couldn't generate buffer object");
 		glBindBuffer(target, bo); CHECKGL
 		glBufferData(target, count * sizeof(T), data, usage); CHECKGL
-		if (bo == 3800)
-			raise(SIGTRAP);
 		return bo;
 	}
 

diff --git a/src/game/TileProvider.cpp b/src/game/TileProvider.cpp
@@ -289,13 +289,13 @@ namespace Game3 {
 		}
 
 		for (const auto &item: json.at(2)) {
-			const auto [x, y] = item.at(1).get<std::pair<int32_t, int32_t>>();
+			const auto [x, y] = item.at(0).get<std::pair<int32_t, int32_t>>();
 			const auto compressed = item.at(1).get<std::vector<uint8_t>>();
 			provider.biomeMap[ChunkPosition{x, y}] = decompress32(std::span(compressed.data(), compressed.size()));
 		}
 
-		for (const auto &item: json.at(2)) {
-			const auto [x, y] = item.at(1).get<std::pair<int32_t, int32_t>>();
+		for (const auto &item: json.at(3)) {
+			const auto [x, y] = item.at(0).get<std::pair<int32_t, int32_t>>();
 			const auto compressed = item.at(1).get<std::vector<uint8_t>>();
 			provider.pathMap[ChunkPosition{x, y}] = decompress8(std::span(compressed.data(), compressed.size()));
 		}

diff --git a/src/util/Zstd.cpp b/src/util/Zstd.cpp
@@ -41,10 +41,10 @@ namespace Game3 {
 		out.reserve(decompressed.size() / 2);
 
 		if constexpr (std::endian::native == std::endian::little) {
-			for (size_t i = 0, max = decompressed.size() / 2; i < max; i += 2)
+			for (size_t i = 0, max = decompressed.size(); i < max; i += 2)
 				out.emplace_back(*reinterpret_cast<const uint16_t *>(&decompressed[i]));
 		} else {
-			for (size_t i = 0, max = decompressed.size() / 2; i < max; i += 2)
+			for (size_t i = 0, max = decompressed.size(); i < max; i += 2)
 				out.emplace_back(decompressed[i] | (static_cast<uint16_t>(decompressed[i + 1]) << 8));
 		}
 
@@ -57,10 +57,10 @@ namespace Game3 {
 		out.reserve(decompressed.size() / 2);
 
 		if constexpr (std::endian::native == std::endian::little) {
-			for (size_t i = 0, max = decompressed.size() / 2; i < max; i += 2)
+			for (size_t i = 0, max = decompressed.size(); i < max; i += 4)
 				out.emplace_back(*reinterpret_cast<const uint32_t *>(&decompressed[i]));
 		} else {
-			for (size_t i = 0, max = decompressed.size() / 2; i < max; i += 2)
+			for (size_t i = 0, max = decompressed.size(); i < max; i += 4)
 				out.emplace_back(decompressed[i] | (static_cast<uint32_t>(decompressed[i + 1]) <<  8)
 				                                 | (static_cast<uint32_t>(decompressed[i + 2]) << 16)
 				                                 | (static_cast<uint32_t>(decompressed[i + 3]) << 24));