5 files changed, 0 insertions, 44 deletions
diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp
index 5e2a5c816..3a4a4652a 100644
--- a/src/content_mapnode.cpp
+++ b/src/content_mapnode.cpp
@@ -233,16 +233,3 @@ std::string content_mapnode_get_new_name(const std::string &oldname)
 {
 	return newnamegetter.get(oldname);
 }
-
-content_t legacy_get_id(const std::string &oldname, INodeDefManager *ndef)
-{
-	std::string newname = content_mapnode_get_new_name(oldname);
-	if(newname == "")
-		return CONTENT_IGNORE;
-	content_t id;
-	bool found = ndef->getId(newname, id);
-	if(!found)
-		return CONTENT_IGNORE;
-	return id;
-}
-
diff --git a/src/content_mapnode.h b/src/content_mapnode.h
index 5c9c0b66d..5d68afe59 100644
--- a/src/content_mapnode.h
+++ b/src/content_mapnode.h
@@ -37,8 +37,5 @@ void content_mapnode_get_name_id_mapping(NameIdMapping *nimap);
 // Convert "CONTENT_STONE"-style names to dynamic ids
 std::string content_mapnode_get_new_name(const std::string &oldname);
 class INodeDefManager;
-content_t legacy_get_id(const std::string &oldname, INodeDefManager *ndef);
-#define LEGN(ndef, oldname) legacy_get_id(oldname, ndef)
 
 #endif
-
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 1843e953d..f8e9477c5 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -342,30 +342,6 @@ void Mapgen::spreadLight(v3s16 nmin, v3s16 nmax)
 
 
 
-void Mapgen::calcLightingOld(v3s16 nmin, v3s16 nmax)
-{
-	enum LightBank banks[2] = {LIGHTBANK_DAY, LIGHTBANK_NIGHT};
-	VoxelArea a(nmin, nmax);
-	bool block_is_underground = (water_level > nmax.Y);
-	bool sunlight = !block_is_underground;
-
-	ScopeProfiler sp(g_profiler, "EmergeThread: mapgen lighting update", SPT_AVG);
-
-	for (int i = 0; i < 2; i++) {
-		enum LightBank bank = banks[i];
-		std::set<v3s16> light_sources;
-		std::map<v3s16, u8> unlight_from;
-
-		voxalgo::clearLightAndCollectSources(*vm, a, bank, ndef,
-			light_sources, unlight_from);
-		voxalgo::propagateSunlight(*vm, a, sunlight, light_sources, ndef);
-
-		vm->unspreadLight(bank, unlight_from, light_sources, ndef);
-		vm->spreadLight(bank, light_sources, ndef);
-	}
-}
-
-
 ///////////////////////////////////////////////////////////////////////////////
 
 GenerateNotifier::GenerateNotifier()
diff --git a/src/mapgen.h b/src/mapgen.h
index b0758ba41..46328ba92 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -179,8 +179,6 @@ public:
 	void propagateSunlight(v3s16 nmin, v3s16 nmax);
 	void spreadLight(v3s16 nmin, v3s16 nmax);
 
-	void calcLightingOld(v3s16 nmin, v3s16 nmax);
-
 	virtual void makeChunk(BlockMakeData *data) {}
 	virtual int getGroundLevelAtPoint(v2s16 p) { return 0; }
 };
diff --git a/src/unittest/test_mapnode.cpp b/src/unittest/test_mapnode.cpp
index fc1a94916..9ecc2f82d 100644
--- a/src/unittest/test_mapnode.cpp
+++ b/src/unittest/test_mapnode.cpp
@@ -53,6 +53,4 @@ void TestMapNode::testNodeProperties(INodeDefManager *nodedef)
 	// Transparency
 	n.setContent(CONTENT_AIR);
 	UASSERT(nodedef->get(n).light_propagates == true);
-	n.setContent(LEGN(nodedef, "CONTENT_STONE"));
-	UASSERT(nodedef->get(n).light_propagates == false);
 }