diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-14 22:43:22 +0200 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-14 22:43:28 +0200 |
| commit | af05e4b2defde537f3b953a7dae0ef44fae225aa (patch) | |
| tree | 3f751014432b35df1cc2fd6fb976410e86b70e73 /src/content_mapblock.cpp | |
| parent | 4415d95c503f083d871abaf84516f2b6487ecb60 (diff) | |
| parent | 81535f6277b66c869cda7125b2aeaf99e8078b92 (diff) | |
| download | minetest-af05e4b2defde537f3b953a7dae0ef44fae225aa.tar.gz minetest-af05e4b2defde537f3b953a7dae0ef44fae225aa.tar.bz2 minetest-af05e4b2defde537f3b953a7dae0ef44fae225aa.zip | |
Merge branch 'upstream/master'
Conflicts:
data/oerkki1.png
src/client.cpp
Diffstat (limited to 'src/content_mapblock.cpp')
| -rw-r--r-- | src/content_mapblock.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp index 9ef0599d1..4c28fe3c6 100644 --- a/src/content_mapblock.cpp +++ b/src/content_mapblock.cpp @@ -272,7 +272,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data, /* Signs on walls */ - if(n.d == CONTENT_SIGN_WALL) + else if(n.d == CONTENT_SIGN_WALL) { u8 l = decode_light(n.getLightBlend(data->m_daynight_ratio)); video::SColor c(255,l,l,l); |