Rename NODE_INVALID to NODE_UNKNOWN

diff --git a/src/client/client.c b/src/client/client.c
index 778f4e122aac01d6a5bdb484f6b2847ee2c1e455..ac24c2f2bd2fcc2f6ebb0e76b0a868bcc041ca23 100644 (file)
--- a/src/client/client.c
+++ b/src/client/client.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <arpa/inet.h>
 #include <unistd.h>
 #include <errno.h>
 #include <netdb.h>

diff --git a/src/client/client_node.c b/src/client/client_node.c
index 144afa021b55933d6495031b93dc544b5d09739f..886eaa7d8df75a167fcb51eacd0d5df3d65e6911 100644 (file)
--- a/src/client/client_node.c
+++ b/src/client/client_node.c
@@ -40,9 +40,9 @@ static void render_wood(unused v3s32 pos, unused MapNode *node, Vertex3D *vertex
 }
 
 ClientNodeDefintion client_node_definitions[NODE_UNLOADED] = {
-       // invalid
+       // unknown
        {
-               .tiles = TILES_SIMPLE(RESSOURCEPATH "textures/invalid.png"),
+               .tiles = TILES_SIMPLE(RESSOURCEPATH "textures/unknown.png"),
                .visibility = NV_SOLID,
                .render = NULL,
        },
@@ -114,7 +114,7 @@ ClientNodeDefintion client_node_definitions[NODE_UNLOADED] = {
 
 void client_node_init()
 {
-       for (Node node = NODE_INVALID; node < NODE_UNLOADED; node++) {
+       for (Node node = NODE_UNKNOWN; node < NODE_UNLOADED; node++) {
                ClientNodeDefintion *def = &client_node_definitions[node];
 
                if (client_node_definitions[node].visibility != NV_NONE) {

diff --git a/src/map.c b/src/map.c
index 0e82f3ec392e34c9f7a8e85581448fbf2af963b4..db56bca0fcfb2e88cb739edc1433f34c4045aed1 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -147,7 +147,7 @@ bool map_deserialize_node(int fd, MapNode *node)
                return false;
 
        if (type >= NODE_UNLOADED)
-               type = NODE_INVALID;
+               type = NODE_UNKNOWN;
 
        *node = map_node_create(type);
 
@@ -182,7 +182,7 @@ bool map_deserialize_block(MapBlock *block, const char *data, size_t size)
                node.type = be32toh(node.type);
 
                if (node.type >= NODE_UNLOADED)
-                       node.type = NODE_INVALID;
+                       node.type = NODE_UNKNOWN;
 
                if (node_definitions[node.type].deserialize)
                        node_definitions[node.type].deserialize(&node);

diff --git a/src/node.c b/src/node.c
index ac94ea7259128ff732110555b1a131296d18656b..0fe7ce9944e33655e9eb7eacb94069567cd79827 100644 (file)
--- a/src/node.c
+++ b/src/node.c
@@ -3,7 +3,7 @@
 #include "util.h"
 
 NodeDefintion node_definitions[NODE_UNLOADED] = {
-       // invalid
+       // unknown
        {
                .solid = true,
                .create = NULL,

diff --git a/src/node.h b/src/node.h
index 45e5231604b902e52b54200fd67b744d0972785a..bf668449a03784f5be050f1d18313b0021b01122 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -6,7 +6,7 @@
 
 typedef enum
 {
-       NODE_INVALID,           // Used for unknown nodes received from server (caused by outdated clients)
+       NODE_UNKNOWN,           // Used for unknown nodes received from server (caused by outdated clients)
        NODE_AIR,
        NODE_GRASS,
        NODE_DIRT,

diff --git a/textures/invalid.png b/textures/invalid.png
deleted file mode 100644 (file)
index c04d569..0000000
Binary files a/textures/invalid.png and /dev/null differ

diff --git a/textures/unknown.png b/textures/unknown.png
new file mode 100644 (file)
index 0000000..c04d569
Binary files /dev/null and b/textures/unknown.png differ