diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-11-15 22:41:49 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-29 19:13:45 +0200 |
| commit | cde35d160600bb97c62c48fd1924c98d23a6ac98 (patch) | |
| tree | 66606110acdfb3d68534ca6a2d4846633555699f /src/content_mapnode.cpp | |
| parent | 9fc78cbece4d26307dab814d8073fc0a1db90bf9 (diff) | |
| download | minetest-cde35d160600bb97c62c48fd1924c98d23a6ac98.tar.gz minetest-cde35d160600bb97c62c48fd1924c98d23a6ac98.tar.bz2 minetest-cde35d160600bb97c62c48fd1924c98d23a6ac98.zip | |
Clean nodefeat and content_mapnode a bit
Diffstat (limited to 'src/content_mapnode.cpp')
| -rw-r--r-- | src/content_mapnode.cpp | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp index e2cf57010..2fce337fc 100644 --- a/src/content_mapnode.cpp +++ b/src/content_mapnode.cpp @@ -427,7 +427,8 @@ void content_mapnode_init(IWritableNodeDefManager *nodemgr) i = CONTENT_WATER; f = nodemgr->getModifiable(i); f->drawtype = NDT_FLOWINGLIQUID; - f->setAllTextures("water.png", WATER_ALPHA); + f->setAllTextures("water.png"); + f->alpha = WATER_ALPHA; f->setInventoryTextureCube("water.png", "water.png", "water.png"); f->param_type = CPT_LIGHT; f->light_propagates = true; @@ -440,17 +441,14 @@ void content_mapnode_init(IWritableNodeDefManager *nodemgr) f->liquid_alternative_source = CONTENT_WATERSOURCE; f->liquid_viscosity = WATER_VISC; f->post_effect_color = video::SColor(64, 100, 100, 200); - // Flowing water material - f->mspec_special[0].tname = "water.png"; - f->mspec_special[0].backface_culling = false; - f->mspec_special[1].tname = "water.png"; - f->mspec_special[1].backface_culling = true; + f->setSpecialMaterial(0, MaterialSpec("water.png", false)); + f->setSpecialMaterial(1, MaterialSpec("water.png", true)); i = CONTENT_WATERSOURCE; f = nodemgr->getModifiable(i); f->drawtype = NDT_LIQUID; - f->setAllTextures("water.png", WATER_ALPHA); - //f->setInventoryTexture("water.png"); + f->setAllTextures("water.png"); + f->alpha = WATER_ALPHA; f->setInventoryTextureCube("water.png", "water.png", "water.png"); f->param_type = CPT_LIGHT; f->light_propagates = true; @@ -465,8 +463,7 @@ void content_mapnode_init(IWritableNodeDefManager *nodemgr) f->liquid_viscosity = WATER_VISC; f->post_effect_color = video::SColor(64, 100, 100, 200); // New-style water source material (mostly unused) - f->mspec_special[0].tname = "water.png"; - f->mspec_special[0].backface_culling = false; + f->setSpecialMaterial(0, MaterialSpec("water.png", false)); i = CONTENT_LAVA; f = nodemgr->getModifiable(i); @@ -486,11 +483,8 @@ void content_mapnode_init(IWritableNodeDefManager *nodemgr) f->liquid_viscosity = LAVA_VISC; f->damage_per_second = 4*2; f->post_effect_color = video::SColor(192, 255, 64, 0); - // Flowing lava material - f->mspec_special[0].tname = "lava.png"; - f->mspec_special[0].backface_culling = false; - f->mspec_special[1].tname = "lava.png"; - f->mspec_special[1].backface_culling = true; + f->setSpecialMaterial(0, MaterialSpec("lava.png", false)); + f->setSpecialMaterial(1, MaterialSpec("lava.png", true)); i = CONTENT_LAVASOURCE; f = nodemgr->getModifiable(i); @@ -512,8 +506,7 @@ void content_mapnode_init(IWritableNodeDefManager *nodemgr) f->damage_per_second = 4*2; f->post_effect_color = video::SColor(192, 255, 64, 0); // New-style lava source material (mostly unused) - f->mspec_special[0].tname = "lava.png"; - f->mspec_special[0].backface_culling = false; + f->setSpecialMaterial(0, MaterialSpec("lava.png", false)); i = CONTENT_TORCH; f = nodemgr->getModifiable(i); |