Mgflat, Mgv7: Fix noise crash on world exit.

paramat · paramat · commit 4c03190ce804 · 2017-04-22T05:37:33.000+01:00
Fix crash caused by destructor 'delete' on noise objects that are not created due to mapgen options. Crash was caused by commit 57eaf62
diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp
@@ -73,8 +73,10 @@ MapgenFlat::MapgenFlat(int mapgenid, MapgenFlatParams *params, EmergeManager *em
 
 MapgenFlat::~MapgenFlat()
 {
-	delete noise_terrain;
 	delete noise_filler_depth;
+
+	if ((spflags & MGFLAT_LAKES) || (spflags & MGFLAT_HILLS))
+		delete noise_terrain;
 }
 
 
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
@@ -97,16 +97,26 @@ MapgenV7::MapgenV7(int mapgenid, MapgenV7Params *params, EmergeManager *emerge)
 MapgenV7::~MapgenV7()
 {
 	delete noise_terrain_base;
+	delete noise_terrain_alt;
 	delete noise_terrain_persist;
 	delete noise_height_select;
-	delete noise_terrain_alt;
 	delete noise_filler_depth;
-	delete noise_mount_height;
-	delete noise_ridge_uwater;
-	delete noise_floatland_base;
-	delete noise_float_base_height;
-	delete noise_mountain;
-	delete noise_ridge;
+
+	if (spflags & MGV7_MOUNTAINS)
+		delete noise_mount_height;
+
+	if (spflags & MGV7_FLOATLANDS) {
+		delete noise_floatland_base;
+		delete noise_float_base_height;
+	}
+
+	if (spflags & MGV7_RIDGES) {
+		delete noise_ridge_uwater;
+		delete noise_ridge;
+	}
+
+	if ((spflags & MGV7_MOUNTAINS) || (spflags & MGV7_FLOATLANDS))
+		delete noise_mountain;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,10 @@ MapgenFlat::MapgenFlat(int mapgenid, MapgenFlatParams params, EmergeManager em`
`73`	`73`
`74`	`74`	`MapgenFlat::~MapgenFlat()`
`75`	`75`	`{`
`76`		`- delete noise_terrain;`
`77`	`76`	`delete noise_filler_depth;`
	`77`	`+`
	`78`	`+ if ((spflags & MGFLAT_LAKES) \|\| (spflags & MGFLAT_HILLS))`
	`79`	`+ delete noise_terrain;`
`78`	`80`	`}`
`79`	`81`
`80`	`82`