Use Windows-compatible linenoise

[dragonblocks_alpha.git] / src / node.c

diff --git a/src/node.c b/src/node.c
index 54b62941b2f9b8e5bbe4edf12850631f4876f013..e79352b5f2fc5c3a3d47178dd0ed39628a1d15c9 100644 (file)
--- a/src/node.c
+++ b/src/node.c
@@ -3,147 +3,85 @@
 #include "terrain.h"
 #include "types.h"
 
-NodeDef node_def[NODE_UNLOADED] = {
+NodeDef node_def[COUNT_NODE] = {
        // unknown
        {
                .solid = true,
-               .data_size = 0,
                .dig_class = DIG_NONE,
-               .callbacks = {NULL},
        },
        // air
        {
                .solid = false,
-               .data_size = 0,
                .dig_class = DIG_NONE,
-               .callbacks = {NULL},
        },
        // grass
        {
                .solid = true,
-               .data_size = 0,
                .dig_class = DIG_DIRT,
-               .callbacks = {NULL},
        },
        // dirt
        {
                .solid = true,
-               .data_size = 0,
                .dig_class = DIG_DIRT,
-               .callbacks = {NULL},
        },
        // stone
        {
                .solid = true,
-               .data_size = 0,
                .dig_class = DIG_STONE,
-               .callbacks = {NULL},
        },
        // snow
        {
                .solid = true,
-               .data_size = 0,
                .dig_class = DIG_DIRT,
-               .callbacks = {NULL},
        },
        // oak wood
        {
                .solid = true,
-               .data_size = sizeof(ColorData),
                .dig_class = DIG_WOOD,
-               .callbacks = {
-                       .create = NULL,
-                       .delete = NULL,
-                       .serialize = (void *) &ColorData_write,
-                       .deserialize = (void *) &ColorData_read,
-               },
        },
        // oak leaves
        {
                .solid = true,
-               .data_size = sizeof(ColorData),
                .dig_class = DIG_LEAVES,
-               .callbacks = {
-                       .create = NULL,
-                       .delete = NULL,
-                       .serialize = (void *) &ColorData_write,
-                       .deserialize = (void *) &ColorData_read,
-               },
        },
        // pine wood
        {
                .solid = true,
-               .data_size = sizeof(ColorData),
                .dig_class = DIG_WOOD,
-               .callbacks = {
-                       .create = NULL,
-                       .delete = NULL,
-                       .serialize = (void *) &ColorData_write,
-                       .deserialize = (void *) &ColorData_read,
-               },
        },
        // pine leaves
        {
                .solid = true,
-               .data_size = sizeof(ColorData),
                .dig_class = DIG_LEAVES,
-               .callbacks = {
-                       .create = NULL,
-                       .delete = NULL,
-                       .serialize = (void *) &ColorData_write,
-                       .deserialize = (void *) &ColorData_read,
-               },
        },
        // palm wood
        {
                .solid = true,
-               .data_size = sizeof(ColorData),
                .dig_class = DIG_WOOD,
-               .callbacks = {
-                       .create = NULL,
-                       .delete = NULL,
-                       .serialize = (void *) &ColorData_write,
-                       .deserialize = (void *) &ColorData_read,
-               },
        },
        // palm leaves
        {
                .solid = true,
-               .data_size = sizeof(ColorData),
                .dig_class = DIG_LEAVES,
-               .callbacks = {
-                       .create = NULL,
-                       .delete = NULL,
-                       .serialize = (void *) &ColorData_write,
-                       .deserialize = (void *) &ColorData_read,
-               },
        },
        // sand
        {
                .solid = true,
-               .data_size = 0,
                .dig_class = DIG_DIRT,
-               .callbacks = {NULL},
        },
        // water
        {
                .solid = false,
-               .data_size = 0,
                .dig_class = DIG_NONE,
-               .callbacks = {NULL},
        },
        // lava
        {
                .solid = false,
-               .data_size = 0,
                .dig_class = DIG_NONE,
-               .callbacks = {NULL},
        },
        // vulcanostone
        {
                .solid = true,
-               .data_size = 0,
                .dig_class = DIG_STONE,
-               .callbacks = {NULL},
        },
 };