configuration updates; making to build on msvc

diff --git a/minetest.conf.example b/minetest.conf.example
index 4ce3b81e2ff5654f09222027c8b6258ba8bb0135..41e2dcab6558a021d4adfbe589ca4a41ae7a8137 100644 (file)
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -29,19 +29,6 @@
 
 #map-dir = /home/palle/custom_map
 
-# - The possible generators are:
-# (Indeed you can do all of them with only "power" 8))
-# H=value:
-#     constant <value>
-# H=slope.dot(pos):
-#     linear <height> <slope.X> <slope.Y>
-# H=slope.dot(pos^power):
-#     power <height> <slope.X> <slope.Y> <power>
-
-#mapgen_heightmap_blocksize = 32
-#height_randmax = constant 50.0
-#height_randfactor = constant 0.6
-#height_base = linear 0 0 0
 #plants_amount = 1.0
 #ravines_amount = 1.0
 #coal_amount = 1.0
@@ -59,10 +46,6 @@
 #max_block_send_distance = 5
 #max_block_generate_distance = 4
 
-#disable_water_climb = true
-# Note that this gets applied at map generation time
-#endless_water = true
-
 # 20 min/day
 #time_speed = 72
 # 4 min/day

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index c11159f1d50b926eeb1c4ab96c343917726dfc80..401fc03f553a8df01515e50fef46f47199b2c050 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -41,19 +41,6 @@ void set_default_settings()
        // Server stuff
        g_settings.setDefault("creative_mode", "false");
        g_settings.setDefault("haxmode", "false");
-       /*g_settings.setDefault("heightmap_blocksize", "32");
-       g_settings.setDefault("height_randmax", "constant 45.0");
-       g_settings.setDefault("height_randfactor", "constant 0.6");
-       g_settings.setDefault("height_base", "linear 0 0 0");
-       g_settings.setDefault("plants_amount", "1.0");
-       g_settings.setDefault("ravines_amount", "1.0");
-       g_settings.setDefault("coal_amount", "1.0");*/
-       g_settings.setDefault("heightmap_blocksize", "16");
-       //g_settings.setDefault("height_randmax", "linear 0 0 30");
-       g_settings.setDefault("height_randmax", "linear 0.5 0 0");
-       //g_settings.setDefault("height_randfactor", "linear 0.50 -0.10 0");
-       g_settings.setDefault("height_randfactor", "linear 0.60 0 0");
-       g_settings.setDefault("height_base", "linear 5 0 0");
        g_settings.setDefault("plants_amount", "1.0");
        g_settings.setDefault("ravines_amount", "0");
        g_settings.setDefault("coal_amount", "1.0");
@@ -62,9 +49,6 @@ void set_default_settings()
        g_settings.setDefault("active_object_range", "2");
        g_settings.setDefault("max_simultaneous_block_sends_per_client", "1");
        g_settings.setDefault("max_simultaneous_block_sends_server_total", "4");
-       //g_settings.setDefault("water_moves", "true");
-       //g_settings.setDefault("disable_water_climb", "true");
-       //g_settings.setDefault("endless_water", "true");
        g_settings.setDefault("max_block_send_distance", "6");
        g_settings.setDefault("max_block_generate_distance", "6");
        g_settings.setDefault("time_send_interval", "20");

diff --git a/src/main.cpp b/src/main.cpp
index 3101583cf02c4154761da8035b52f50a4791cda3..69c6dfd675ef436ae29fb0d4aeb309a22d71cf18 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -221,6 +221,8 @@ TODO: Map generator version 2
 FIXME: The new pre-sunlight-propagation code messes up with initial\r
        water lighting\r
 \r
+TODO: Remove HMParams\r
+\r
 Doing now:\r
 ======================================================================\r
 \r
@@ -1269,10 +1271,10 @@ int main(int argc, char *argv[])
        // Read map parameters from settings\r
 \r
        HMParams hm_params;\r
-       hm_params.blocksize = g_settings.getU16("heightmap_blocksize");\r
+       /*hm_params.blocksize = g_settings.getU16("heightmap_blocksize");\r
        hm_params.randmax = g_settings.get("height_randmax");\r
        hm_params.randfactor = g_settings.get("height_randfactor");\r
-       hm_params.base = g_settings.get("height_base");\r
+       hm_params.base = g_settings.get("height_base");*/\r
 \r
        MapParams map_params;\r
        map_params.plants_amount = g_settings.getFloat("plants_amount");\r

diff --git a/src/servermain.cpp b/src/servermain.cpp
index 8fcefaae7cfc7982fcdbefd943ffba36a502c09f..3d015b73231039d583198902552f786bcdc329c5 100644 (file)
--- a/src/servermain.cpp
+++ b/src/servermain.cpp
@@ -259,10 +259,10 @@ int main(int argc, char *argv[])
        // Read map parameters from settings
 
        HMParams hm_params;
-       hm_params.blocksize = g_settings.getU16("heightmap_blocksize");
+       /*hm_params.blocksize = g_settings.getU16("heightmap_blocksize");
        hm_params.randmax = g_settings.get("height_randmax");
        hm_params.randfactor = g_settings.get("height_randfactor");
-       hm_params.base = g_settings.get("height_base");
+       hm_params.base = g_settings.get("height_base");*/
 
        MapParams map_params;
        map_params.plants_amount = g_settings.getFloat("plants_amount");

