diff options
author | paramat <mat.gregory@virginmedia.com> | 2017-04-22 05:16:50 +0100 |
---|---|---|
committer | paramat <mat.gregory@virginmedia.com> | 2017-04-22 05:37:33 +0100 |
commit | 4c03190ce80457f19f87f9a3a6b4b03fb4f08ee1 (patch) | |
tree | 706d58a0fb74ccfdd61284469e214dfeb0c90cac /src/mapgen_flat.cpp | |
parent | f6d1b682d3c3fa25e11d64d52c93b92760fe2612 (diff) | |
download | minetest-4c03190ce80457f19f87f9a3a6b4b03fb4f08ee1.tar.gz minetest-4c03190ce80457f19f87f9a3a6b4b03fb4f08ee1.tar.bz2 minetest-4c03190ce80457f19f87f9a3a6b4b03fb4f08ee1.zip |
Mgflat, Mgv7: Fix noise crash on world exit.
Fix crash caused by destructor 'delete' on noise objects that are not
created due to mapgen options.
Crash was caused by commit 57eaf62c697cec91890d9cb28d10385d293d2d3f
Diffstat (limited to 'src/mapgen_flat.cpp')
-rw-r--r-- | src/mapgen_flat.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp index c51b5e12e..0a44f71a5 100644 --- 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; } |