Fix alpha for liquid nodes (#5494)

[oweals/minetest.git] / src / mg_biome.cpp

diff --git a/src/mg_biome.cpp b/src/mg_biome.cpp
index df728af337eb804a94754b05124673e169fd3364..ef7e526858a358bd856e8f8717726656c8d38299 100644 (file)
--- a/src/mg_biome.cpp
+++ b/src/mg_biome.cpp
@@ -20,12 +20,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mg_biome.h"
 #include "mg_decoration.h"
 #include "emerge.h"
-#include "gamedef.h"
+#include "server.h"
 #include "nodedef.h"
 #include "map.h" //for MMVManip
-#include "log.h"
 #include "util/numeric.h"
-#include "util/mathconstants.h"
 #include "porting.h"
 #include "settings.h"
 
@@ -33,10 +31,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 ///////////////////////////////////////////////////////////////////////////////
 
 
-BiomeManager::BiomeManager(IGameDef *gamedef) :
-       ObjDefManager(gamedef, OBJDEF_BIOME)
+BiomeManager::BiomeManager(Server *server) :
+       ObjDefManager(server, OBJDEF_BIOME)
 {
-       m_gamedef = gamedef;
+       m_server = server;
 
        // Create default biome to be used in case none exist
        Biome *b = new Biome;
@@ -46,6 +44,7 @@ BiomeManager::BiomeManager(IGameDef *gamedef) :
        b->depth_top       = 0;
        b->depth_filler    = -MAX_MAP_GENERATION_LIMIT;
        b->depth_water_top = 0;
+       b->depth_riverbed  = 0;
        b->y_min           = -MAX_MAP_GENERATION_LIMIT;
        b->y_max           = MAX_MAP_GENERATION_LIMIT;
        b->heat_point      = 0.0;
@@ -57,6 +56,7 @@ BiomeManager::BiomeManager(IGameDef *gamedef) :
        b->m_nodenames.push_back("mapgen_water_source");
        b->m_nodenames.push_back("mapgen_water_source");
        b->m_nodenames.push_back("mapgen_river_water_source");
+       b->m_nodenames.push_back("mapgen_stone");
        b->m_nodenames.push_back("ignore");
        m_ndef->pendNodeResolve(b);
 
@@ -71,7 +71,7 @@ BiomeManager::~BiomeManager()
 
 void BiomeManager::clear()
 {
-       EmergeManager *emerge = m_gamedef->getEmergeManager();
+       EmergeManager *emerge = m_server->getEmergeManager();
 
        // Remove all dangling references in Decorations
        DecorationManager *decomgr = emerge->decomgr;
@@ -237,5 +237,6 @@ void Biome::resolveNodeNames()
        getIdFromNrBacklog(&c_water_top,   "mapgen_water_source",       CONTENT_AIR);
        getIdFromNrBacklog(&c_water,       "mapgen_water_source",       CONTENT_AIR);
        getIdFromNrBacklog(&c_river_water, "mapgen_river_water_source", CONTENT_AIR);
+       getIdFromNrBacklog(&c_riverbed,    "mapgen_stone",              CONTENT_AIR);
        getIdFromNrBacklog(&c_dust,        "ignore",                    CONTENT_IGNORE);
 }