diff options
author | Kahrl <kahrl@gmx.net> | 2011-11-26 00:09:36 +0200 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-29 19:13:52 +0200 |
commit | c1479a273266709d6d0775c690dce31a7a430aa5 (patch) | |
tree | df1a47c7c0b8d923392f6476fdbaf41a15ed11cb /src/environment.cpp | |
parent | 1f53ca5f4c2736ab060d93885d9bd956f14ae430 (diff) | |
download | minetest-c1479a273266709d6d0775c690dce31a7a430aa5.tar.gz minetest-c1479a273266709d6d0775c690dce31a7a430aa5.tar.bz2 minetest-c1479a273266709d6d0775c690dce31a7a430aa5.zip |
Add node definitions in Lua and do not use content_mapnode_init anymore (except in test.cpp)
Diffstat (limited to 'src/environment.cpp')
-rw-r--r-- | src/environment.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/environment.cpp b/src/environment.cpp index 5206ecc5d..f1278a64b 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -644,7 +644,8 @@ void ServerEnvironment::activateBlock(MapBlock *block, u32 additional_dtime) if(dtime_s > 300) { MapNode n_top = block->getNodeNoEx(p0+v3s16(0,1,0)); - if(m_gamedef->ndef()->get(n_top).air_equivalent && + if(m_gamedef->ndef()->get(n_top).light_propagates && + !m_gamedef->ndef()->get(n_top).isLiquid() && n_top.getLight(LIGHTBANK_DAY, m_gamedef->ndef()) >= 13) { n.setContent(LEGN(m_gamedef->ndef(), "CONTENT_GRASS")); @@ -1018,7 +1019,8 @@ void ServerEnvironment::step(float dtime) if(myrand()%20 == 0) { MapNode n_top = m_map->getNodeNoEx(p+v3s16(0,1,0)); - if(m_gamedef->ndef()->get(n_top).air_equivalent && + if(m_gamedef->ndef()->get(n_top).light_propagates && + !m_gamedef->ndef()->get(n_top).isLiquid() && n_top.getLightBlend(getDayNightRatio(), m_gamedef->ndef()) >= 13) { @@ -1035,7 +1037,8 @@ void ServerEnvironment::step(float dtime) //if(myrand()%20 == 0) { MapNode n_top = m_map->getNodeNoEx(p+v3s16(0,1,0)); - if(m_gamedef->ndef()->get(n_top).air_equivalent == false) + if(m_gamedef->ndef()->get(n_top).light_propagates == false || + m_gamedef->ndef()->get(n_top).isLiquid()) { n.setContent(LEGN(m_gamedef->ndef(), "CONTENT_MUD")); m_map->addNodeWithEvent(p, n); |