X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcontent_abm.cpp;h=8694ef9814807a81d7a1fef9694d2e25286b8ae6;hb=da34a2b33e1f600ec11172f599384b9a92835403;hp=a88450095398f94d0a868ff245714e51076c2f04;hpb=6a1670dbc31cc0e44178bbd9ad34ff0d5981a060;p=oweals%2Fminetest.git

diff --git a/src/content_abm.cpp b/src/content_abm.cpp
index a88450095..8694ef981 100644
--- a/src/content_abm.cpp
+++ b/src/content_abm.cpp
@@ -25,159 +25,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "content_sao.h"
 #include "settings.h"
 #include "mapblock.h" // For getNodeBlockPos
-#include "treegen.h" // For treegen::make_tree
-#include "main.h" // for g_settings
 #include "map.h"
+#include "scripting_game.h"
+#include "log.h"
 
 #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
 
-class GrowGrassABM : public ActiveBlockModifier
-{
-private:
-public:
-	virtual std::set<std::string> getTriggerContents()
-	{
-		std::set<std::string> s;
-		s.insert("mapgen_dirt");
-		return s;
-	}
-	virtual float getTriggerInterval()
-	{ return 2.0; }
-	virtual u32 getTriggerChance()
-	{ return 200; }
-	virtual void trigger(ServerEnvironment *env, v3s16 p, MapNode n)
-	{
-		INodeDefManager *ndef = env->getGameDef()->ndef();
-		ServerMap *map = &env->getServerMap();
-		
-		MapNode n_top = map->getNodeNoEx(p+v3s16(0,1,0));
-		if(ndef->get(n_top).light_propagates &&
-				!ndef->get(n_top).isLiquid() &&
-				n_top.getLightBlend(env->getDayNightRatio(), ndef) >= 13)
-		{
-			n.setContent(ndef->getId("mapgen_dirt_with_grass"));
-			map->addNodeWithEvent(p, n);
-		}
-	}
-};
+void add_legacy_abms(ServerEnvironment *env, INodeDefManager *nodedef) {
 
-class RemoveGrassABM : public ActiveBlockModifier
-{
-private:
-public:
-	virtual std::set<std::string> getTriggerContents()
-	{
-		std::set<std::string> s;
-		s.insert("mapgen_dirt_with_grass");
-		return s;
-	}
-	virtual float getTriggerInterval()
-	{ return 2.0; }
-	virtual u32 getTriggerChance()
-	{ return 20; }
-	virtual void trigger(ServerEnvironment *env, v3s16 p, MapNode n)
-	{
-		INodeDefManager *ndef = env->getGameDef()->ndef();
-		ServerMap *map = &env->getServerMap();
-		
-		MapNode n_top = map->getNodeNoEx(p+v3s16(0,1,0));
-		if((!ndef->get(n_top).light_propagates &&
-				n_top.getContent() != CONTENT_IGNORE) ||
-				ndef->get(n_top).isLiquid())
-		{
-			n.setContent(ndef->getId("mapgen_dirt"));
-			map->addNodeWithEvent(p, n);
-		}
-	}
-};
-
-class MakeTreesFromSaplingsABM : public ActiveBlockModifier
-{
-private:
-public:
-	virtual std::set<std::string> getTriggerContents()
-	{
-		std::set<std::string> s;
-		s.insert("sapling");
-		return s;
-	}
-	virtual float getTriggerInterval()
-	{ return 10.0; }
-	virtual u32 getTriggerChance()
-	{ return 50; }
-	virtual void trigger(ServerEnvironment *env, v3s16 p, MapNode n,
-			u32 active_object_count, u32 active_object_count_wider)
-	{
-		INodeDefManager *ndef = env->getGameDef()->ndef();
-		ServerMap *map = &env->getServerMap();
-		
-		actionstream<<"A sapling grows into a tree at "
-				<<PP(p)<<std::endl;
-
-		std::map<v3s16, MapBlock*> modified_blocks;
-		v3s16 tree_p = p;
-		ManualMapVoxelManipulator vmanip(map);
-		v3s16 tree_blockp = getNodeBlockPos(tree_p);
-		vmanip.initialEmerge(tree_blockp - v3s16(1,1,1), tree_blockp + v3s16(1,1,1));
-		bool is_apple_tree = myrand()%4 == 0;
-		treegen::make_tree(vmanip, tree_p, is_apple_tree, ndef, myrand());
-		vmanip.blitBackAll(&modified_blocks);
-
-		// update lighting
-		std::map<v3s16, MapBlock*> lighting_modified_blocks;
-		lighting_modified_blocks.insert(modified_blocks.begin(), modified_blocks.end());
-		map->updateLighting(lighting_modified_blocks, modified_blocks);
-
-		// Send a MEET_OTHER event
-		MapEditEvent event;
-		event.type = MEET_OTHER;
-//		event.modified_blocks.insert(modified_blocks.begin(), modified_blocks.end());
-		for(std::map<v3s16, MapBlock*>::iterator
-			i = modified_blocks.begin();
-			i != modified_blocks.end(); ++i)
-		{
-			event.modified_blocks.insert(i->first);
-		}
-		map->dispatchEvent(&event);
-	}
-};
-
-class LiquidFlowABM : public ActiveBlockModifier
-{
-private:
-	std::set<std::string> contents;
-
-public:
-	LiquidFlowABM(ServerEnvironment *env, INodeDefManager *nodemgr) 
-	{
-		std::set<content_t> liquids;
-		nodemgr->getIds("group:liquid", liquids);
-		for(std::set<content_t>::const_iterator k = liquids.begin(); k != liquids.end(); k++)
-			contents.insert(nodemgr->get(*k).liquid_alternative_flowing);
-		
-	}
-	virtual std::set<std::string> getTriggerContents()
-	{
-		return contents;
-	}
-	virtual float getTriggerInterval()
-	{ return 10.0; }
-	virtual u32 getTriggerChance()
-	{ return 10; }
-	virtual void trigger(ServerEnvironment *env, v3s16 p, MapNode n)
-	{
-		ServerMap *map = &env->getServerMap();
-		if (map->transforming_liquid_size() < 500)
-			map->transforming_liquid_add(p);
-		//if ((*map).m_transforming_liquid.size() < 500) (*map).m_transforming_liquid.push_back(p);
-	}
-};
-
-void add_legacy_abms(ServerEnvironment *env, INodeDefManager *nodedef)
-{
-	env->addActiveBlockModifier(new GrowGrassABM());
-	env->addActiveBlockModifier(new RemoveGrassABM());
-	env->addActiveBlockModifier(new MakeTreesFromSaplingsABM());
-	if (g_settings->getBool("liquid_finite"))
-		env->addActiveBlockModifier(new LiquidFlowABM(env, nodedef));
 }