From be7391c2b1153c817a69aabd2a34e082c79df58f Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Tue, 15 Feb 2011 12:33:59 +0200
Subject: [PATCH] mud gets now grass onto it when placed into sunlight. also
removed three old files
---
data/pauseMenu.gui | Bin 17970 -> 0 bytes
data/stone.png | Bin 1563 -> 951 bytes
data/water_old.png | Bin 103 -> 0 bytes
src/map.cpp | 32 +++++++++++++++++++++++---------
4 files changed, 23 insertions(+), 9 deletions(-)
delete mode 100644 data/pauseMenu.gui
delete mode 100644 data/water_old.png
diff --git a/data/pauseMenu.gui b/data/pauseMenu.gui
deleted file mode 100644
index 0cf6c7adc430e125dd91812fbd608b0d23f8b0ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 17970
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
UX;ddz;qa~B@SgO4UbwdNAD!DtHUIzs
diff --git a/data/stone.png b/data/stone.png
index c7a453e3f7be95a2dd091542441108ad05b1bca5..1d8aee9d59637b94c54ec9beff029bc3006e2de4 100644
GIT binary patch
delta 145
zcmV;C0B--A47UfcF9Ux7a!Eu%R4C7tQn?L)Knx3#7odP45n}M9xD{v+guHO2b9Q7q
z(|&C9=Yfcpc{QjE_TWR1!G54YO-7~^GOrEUEW}}E_rlBuGSzI=%flBk%va3``3SQs
zYC))71l9E5vqIZcRb1;w2BSSBn^JpA#>ok&g-0rAmV7Dz000R9NkvXXu0mjf^rb$I
delta 761
zcmV<V0tWrJ2b&DAF9Ux9)=5M`R4C5{!C6n+b^riy+yD6fJHCVC9OPJll$P|O+QX{u
z0d;-oKF8GeJ#C+Bnl@?LG--oYEn6lLAf$vggcuTt?=!ad`=Q_e_`~q*R1@W*BC|A2
zQ}pM_<$Sr!&`hR^IF0y$H#f{E@|~5hav~^-Z13JvD~XB(Gd6#wzy0|~hNh4raReKl
zAI}}<+?YP?bUzMH_0k$i(4e)^$@7H4@-VVp%Oojqf2-&DaYa@nNpRgn6D6KulPp`>
z^F~R>Xh_?>Jsgc(FA7~(;*>baYijj;X8iQ_9aYGXBnBka?sj_H&jzDou)Dhpa<o=1
zt@0QU_*Q!(2L*r2yrHmMWf?C{XdK5dM8IidaYf2H=I1E~IjvIP+3Jx5lO-vKV}a+{
z-il?!3_&?qH2vuJcYpg~tkPtmQ(uP!5yw$k(U+H#{%|77oKE3sn$1kNsn-_f-Fmfo
zeYY@XSEd($C%rD@#9x2;If}!tpYP#$pzz|2F&&IPZgzh*{8c)>o?~d%uD4Dut{e3V
z(5e-Y7gVjh*=iREOjSxG0|ljgueVcVVHgIQA}{6!K@#KfsiaEin>XKikzazs$>fva
z+?Hv`Lath^5Hv4x@c5)(<kc)ipuj|7%#uu@Qf*urpO408FTVVWpsCSd5Mn@(RWwQZ
z{r4yW8kK*_zk?&&cO27NC1D}WLS2zLhB@pXzS?`~gn?MrEjPe1!dTo|aYis_pg{Ou
z7{v(#A!b|Ftz&zx+v;u~3<gP#))mEfmJ9n9A>pR3PN(B9nk@pLr~mzfSSHwPHOI3F
zny(J__dA-tbANj}yBG}51J`Y=l`bxg$B!Q0%x7@~QF#6O+u?WuzInMP7bTYG*K5rb
z0kX)WI0+fHtd;*d*w<?HqyAyCLLr1lXD2m%9js~kVgG}|OAmK?m(%In5AOw0am+i{
r3)&l7LF9EG^f<_*QOXG%$4mbMHhyE3mXQOc00000NkvXXu0mjfm(qE>
diff --git a/data/water_old.png b/data/water_old.png
deleted file mode 100644
index 37b2898fa133494dc3a82bad62209179f0e49056..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 103
zcmeAS@N?(olHy`uVBq!ia0vp^f<P?5!2~4hgPA#i6lZ})WHAE+-w_aIoT|+y4HT60
xba4#Pn3$ZB@Z-FLQi4+G;T7`&Z4Za=GZY#y%6l1Udjb_Pc)I$ztaD0e0sz8F7JL8z
diff --git a/src/map.cpp b/src/map.cpp
index f4f1668c7..09cab79e2 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -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
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,
core::map<v3s16, MapBlock*> &modified_blocks)
{
/*PrintInfo(m_dout);
- m_dout<<DTIME<<"Map::nodeAddedUpdate(): p=("
+ m_dout<<DTIME<<"Map::addNodeAndUpdate(): p=("
<<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 the new node doesn't propagate sunlight and there is
+ grass below, change it to mud
+ */
+ if(content_features(n.d).sunlight_propagates == false)
{
- /*
- If there is grass below, change it to mud
- */
try{
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[] =
{
LIGHTBANK_DAY,
@@ -947,6 +959,10 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n,
n.setLight(bank, 0);
}
+
+ /*
+ Set the node on the map
+ */
setNode(p, n);
@@ -975,7 +991,6 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n,
if(n2.getLight(LIGHTBANK_DAY) == LIGHT_SUN)
{
- //m_dout<<DTIME<<"doing"<<std::endl;
unLightNeighbors(LIGHTBANK_DAY,
n2pos, n2.getLight(LIGHTBANK_DAY),
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
- TODO: Convert to spreadLight
*/
spreadLight(bank, light_sources, modified_blocks);
}
--
GitLab