diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-06-27 06:56:26 -0700 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-06-27 06:56:26 -0700 |
| commit | 1c90f9fc2eba43be71f9d49dad75c5d0514d4e50 (patch) | |
| tree | 63c1116ff43936475874b54d171c7e08556d54ee /src/tile.cpp | |
| parent | 158b054e72582005d895f1ed0e1cb0c9b22a8e57 (diff) | |
| parent | 7efe89ff584b2c0338dcede4c1e08504d0158780 (diff) | |
| download | minetest-1c90f9fc2eba43be71f9d49dad75c5d0514d4e50.tar.gz minetest-1c90f9fc2eba43be71f9d49dad75c5d0514d4e50.tar.bz2 minetest-1c90f9fc2eba43be71f9d49dad75c5d0514d4e50.zip | |
Merge pull request #13 from Bahamada/upstream_merge
Upstream merge
Diffstat (limited to 'src/tile.cpp')
| -rw-r--r-- | src/tile.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/tile.cpp b/src/tile.cpp index 77084bf10..23fa1129d 100644 --- a/src/tile.cpp +++ b/src/tile.cpp @@ -506,22 +506,17 @@ void TextureSource::buildMainAtlas() sourcelist.push_back("stone.png"); sourcelist.push_back("mud.png"); sourcelist.push_back("sand.png"); - sourcelist.push_back("sandstone.png"); - sourcelist.push_back("clay.png"); - sourcelist.push_back("brick.png"); sourcelist.push_back("grass.png"); sourcelist.push_back("grass_footsteps.png"); sourcelist.push_back("tree.png"); sourcelist.push_back("tree_top.png"); sourcelist.push_back("water.png"); sourcelist.push_back("leaves.png"); - sourcelist.push_back("cactus_side.png"); - sourcelist.push_back("cactus_top.png"); - sourcelist.push_back("papyrus.png"); - sourcelist.push_back("bookshelf.png"); sourcelist.push_back("glass.png"); sourcelist.push_back("mud.png^grass_side.png"); sourcelist.push_back("cobble.png"); + sourcelist.push_back("mossycobble.png"); + sourcelist.push_back("gravel.png"); sourcelist.push_back("stone.png^mineral_coal.png"); sourcelist.push_back("stone.png^mineral_iron.png"); @@ -1092,7 +1087,7 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg, imagename_right, device); assert(img_top && img_left && img_right); - // FIXME: Create textures from left and right images + // TODO: Create textures from images video::ITexture *texture_top = driver->addTexture( (imagename_top + "__temp__").c_str(), img_top); assert(texture_top); |