diff --git a/src/utility.cpp b/src/utility.cpp
index 3aa397e9e48ea8f90db765c94699540cc5da6584..269b545a56271ab38ae6680960b7def1a83fc880 100644 (file)
--- a/src/utility.cpp
+++ b/src/utility.cpp
@@ -113,7 +113,7 @@ float PointAttributeList::getInterpolatedFloat(v3s16 p)
 {
        const u32 near_wanted_count = 5;
        // Last is nearest, first is farthest
-       core::list<DFloat> near;
+       core::list<DFloat> near_list;
 
        for(core::list<PointWithAttr>::Iterator
                        i = m_points.begin();
@@ -127,17 +127,17 @@ float PointAttributeList::getInterpolatedFloat(v3s16 p)
                df.d = d;
                                
                // If near list is empty, add directly and continue
-               if(near.size() == 0)
+               if(near_list.size() == 0)
                {
-                       near.push_back(df);
+                       near_list.push_back(df);
                        continue;
                }
                
                // Get distance of farthest in near list
                u32 near_d = 100000;
-               if(near.size() > 0)
+               if(near_list.size() > 0)
                {
-                       core::list<DFloat>::Iterator i = near.begin();
+                       core::list<DFloat>::Iterator i = near_list.begin();
                        near_d = i->d;
                }
                
@@ -145,35 +145,35 @@ float PointAttributeList::getInterpolatedFloat(v3s16 p)
                        If point is closer than the farthest in the near list or
                        there are not yet enough points on the list
                */
-               if(d < near_d || near.size() < near_wanted_count)
+               if(d < near_d || near_list.size() < near_wanted_count)
                {
                        // Find the right place in the near list and put it there
                        
                        // Go from farthest to near in the near list
-                       core::list<DFloat>::Iterator i = near.begin();
-                       for(; i != near.end(); i++)
+                       core::list<DFloat>::Iterator i = near_list.begin();
+                       for(; i != near_list.end(); i++)
                        {
                                // Stop when i is at the first nearer node
                                if(i->d < d)
                                        break;
                        }
                        // Add df to before i
-                       if(i == near.end())
-                               near.push_back(df);
+                       if(i == near_list.end())
+                               near_list.push_back(df);
                        else
-                               near.insert_before(i, df);
+                               near_list.insert_before(i, df);
 
                        // Keep near list at right size
-                       if(near.size() > near_wanted_count)
+                       if(near_list.size() > near_wanted_count)
                        {
-                               core::list<DFloat>::Iterator j = near.begin();
-                               near.erase(j);
+                               core::list<DFloat>::Iterator j = near_list.begin();
+                               near_list.erase(j);
                        }
                }
        }
        
        // Return if no values found
-       if(near.size() == 0)
+       if(near_list.size() == 0)
                return 0.0;
        
        /*
@@ -183,8 +183,8 @@ lopuks sit otetaan a/b
        
        float a = 0;
        float b = 0;
-       for(core::list<DFloat>::Iterator i = near.begin();
-                       i != near.end(); i++)
+       for(core::list<DFloat>::Iterator i = near_list.begin();
+                       i != near_list.end(); i++)
        {
                if(i->d == 0)
                        return i->v;
@@ -220,17 +220,17 @@ float PointAttributeList::getInterpolatedFloat(v3s16 p)
                df.d = d;
                                
                // If near list is empty, add directly and continue
-               if(near.size() == 0)
+               if(near_list.size() == 0)
                {
-                       near.push_back(df);
+                       near_list.push_back(df);
                        continue;
                }
                
                // Get distance of farthest in near list
                u32 near_d = 100000;
-               if(near.size() > 0)
+               if(near_list.size() > 0)
                {
-                       core::list<DFloat>::Iterator i = near.begin();
+                       core::list<DFloat>::Iterator i = near_list.begin();
                        near_d = i->d;
                }
                
@@ -238,35 +238,35 @@ float PointAttributeList::getInterpolatedFloat(v3s16 p)
                        If point is closer than the farthest in the near list or
                        there are not yet enough points on the list
                */
-               if(d < near_d || near.size() < near_wanted_count)
+               if(d < near_d || near_list.size() < near_wanted_count)
                {
                        // Find the right place in the near list and put it there
                        
                        // Go from farthest to near in the near list
-                       core::list<DFloat>::Iterator i = near.begin();
-                       for(; i != near.end(); i++)
+                       core::list<DFloat>::Iterator i = near_list.begin();
+                       for(; i != near_list.end(); i++)
                        {
                                // Stop when i is at the first nearer node
                                if(i->d < d)
                                        break;
                        }
                        // Add df to before i
-                       if(i == near.end())
-                               near.push_back(df);
+                       if(i == near_list.end())
+                               near_list.push_back(df);
                        else
-                               near.insert_before(i, df);
+                               near_list.insert_before(i, df);
 
                        // Keep near list at right size
-                       if(near.size() > near_wanted_count)
+                       if(near_list.size() > near_wanted_count)
                        {
-                               core::list<DFloat>::Iterator j = near.begin();
-                               near.erase(j);
+                               core::list<DFloat>::Iterator j = near_list.begin();
+                               near_list.erase(j);
                        }
                }
        }
        
        // Return if no values found
-       if(near.size() == 0)
+       if(near_list.size() == 0)
                return 0.0;
        
        /*
@@ -274,11 +274,11 @@ float PointAttributeList::getInterpolatedFloat(v3s16 p)
        */
 
        u32 nearest_count = nearest_wanted_count;
-       if(nearest_count > near.size())
-               nearest_count = near.size();
+       if(nearest_count > near_list.size())
+               nearest_count = near_list.size();
        core::list<DFloat> nearest;
        {
-               core::list<DFloat>::Iterator i = near.getLast();
+               core::list<DFloat>::Iterator i = near_list.getLast();
                for(u32 j=0; j<nearest_count; j++)
                {
                        nearest.push_front(*i);