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

small refactoring

Browse source
This commit is contained in:
A-lex-Ra 2024-01-05 13:13:02 +06:00
parent 73595cd558
commit d671188680
7 changed files with 31 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/logic/BlocksController.cpp
View file

@ -70,7 +70,7 @@ void BlocksController::updateBlock(int x, int y, int z) {
if (vox == nullptr)
return;
const Block* def = level->content->indices->getBlockDef(vox->id);
if (def->grounded && !chunks->isSolid(x, y-1, z)) {
if (def->grounded && !chunks->isSolidBlock(x, y-1, z)) {
breakBlock(nullptr, def, x, y, z);
return;
}

2
src/logic/PlayerController.cpp
View file

@ -281,7 +281,7 @@ void PlayerController::updateInteraction(){
if (!level->physics->isBlockInside(x,y,z, player->hitbox)
|| !def->obstacle){
Block* def = contentIds->getBlockDef(chosenBlock);
if (def->grounded && !chunks->isSolid(x, y-1, z)) {
if (def->grounded && !chunks->isSolidBlock(x, y-1, z)) {
chosenBlock = 0;
}
if (chosenBlock != vox->id) {

4
src/logic/scripting/api_lua.cpp
View file

@ -23,7 +23,7 @@ int l_is_solid_at(lua_State* L) {
int y = lua_tointeger(L, 2);
int z = lua_tointeger(L, 3);
lua_pushboolean(L, scripting::level->chunks->isSolid(x, y, z));
lua_pushboolean(L, scripting::level->chunks->isSolidBlock(x, y, z));
return 1;
}
@ -200,7 +200,7 @@ int l_is_replaceable_at(lua_State* L) {
int y = lua_tointeger(L, 2);
int z = lua_tointeger(L, 3);
lua_pushboolean(L, scripting::level->chunks->isReplaceable(x, y, z));
lua_pushboolean(L, scripting::level->chunks->isReplaceableBlock(x, y, z));
return 1;
}