PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: conditional jump or move depends on uninitialised value

Browse Source
This commit is contained in:
MihailRis
2024-10-18 07:56:18 +03:00
parent 552740b87b
commit 955e5257d5
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/logic/BlocksController.cpp
+4 -3
View File
@@ -5,6 +5,7 @@
#include "items/Inventory.hpp" #include "items/Inventory.hpp"
#include "lighting/Lighting.hpp" #include "lighting/Lighting.hpp"
#include "maths/fastmaths.hpp" #include "maths/fastmaths.hpp"
#include "scripting/scripting.hpp"
#include "util/timeutil.hpp" #include "util/timeutil.hpp"
#include "voxels/Block.hpp" #include "voxels/Block.hpp"
#include "voxels/Chunk.hpp" #include "voxels/Chunk.hpp"
@@ -12,7 +13,6 @@
#include "voxels/voxel.hpp" #include "voxels/voxel.hpp"
#include "world/Level.hpp" #include "world/Level.hpp"
#include "world/World.hpp" #include "world/World.hpp"
#include "scripting/scripting.hpp"
BlocksController::BlocksController(Level* level, uint padding) BlocksController::BlocksController(Level* level, uint padding)
: level(level), : level(level),
@@ -111,7 +111,7 @@ void BlocksController::randomTick(
int bx = random.rand() % CHUNK_W; int bx = random.rand() % CHUNK_W;
int by = random.rand() % segheight + s * segheight; int by = random.rand() % segheight + s * segheight;
int bz = random.rand() % CHUNK_D; int bz = random.rand() % CHUNK_D;
const voxel& vox = chunk.voxels[(by * CHUNK_D + bz) * CHUNK_W + bx]; const voxel& vox = chunk.voxels[vox_index(bx, by, bz)];
auto& block = indices->blocks.require(vox.id); auto& block = indices->blocks.require(vox.id);
if (block.rt.funcsset.randupdate) { if (block.rt.funcsset.randupdate) {
scripting::random_update_block( scripting::random_update_block(
@@ -153,7 +153,8 @@ int64_t BlocksController::createBlockInventory(int x, int y, int z) {
auto inv = chunk->getBlockInventory(lx, y, lz); auto inv = chunk->getBlockInventory(lx, y, lz);
if (inv == nullptr) { if (inv == nullptr) {
auto indices = level->content->getIndices(); auto indices = level->content->getIndices();
auto& def = indices->blocks.require(chunk->voxels[vox_index(lx, y, lz)].id); auto& def =
indices->blocks.require(chunk->voxels[vox_index(lx, y, lz)].id);
int invsize = def.inventorySize; int invsize = def.inventorySize;
if (invsize == 0) { if (invsize == 0) {
return 0; return 0;
src/logic/BlocksController.hpp
+1 -1
View File
@@ -31,7 +31,7 @@ class BlocksController {
util::Clock blocksTickClock; util::Clock blocksTickClock;
util::Clock worldTickClock; util::Clock worldTickClock;
uint padding; uint padding;
FastRandom random; FastRandom random {};
std::vector<on_block_interaction> blockInteractionCallbacks; std::vector<on_block_interaction> blockInteractionCallbacks;
public: public:
BlocksController(Level* level, uint padding); BlocksController(Level* level, uint padding);