Disable word wrap in vertical texts in main menu

[minetest.git] / src / voxel.cpp

diff --git a/src/voxel.cpp b/src/voxel.cpp
index f60b641f1af7954e3d9fd9cdab1c555d562ab946..bd06be877b67ae4a5de024aa538cb30bb5c63435 100644 (file)
--- a/src/voxel.cpp
+++ b/src/voxel.cpp
@@ -19,10 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "voxel.h"
 #include "map.h"
-
-// For TimeTaker
-#include "utility.h"
+#include "utility.h" // For TimeTaker
 #include "gettime.h"
+#include "nodedef.h"
 
 /*
        Debug stuff
@@ -64,7 +63,8 @@ void VoxelManipulator::clear()
        m_flags = NULL;
 }
 
-void VoxelManipulator::print(std::ostream &o, VoxelPrintMode mode)
+void VoxelManipulator::print(std::ostream &o, INodeDefManager *nodemgr,
+               VoxelPrintMode mode)
 {
        v3s16 em = m_area.getExtent();
        v3s16 of = m_area.MinEdge;
@@ -94,7 +94,7 @@ void VoxelManipulator::print(std::ostream &o, VoxelPrintMode mode)
                                else
                                {
                                        c = 'X';
-                                       u8 m = m_data[m_area.index(x,y,z)].d;
+                                       content_t m = m_data[m_area.index(x,y,z)].getContent();
                                        u8 pr = m_data[m_area.index(x,y,z)].param2;
                                        if(mode == VOXELPRINT_MATERIAL)
                                        {
@@ -103,7 +103,7 @@ void VoxelManipulator::print(std::ostream &o, VoxelPrintMode mode)
                                        }
                                        else if(mode == VOXELPRINT_WATERPRESSURE)
                                        {
-                                               if(m == CONTENT_WATER)
+                                               if(nodemgr->get(m).isLiquid())
                                                {
                                                        c = 'w';
                                                        if(pr <= 9)
@@ -280,7 +280,7 @@ void VoxelManipulator::clearFlag(u8 flags)
 }
 
 void VoxelManipulator::unspreadLight(enum LightBank bank, v3s16 p, u8 oldlight,
-               core::map<v3s16, bool> & light_sources)
+               core::map<v3s16, bool> & light_sources, INodeDefManager *nodemgr)
 {
        v3s16 dirs[6] = {
                v3s16(0,0,1), // back
@@ -310,21 +310,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) < oldlight)
+               u8 light2 = n2.getLight(bank, nodemgr);
+               if(light2 < oldlight)
                {
                        /*
                                And the neighbor is transparent and it has some light
                        */
-                       if(n2.light_propagates() && n2.getLight(bank) != 0)
+                       if(nodemgr->get(n2).light_propagates && light2 != 0)
                        {
                                /*
                                        Set light to 0 and add to queue
                                */
 
-                               u8 current_light = n2.getLight(bank);
-                               n2.setLight(bank, 0);
+                               n2.setLight(bank, 0, nodemgr);
                                
-                               unspreadLight(bank, n2pos, current_light, light_sources);
+                               unspreadLight(bank, n2pos, light2, light_sources, nodemgr);
                                
                                /*
                                        Remove from light_sources if it is there
@@ -363,7 +363,7 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, v3s16 p, u8 oldlight,
 */
 void VoxelManipulator::unspreadLight(enum LightBank bank,
                core::map<v3s16, u8> & from_nodes,
-               core::map<v3s16, bool> & light_sources)
+               core::map<v3s16, bool> & light_sources, INodeDefManager *nodemgr)
 {
        if(from_nodes.size() == 0)
                return;
@@ -379,7 +379,7 @@ void VoxelManipulator::unspreadLight(enum LightBank bank,
                
                u8 oldlight = j.getNode()->getValue();
 
-               unspreadLight(bank, pos, oldlight, light_sources);
+               unspreadLight(bank, pos, oldlight, light_sources, nodemgr);
        }
 }
 #endif
