slight map generation bugs

diff --git a/makepackage_binary.sh b/makepackage_binary.sh
index 67431c9579d5685f50fc6e58bc2384a3a65bec35..8474ba52d8b46e7607639226bccb46cc9c4f9d7b 100755 (executable)
--- a/makepackage_binary.sh
+++ b/makepackage_binary.sh
@@ -45,6 +45,11 @@ cp -r data/tree_top.png $PACKAGEPATH/data/
 cp -r data/mud_with_grass.png $PACKAGEPATH/data/
 cp -r data/coalstone.png $PACKAGEPATH/data/
 cp -r data/crack.png $PACKAGEPATH/data/
+cp -r data/wood.png $PACKAGEPATH/data/
+cp -r data/stick.png $PACKAGEPATH/data/
+cp -r data/tool_wpick.png $PACKAGEPATH/data/
+cp -r data/tool_stpick.png $PACKAGEPATH/data/
+cp -r data/tool_mesepick.png $PACKAGEPATH/data/
 
 #cp -r data/pauseMenu.gui $PACKAGEPATH/data/
 

diff --git a/src/main.cpp b/src/main.cpp
index d50491a4b8c8ce307afc328e82693b9a3407cf69..03d194d714996657e8c58511518d38e7ab57c05b 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2353,7 +2353,7 @@ int main(int argc, char *argv[])
                                        i != chat_lines.end(); i++)\r
                        {\r
                                (*i).age += dtime;\r
-                               if((*i).age > 30.0)\r
+                               if((*i).age > 60.0)\r
                                {\r
                                        to_be_removed_count++;\r
                                        continue;\r

diff --git a/src/mapnode.h b/src/mapnode.h
index 659d585b5fc3b1ba959d04c2783b5eb98205a202..c6173292271c7d96db7ab2b3b7db6479b573331e 100644 (file)
--- a/src/mapnode.h
+++ b/src/mapnode.h
@@ -155,12 +155,16 @@ inline bool content_buildable_to(u8 m)
 */
 inline bool is_ground_content(u8 m)
 {
-       return (m != CONTENT_WATER
+       return (
+               m != CONTENT_IGNORE
+               && m != CONTENT_AIR
+               && m != CONTENT_WATER
                && m != CONTENT_TORCH
                && m != CONTENT_TREE
                && m != CONTENT_LEAVES
                && m != CONTENT_OCEAN
-               && m != CONTENT_CLOUD);
+               && m != CONTENT_CLOUD
+       );
 }
 
 inline bool is_mineral(u8 c)