some texture stuff

diff --git a/src/main.cpp b/src/main.cpp
index 1e30219c59e5df78ad521b245be850f5d8b906d0..433ec4fe07ad9516c26d6cc7b9efd2bd13169d29 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -267,6 +267,9 @@ Doing now (most important at the top):
 # maybe done\r
 * not done\r
 \r
+=== Stuff being done\r
+* Combine meshes to bigger ones in ClientMap and set them EHM_STATIC\r
+\r
 === Stuff to do before release\r
 * Save the new mapgen stuff\r
   - map/meta.txt, which should contain only plain text, something like this:\r

diff --git a/src/mapnode.cpp b/src/mapnode.cpp
index 653195ad47e16c8deb7609c973ce4995044aabca..06d1be8a3ba0f16d32cdf245e5f48c2987f7c114 100644 (file)
--- a/src/mapnode.cpp
+++ b/src/mapnode.cpp
@@ -103,6 +103,9 @@ void init_mapnode(IIrrlichtWrapper *irrlicht)
        i = CONTENT_GRASS_FOOTSTEPS;
        f = &g_content_features[i];
        //f->setInventoryTexture(irrlicht->getTextureId("grass_footsteps.png"));
+       f->setAllTextures("mud.png^grass_side.png");
+       f->setTexture(0, "grass_footsteps.png");
+       f->setTexture(1, "mud.png");
        f->param_type = CPT_MINERAL;
        f->is_ground_content = true;
        

diff --git a/src/tile.cpp b/src/tile.cpp
index f31f830762fb8096f3c0fcc3b061345343a02fd7..d71055c7a33b85317a049d549af3a4f3a36b49c4 100644 (file)
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -373,7 +373,7 @@ void TextureSource::buildMainAtlas()
        sourcelist.push_back("mud.png");
        sourcelist.push_back("sand.png");
        sourcelist.push_back("grass.png");
-       sourcelist.push_back("mud.png");
+       sourcelist.push_back("grass_footsteps.png");
        sourcelist.push_back("tree.png");
        sourcelist.push_back("tree_top.png");
        sourcelist.push_back("water.png");