@@ -449,18 +449,18 @@ void VoxelManipulator::unspreadLight(enum LightBank bank,
                                If the neighbor is dimmer than what was specified
                                as oldlight (the light of the previous node)
                        */
-                       if(n2.getLight(bank) < oldlight)
+                       if(n2.getLight(bank, nodemgr) < oldlight)
                        {
                                /*
                                        And the neighbor is transparent and it has some light
                                */
-                               if(n2.light_propagates() && n2.getLight(bank) != 0)
+                               if(nodemgr->get(n2).light_propagates && n2.getLight(bank, nodemgr) != 0)
                                {
                                        /*
                                                Set light to 0 and add to queue
                                        */
 
-                                       u8 current_light = n2.getLight(bank);
+                                       u8 current_light = n2.getLight(bank, nodemgr);
                                        n2.setLight(bank, 0);
 
                                        unlighted_nodes.insert(n2pos, current_light);
@@ -492,7 +492,8 @@ void VoxelManipulator::unspreadLight(enum LightBank bank,
 }
 #endif
 
-void VoxelManipulator::spreadLight(enum LightBank bank, v3s16 p)
+void VoxelManipulator::spreadLight(enum LightBank bank, v3s16 p,
+               INodeDefManager *nodemgr)
 {
        const v3s16 dirs[6] = {
                v3s16(0,0,1), // back
@@ -512,7 +513,7 @@ void VoxelManipulator::spreadLight(enum LightBank bank, v3s16 p)
 
        MapNode &n = m_data[i];
 
-       u8 oldlight = n.getLight(bank);
+       u8 oldlight = n.getLight(bank, nodemgr);
        u8 newlight = diminish_light(oldlight);
 
        // Loop through 6 neighbors
@@ -527,25 +528,27 @@ 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) > undiminish_light(oldlight))
+               if(light2 > undiminish_light(oldlight))
                {
-                       spreadLight(bank, n2pos);
+                       spreadLight(bank, n2pos, nodemgr);
                }
                /*
                        If the neighbor is dimmer than how much light this node
                        would spread on it, add to list
                */
-               if(n2.getLight(bank) < newlight)
+               if(light2 < newlight)
                {
-                       if(n2.light_propagates())
+                       if(nodemgr->get(n2).light_propagates)
                        {
-                               n2.setLight(bank, newlight);
-                               spreadLight(bank, n2pos);
+                               n2.setLight(bank, newlight, nodemgr);
+                               spreadLight(bank, n2pos, nodemgr);
                        }
                }
        }
@@ -584,7 +587,7 @@ void VoxelManipulator::spreadLight(enum LightBank bank,
        goes on recursively.
 */
 void VoxelManipulator::spreadLight(enum LightBank bank,
-               core::map<v3s16, bool> & from_nodes)
+               core::map<v3s16, bool> & from_nodes, INodeDefManager *nodemgr)
 {
        const v3s16 dirs[6] = {
                v3s16(0,0,1), // back
@@ -615,7 +618,7 @@ void VoxelManipulator::spreadLight(enum LightBank bank,
 
                MapNode &n = m_data[i];
 
-               u8 oldlight = n.getLight(bank);
+               u8 oldlight = n.getLight(bank, nodemgr);
                u8 newlight = diminish_light(oldlight);
 
                // Loop through 6 neighbors
@@ -632,12 +635,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) > undiminish_light(oldlight))
+                               if(light2 > undiminish_light(oldlight))
                                {
                                        lighted_nodes.insert(n2pos, true);
                                }
@@ -645,11 +650,11 @@ 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) < newlight)
+                               if(light2 < newlight)
                                {
-                                       if(n2.light_propagates())
+                                       if(nodemgr->get(n2).light_propagates)
                                        {
-                                               n2.setLight(bank, newlight);
+                                               n2.setLight(bank, newlight, nodemgr);
                                                lighted_nodes.insert(n2pos, true);
                                        }
                                }
@@ -667,7 +672,7 @@ void VoxelManipulator::spreadLight(enum LightBank bank,
                        <<std::endl;*/
        
        if(lighted_nodes.size() > 0)
-               spreadLight(bank, lighted_nodes);
+               spreadLight(bank, lighted_nodes, nodemgr);
 }
 #endif