diff options
| -rwxr-xr-x | makepackage_binary.sh | 5 | ||||
| -rw-r--r-- | src/main.cpp | 2 | ||||
| -rw-r--r-- | src/mapnode.h | 8 |
3 files changed, 12 insertions, 3 deletions
diff --git a/makepackage_binary.sh b/makepackage_binary.sh index 67431c957..8474ba52d 100755 --- 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 d50491a4b..03d194d71 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2353,7 +2353,7 @@ int main(int argc, char *argv[]) i != chat_lines.end(); i++)
{
(*i).age += dtime;
- if((*i).age > 30.0)
+ if((*i).age > 60.0)
{
to_be_removed_count++;
continue;
diff --git a/src/mapnode.h b/src/mapnode.h index 659d585b5..c61732922 100644 --- 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) |