X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fvoxel.cpp;h=8fdae79e1590702935eb739a4d8aae78c7eba301;hb=ab45133ab4826359ca9a5ed50b68150eb462c8ef;hp=6324312440c21ff8e46638bd9828828d70017a4c;hpb=c6fd2986d4261cf742d3bc21e8c12be59ab89f95;p=oweals%2Fminetest.git

diff --git a/src/voxel.cpp b/src/voxel.cpp
index 632431244..8fdae79e1 100644
--- a/src/voxel.cpp
+++ b/src/voxel.cpp
@@ -3,25 +3,25 @@ Minetest-c55
 Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "voxel.h"
 #include "map.h"
-#include "utility.h" // For TimeTaker
 #include "gettime.h"
 #include "nodedef.h"
+#include "util/timetaker.h"
 
 /*
 	Debug stuff
@@ -63,7 +63,7 @@ void VoxelManipulator::clear()
 	m_flags = NULL;
 }
 
-void VoxelManipulator::print(std::ostream &o, INodeDefManager *nodemgr,
+void VoxelManipulator::print(std::ostream &o, INodeDefManager *ndef,
 		VoxelPrintMode mode)
 {
 	v3s16 em = m_area.getExtent();
@@ -94,8 +94,9 @@ void VoxelManipulator::print(std::ostream &o, INodeDefManager *nodemgr,
 				else
 				{
 					c = 'X';
-					content_t m = m_data[m_area.index(x,y,z)].getContent();
-					u8 pr = m_data[m_area.index(x,y,z)].param2;
+					MapNode n = m_data[m_area.index(x,y,z)];
+					content_t m = n.getContent();
+					u8 pr = n.param2;
 					if(mode == VOXELPRINT_MATERIAL)
 					{
 						if(m <= 9)
@@ -103,7 +104,7 @@ void VoxelManipulator::print(std::ostream &o, INodeDefManager *nodemgr,
 					}
 					else if(mode == VOXELPRINT_WATERPRESSURE)
 					{
-						if(nodemgr->get(m).isLiquid())
+						if(ndef->get(m).isLiquid())
 						{
 							c = 'w';
 							if(pr <= 9)
@@ -118,6 +119,21 @@ void VoxelManipulator::print(std::ostream &o, INodeDefManager *nodemgr,
 							c = '#';
 						}
 					}
+					else if(mode == VOXELPRINT_LIGHT_DAY)
+					{
+						if(ndef->get(m).light_source != 0)
+							c = 'S';
+						else if(ndef->get(m).light_propagates == false)
+							c = 'X';
+						else
+						{
+							u8 light = n.getLight(LIGHTBANK_DAY, ndef);
+							if(light < 10)
+								c = '0' + light;
+							else
+								c = 'a' + (light-10);
+						}
+					}
 				}
 				o<<c;
 			}
@@ -310,21 +326,21 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, v3s16 p, u8 oldlight,
 			If the neighbor is dimmer than what was specified
 			as oldlight (the light of the previous node)
 		*/
-		if(n2.getLight(bank, nodemgr) < oldlight)
+		u8 light2 = n2.getLight(bank, nodemgr);
+		if(light2 < oldlight)
 		{
 			/*
 				And the neighbor is transparent and it has some light
 			*/
-			if(nodemgr->get(n2).light_propagates && n2.getLight(bank, nodemgr) != 0)
+			if(nodemgr->get(n2).light_propagates && light2 != 0)
 			{
 				/*
 					Set light to 0 and add to queue
 				*/
 
-				u8 current_light = n2.getLight(bank, nodemgr);
 				n2.setLight(bank, 0, nodemgr);
 				
-				unspreadLight(bank, n2pos, current_light, light_sources, nodemgr);
+				unspreadLight(bank, n2pos, light2, light_sources, nodemgr);
 				
 				/*
 					Remove from light_sources if it is there
@@ -528,12 +544,14 @@ void VoxelManipulator::spreadLight(enum LightBank bank, v3s16 p,
 			continue;
 
 		MapNode &n2 = m_data[n2i];
+
+		u8 light2 = n2.getLight(bank, nodemgr);
 		
 		/*
 			If the neighbor is brighter than the current node,
 			add to list (it will light up this node on its turn)
 		*/
-		if(n2.getLight(bank, nodemgr) > undiminish_light(oldlight))
+		if(light2 > undiminish_light(oldlight))
 		{
 			spreadLight(bank, n2pos, nodemgr);
 		}
@@ -541,7 +559,7 @@ void VoxelManipulator::spreadLight(enum LightBank bank, v3s16 p,
 			If the neighbor is dimmer than how much light this node
 			would spread on it, add to list
 		*/
-		if(n2.getLight(bank, nodemgr) < newlight)
+		if(light2 < newlight)
 		{
 			if(nodemgr->get(n2).light_propagates)
 			{
@@ -633,12 +651,14 @@ void VoxelManipulator::spreadLight(enum LightBank bank,
 					continue;
 
 				MapNode &n2 = m_data[n2i];
+
+				u8 light2 = n2.getLight(bank, nodemgr);
 				
 				/*
 					If the neighbor is brighter than the current node,
 					add to list (it will light up this node on its turn)
 				*/
-				if(n2.getLight(bank, nodemgr) > undiminish_light(oldlight))
+				if(light2 > undiminish_light(oldlight))
 				{
 					lighted_nodes.insert(n2pos, true);
 				}
@@ -646,7 +666,7 @@ void VoxelManipulator::spreadLight(enum LightBank bank,
 					If the neighbor is dimmer than how much light this node
 					would spread on it, add to list
 				*/
-				if(n2.getLight(bank, nodemgr) < newlight)
+				if(light2 < newlight)
 				{
 					if(nodemgr->get(n2).light_propagates)
 					{