minenux
/
minetest-engine-minetest
1
0
Fork 0
Code Pull Requests Releases Activity

Remove mapgen_air alias (#935)

pull/935/merge
0gb.us 2013-09-23 23:15:38 -07:00 committed by Kahrl
parent 2170c9958a
commit afb27329fc
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
games/minimal/mods/default/mapgen.lua
View File

@ -4,7 +4,6 @@
-- Aliases for map generator outputs -- Aliases for map generator outputs
-- --
minetest.register_alias("mapgen_air", "air")
minetest.register_alias("mapgen_stone", "default:stone") minetest.register_alias("mapgen_stone", "default:stone")
minetest.register_alias("mapgen_tree", "default:tree") minetest.register_alias("mapgen_tree", "default:tree")
minetest.register_alias("mapgen_leaves", "default:leaves") minetest.register_alias("mapgen_leaves", "default:leaves")

6
src/content_abm.cpp
View File

@ -209,7 +209,7 @@ class LiquidDropABM : public ActiveBlockModifier {
{ return contents; } { return contents; }
virtual std::set<std::string> getRequiredNeighbors() { virtual std::set<std::string> getRequiredNeighbors() {
std::set<std::string> neighbors; std::set<std::string> neighbors;
neighbors.insert("mapgen_air"); neighbors.insert("air");
return neighbors; return neighbors;
} }
virtual float getTriggerInterval() virtual float getTriggerInterval()
@ -241,7 +241,7 @@ class LiquidFreeze : public ActiveBlockModifier {
} }
virtual std::set<std::string> getRequiredNeighbors() { virtual std::set<std::string> getRequiredNeighbors() {
std::set<std::string> s; std::set<std::string> s;
s.insert("mapgen_air"); s.insert("air");
s.insert("group:melts"); s.insert("group:melts");
return s; return s;
} }
@ -303,7 +303,7 @@ class LiquidMeltWeather : public ActiveBlockModifier {
} }
virtual std::set<std::string> getRequiredNeighbors() { virtual std::set<std::string> getRequiredNeighbors() {
std::set<std::string> s; std::set<std::string> s;
s.insert("mapgen_air"); s.insert("air");
s.insert("group:freezes"); s.insert("group:freezes");
return s; return s;
} }