benkyd/minceraft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Farmland is reverted to dirt whenever something is placed on top of it

Browse Source
This commit is contained in:
CobaltXII
2019-01-03 19:42:41 -05:00
parent a2a5111c7e
commit 1d96dd59a5
1 changed files with 18 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/main.cpp
View File

@@ -90,7 +90,7 @@ int main(int argc, char** argv)
SDL_Window* sdl_window = SDL_CreateWindow SDL_Window* sdl_window = SDL_CreateWindow
( (
"Minceraft 0.3.14", "Minceraft 0.3.74",
SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
@@ -173,18 +173,10 @@ int main(int argc, char** argv)
GLuint block_texture_array = load_block_texture_array(); GLuint block_texture_array = load_block_texture_array();
// Load the interface textures.
load_interface_textures();
// Load the block face_info* array. // Load the block face_info* array.
load_block_face_info_array(); load_block_face_info_array();
// Load sprite preliminaries.
load_sprite_preliminaries();
// Load the block shader program. // Load the block shader program.
GLuint block_shader_program = load_program("../glsl/block_vertex.glsl", "../glsl/block_fragment.glsl"); GLuint block_shader_program = load_program("../glsl/block_vertex.glsl", "../glsl/block_fragment.glsl");
@@ -212,18 +204,18 @@ int main(int argc, char** argv)
block_id player_inventory[9] = block_id player_inventory[9] =
{ {
id_cobblestone, id_dirt,
id_stone_slab,
id_sandstone,
id_sandstone_slab,
id_brick,
id_grass, id_grass,
id_dry_farmland,
id_wet_farmland,
id_furnace,
id_crafting_table,
id_oak_planks, id_oak_planks,
id_oak_log, id_oak_log,
@@ -408,7 +400,7 @@ int main(int argc, char** argv)
// Define the view distance. // Define the view distance.
float view_distance = 256.0f; float view_distance = 64.0f;
// Define the reach distance. // Define the reach distance.
@@ -806,24 +798,15 @@ int main(int argc, char** argv)
block_timer = 10; block_timer = 10;
} }
// All cross blocks are destroyed and replaced // id_dry_farmland and id_wet_farmland are
// by water. // reverted to id_dirt when anything other
// than crops are placed on top of them.
if (is_cross(place_id)) block_id farmland_below = the_world->get_id_safe(px, py + 1, pz);
if (farmland_below == id_dry_farmland || farmland_below == id_wet_farmland)
{ {
if the_accessor->set_id_safe(px, py + 1, pz, id_dirt);
(
the_world->get_id_safe(px + 1, py, pz) == id_water ||
the_world->get_id_safe(px - 1, py, pz) == id_water ||
the_world->get_id_safe(px, py, pz + 1) == id_water ||
the_world->get_id_safe(px, py, pz - 1) == id_water ||
the_world->get_id_safe(px, py - 1, pz) == id_water
)
{
the_accessor->set_id_safe(px, py, pz, id_water);
}
} }
break; break;