summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-02-10 10:53:17 +0200
committerPerttu Ahola <celeron55@gmail.com>2011-02-10 10:53:17 +0200
commita7b158fada356f886b5c4648a7bd5f8114dca717 (patch)
tree60783ba77ce26e7794c9dc2c437c93565af3e552 /src
parent1704badc306fc8c7c6609aff9f809aee3ac00d3a (diff)
downloadminetest-a7b158fada356f886b5c4648a7bd5f8114dca717.tar.gz
minetest-a7b158fada356f886b5c4648a7bd5f8114dca717.tar.bz2
minetest-a7b158fada356f886b5c4648a7bd5f8114dca717.zip
some texture stuff
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp3
-rw-r--r--src/mapnode.cpp3
-rw-r--r--src/tile.cpp2
3 files changed, 7 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 1e30219c5..433ec4fe0 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 653195ad4..06d1be8a3 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 f31f83076..d71055c7a 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");