Fix serverlist code style, const-correctness, and types

[dragonfireclient.git] / src / biome.cpp

diff --git a/src/biome.cpp b/src/biome.cpp
index bc84d4bc1c1ec419adf22e107da8434d81c7d1d3..e1dfc47afbb021c31bf06e03a79d7f27c8d3d327 100644 (file)
--- a/src/biome.cpp
+++ b/src/biome.cpp
@@ -21,13 +21,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "nodedef.h"
 #include "map.h" //for ManualMapVoxelManipulator
 #include "log.h"
+#include "util/numeric.h"
 #include "main.h"
+#include "util/mathconstants.h"
+#include "porting.h"
 
-
-NoiseParams nparams_biome_def_heat =
-       {50, 50, v3f(500.0, 500.0, 500.0), 5349, 3, 0.70};
-NoiseParams nparams_biome_def_humidity =
-       {50, 50, v3f(500.0, 500.0, 500.0), 842, 3, 0.55};
+NoiseParams nparams_biome_def_heat(50, 50, v3f(500.0, 500.0, 500.0), 5349, 3, 0.70);
+NoiseParams nparams_biome_def_humidity(50, 50, v3f(500.0, 500.0, 500.0), 842, 3, 0.55);
 
 
 BiomeDefManager::BiomeDefManager() {
@@ -41,16 +41,26 @@ BiomeDefManager::BiomeDefManager() {
        b->id    = 0;
        b->name  = "Default";
        b->flags = 0;
-
-       b->c_top         = CONTENT_AIR;
-       b->top_depth     = 0;
-       b->c_filler      = b->c_top;
-       b->filler_height = MAP_GENERATION_LIMIT;
-
-       b->height_min      = -MAP_GENERATION_LIMIT;
-       b->height_max      = MAP_GENERATION_LIMIT;
-       b->heat_point      = 0.0;
-       b->humidity_point  = 0.0;
+       
+       b->depth_top    = 0;
+       b->depth_filler = 0;
+
+       b->nname_top        = "air";
+       b->nname_filler     = "air";
+       b->nname_water      = "mapgen_water_source";
+       b->nname_dust       = "air";
+       b->nname_dust_water = "mapgen_water_source";
+
+       b->c_top        = CONTENT_IGNORE;
+       b->c_filler     = CONTENT_IGNORE;
+       b->c_water      = CONTENT_IGNORE;
+       b->c_dust       = CONTENT_IGNORE;
+       b->c_dust_water = CONTENT_IGNORE;
+
+       b->height_min     = -MAP_GENERATION_LIMIT;
+       b->height_max     = MAP_GENERATION_LIMIT;
+       b->heat_point     = 0.0;
+       b->humidity_point = 0.0;
 
        biomes.push_back(b);
 }
@@ -101,27 +111,42 @@ void BiomeDefManager::resolveNodeNames(INodeDefManager *ndef) {
        
        biome_registration_finished = true;
        
-       for (size_t i = 0; i != biomes.size(); i++) {
+       for (size_t i = 0; i < biomes.size(); i++) {
                b = biomes[i];
-               
+
+               b->c_top = ndef->getId(b->nname_top);
                if (b->c_top == CONTENT_IGNORE) {
-                       b->c_top = ndef->getId(b->top_nodename);
-                       if (b->c_top == CONTENT_IGNORE) {
-                               errorstream << "BiomeDefManager::resolveNodeNames: node '"
-                                       << b->top_nodename << "' not defined" << std::endl;
-                               b->c_top = CONTENT_AIR;
-                               b->top_depth = 0;
-                       }
+                       errorstream << "BiomeDefManager::resolveNodeNames: node '"
+                               << b->nname_top << "' not defined" << std::endl;
+                       b->c_top     = CONTENT_AIR;
+                       b->depth_top = 0;
                }
-               
+       
+               b->c_filler = ndef->getId(b->nname_filler);
                if (b->c_filler == CONTENT_IGNORE) {
-                       b->c_filler = ndef->getId(b->filler_nodename);
-                       if (b->c_filler == CONTENT_IGNORE) {
-                               errorstream << "BiomeDefManager::resolveNodeNames: node '"
-                                       << b->filler_nodename << "' not defined" << std::endl;
-                               b->c_filler = CONTENT_AIR;
-                               b->filler_height = MAP_GENERATION_LIMIT;
-                       }
+                       errorstream << "BiomeDefManager::resolveNodeNames: node '"
+                               << b->nname_filler << "' not defined" << std::endl;
+                       b->c_filler     = CONTENT_AIR;
+                       b->depth_filler = 0;
+               }
+               
+               b->c_water = ndef->getId(b->nname_water);
+               if (b->c_water == CONTENT_IGNORE) {
+                       errorstream << "BiomeDefManager::resolveNodeNames: node '"
+                               << b->nname_water << "' not defined" << std::endl;
+                       b->c_water = CONTENT_AIR;
+               }
+               
+               b->c_dust = ndef->getId(b->nname_dust);
+               if (b->c_dust == CONTENT_IGNORE) {
+                       errorstream << "BiomeDefManager::resolveNodeNames: node '"
+                               << b->nname_dust << "' not defined" << std::endl;
+               }
+               
+               b->c_dust_water = ndef->getId(b->nname_dust_water);
+               if (b->c_dust_water == CONTENT_IGNORE) {
+                       errorstream << "BiomeDefManager::resolveNodeNames: node '"
+                               << b->nname_dust_water << "' not defined" << std::endl;
                }
        }
 }
@@ -156,8 +181,8 @@ Biome *BiomeDefManager::getBiome(float heat, float humidity, s16 y) {
                if (y > b->height_max || y < b->height_min)
                        continue;
 
-               float d_heat      = heat     - b->heat_point;
-               float d_humidity  = humidity - b->humidity_point;
+               float d_heat     = heat     - b->heat_point;
+               float d_humidity = humidity - b->humidity_point;
                float dist = (d_heat * d_heat) +
                                         (d_humidity * d_humidity);
                if (dist < dist_min) {