oerkki/minetest
oerkki
/
minetest
2
1
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

mud gets now grass onto it when placed into sunlight. also removed three old files

This commit is contained in:
Perttu Ahola 2011-02-15 12:33:59 +02:00
parent f0e739b69e
commit be7391c2b1
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/pauseMenu.gui
View File

Binary file not shown.

BIN
data/stone.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 951 B

BIN
data/water_old.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 103 B

30
src/map.cpp
View File

@ -860,13 +860,11 @@ void Map::updateLighting(core::map<v3s16, MapBlock*> & a_blocks,
The lighting value of the node should be left as-is after changing The lighting value of the node should be left as-is after changing
other values. This sets the lighting value to 0. other values. This sets the lighting value to 0.
*/ */
/*void Map::nodeAddedUpdate(v3s16 p, u8 lightwas,
core::map<v3s16, MapBlock*> &modified_blocks)*/
void Map::addNodeAndUpdate(v3s16 p, MapNode n, void Map::addNodeAndUpdate(v3s16 p, MapNode n,
core::map<v3s16, MapBlock*> &modified_blocks) core::map<v3s16, MapBlock*> &modified_blocks)
{ {
/*PrintInfo(m_dout); /*PrintInfo(m_dout);
m_dout<<DTIME<<"Map::nodeAddedUpdate(): p=(" m_dout<<DTIME<<"Map::addNodeAndUpdate(): p=("
<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/ <<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
/* /*
@ -898,11 +896,12 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n,
{ {
} }
if(n.d != CONTENT_TORCH)
{
/* /*
If there is grass below, change it to mud If the new node doesn't propagate sunlight and there is
grass below, change it to mud
*/ */
if(content_features(n.d).sunlight_propagates == false)
{
try{ try{
MapNode bottomnode = getNode(bottompos); MapNode bottomnode = getNode(bottompos);
@ -918,6 +917,19 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n,
} }
} }
/*
If the new node is mud and it is under sunlight, change it
to grass
*/
if(n.d == CONTENT_MUD && node_under_sunlight)
{
n.d = CONTENT_GRASS;
}
/*
Remove all light that has come out of this node
*/
enum LightBank banks[] = enum LightBank banks[] =
{ {
LIGHTBANK_DAY, LIGHTBANK_DAY,
@ -948,6 +960,10 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n,
n.setLight(bank, 0); n.setLight(bank, 0);
} }
/*
Set the node on the map
*/
setNode(p, n); setNode(p, n);
/* /*
@ -975,7 +991,6 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n,
if(n2.getLight(LIGHTBANK_DAY) == LIGHT_SUN) if(n2.getLight(LIGHTBANK_DAY) == LIGHT_SUN)
{ {
//m_dout<<DTIME<<"doing"<<std::endl;
unLightNeighbors(LIGHTBANK_DAY, unLightNeighbors(LIGHTBANK_DAY,
n2pos, n2.getLight(LIGHTBANK_DAY), n2pos, n2.getLight(LIGHTBANK_DAY),
light_sources, modified_blocks); light_sources, modified_blocks);
@ -993,7 +1008,6 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n,
/* /*
Spread light from all nodes that might be capable of doing so Spread light from all nodes that might be capable of doing so
TODO: Convert to spreadLight
*/ */
spreadLight(bank, light_sources, modified_blocks); spreadLight(bank, light_sources, modified_blocks);
} }