voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-11 05:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'main' into visuals-restoration

Browse source
This commit is contained in:
MihailRis 2025-12-16 01:12:00 +03:00
commit c017273374
20 changed files with 105 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/voxels/GlobalChunks.cpp
View file

@ -70,7 +70,7 @@ void GlobalChunks::erase(int x, int z) {
static inline auto load_inventories(
WorldRegions& regions,
const Chunk& chunk,
const ContentUnitIndices<Block>& defs
const ContentUnitIndices<Block, blockid_t>& defs
) {
auto invs = regions.fetchInventories(chunk.x, chunk.z);
auto iterator = invs.begin();

6
src/voxels/Pathfinding.hpp
View file

@ -11,11 +11,13 @@
#include <unordered_set>
#include <vector>
#include "typedefs.hpp"
class Block;
class Level;
class GlobalChunks;
template <typename T>
template <typename T, typename IdType>
class ContentUnitIndices;
namespace voxels {
@ -82,7 +84,7 @@ namespace voxels {
private:
const Level& level;
const GlobalChunks& chunks;
const ContentUnitIndices<Block>& blockDefs;
const ContentUnitIndices<Block, blockid_t>& blockDefs;
std::unordered_map<int, Agent> agents;
int nextAgent = 1;