aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nodedef.cpp3
-rw-r--r--src/tile.cpp6
2 files changed, 7 insertions, 2 deletions
diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index bb08871df..8506d95aa 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -216,7 +216,8 @@ void ContentFeatures::deSerialize(std::istream &is, IGameDef *gamedef)
if(readU8(is) != 6)
throw SerializationError("unsupported tile count");
for(u32 i=0; i<6; i++)
- tname_tiles[i] = deSerializeString(is);
+ setTexture(i, deSerializeString(is));
+ //tname_tiles[i] = deSerializeString(is);
tname_inventory = deSerializeString(is);
if(readU8(is) != CF_SPECIAL_COUNT)
throw SerializationError("unsupported CF_SPECIAL_COUNT");
diff --git a/src/tile.cpp b/src/tile.cpp
index bf0e264c6..29c6b3e67 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -906,10 +906,14 @@ void TextureSource::buildMainAtlas(class IGameDef *gamedef)
for(u32 j=0; j<xwise_tiling; j++)
{
// Copy the copy to the atlas
- img2->copyToWithAlpha(atlas_img,
+ /*img2->copyToWithAlpha(atlas_img,
pos_in_atlas + v2s32(j*dim.Width,0),
core::rect<s32>(v2s32(0,0), dim),
video::SColor(255,255,255,255),
+ NULL);*/
+ img2->copyTo(atlas_img,
+ pos_in_atlas + v2s32(j*dim.Width,0),
+ core::rect<s32>(v2s32(0,0), dim),
NULL);
}