From: Perttu Ahola <celeron55@gmail.com>
Date: Thu, 10 Feb 2011 08:53:17 +0000 (+0200)
Subject: some texture stuff
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=a7b158fada356f886b5c4648a7bd5f8114dca717;p=zefram%2Fminetest%2Fminetest_engine.git

some texture stuff
---

diff --git a/src/main.cpp b/src/main.cpp
index 1e30219c..433ec4fe 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -267,6 +267,9 @@ Doing now (most important at the top):
 # maybe done
 * not done
 
+=== Stuff being done
+* Combine meshes to bigger ones in ClientMap and set them EHM_STATIC
+
 === Stuff to do before release
 * Save the new mapgen stuff
   - map/meta.txt, which should contain only plain text, something like this:
diff --git a/src/mapnode.cpp b/src/mapnode.cpp
index 653195ad..06d1be8a 100644
--- 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 f31f8307..d71055c7 100644
--- 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");