diff --git a/src/voxels/ChunksStorage.hpp b/src/voxels/ChunksStorage.hpp index 2f671ee7..ed9f6342 100644 --- a/src/voxels/ChunksStorage.hpp +++ b/src/voxels/ChunksStorage.hpp @@ -14,19 +14,17 @@ class Level; class VoxelsVolume; class ChunksStorage { - Level* level; - std::unordered_map> chunksMap; + Level* level; + std::unordered_map> chunksMap; public: - ChunksStorage(Level* level); - ~ChunksStorage() = default; + ChunksStorage(Level* level); + ~ChunksStorage() = default; - std::shared_ptr get(int x, int z) const; - void store(std::shared_ptr chunk); - void remove(int x, int y); - void getVoxels(VoxelsVolume* volume, bool backlight=false) const; - std::shared_ptr create(int x, int z); - - light_t getLight(int x, int y, int z, ubyte channel) const; + std::shared_ptr get(int x, int z) const; + void store(std::shared_ptr chunk); + void remove(int x, int y); + void getVoxels(VoxelsVolume* volume, bool backlight=false) const; + std::shared_ptr create(int x, int z); }; diff --git a/src/voxels/DefaultWorldGenerator.hpp b/src/voxels/DefaultWorldGenerator.hpp index 84daabb9..d42e2749 100644 --- a/src/voxels/DefaultWorldGenerator.hpp +++ b/src/voxels/DefaultWorldGenerator.hpp @@ -10,9 +10,9 @@ class Content; class DefaultWorldGenerator : WorldGenerator { public: - DefaultWorldGenerator(const Content* content) : WorldGenerator(content) {} + DefaultWorldGenerator(const Content* content) : WorldGenerator(content) {} - void generate(voxel* voxels, int x, int z, int seed); + void generate(voxel* voxels, int x, int z, int seed); }; -#endif /* VOXELS_DEFAULTWORLDGENERATOR_HPP_ */ +#endif // VOXELS_DEFAULTWORLDGENERATOR_HPP_ diff --git a/src/voxels/FlatWorldGenerator.hpp b/src/voxels/FlatWorldGenerator.hpp index 67189119..c9a2d25f 100644 --- a/src/voxels/FlatWorldGenerator.hpp +++ b/src/voxels/FlatWorldGenerator.hpp @@ -10,9 +10,9 @@ class Content; class FlatWorldGenerator : WorldGenerator { public: - FlatWorldGenerator(const Content* content) : WorldGenerator(content) {} + FlatWorldGenerator(const Content* content) : WorldGenerator(content) {} - void generate(voxel* voxels, int x, int z, int seed); + void generate(voxel* voxels, int x, int z, int seed); }; -#endif /* VOXELS_FLATWORLDGENERATOR_HPP_ */ +#endif // VOXELS_FLATWORLDGENERATOR_HPP_ diff --git a/src/voxels/WorldGenerator.hpp b/src/voxels/WorldGenerator.hpp index 10b92da6..5b8839ac 100644 --- a/src/voxels/WorldGenerator.hpp +++ b/src/voxels/WorldGenerator.hpp @@ -26,4 +26,4 @@ public: virtual void generate(voxel* voxels, int x, int z, int seed) = 0; }; -#endif /* VOXELS_WORLDGENERATOR_HPP_ */ +#endif // VOXELS_WORLDGENERATOR_HPP_