diff options
| author | Weblate <42@minetest.ru> | 2013-03-30 19:49:52 +0100 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-03-30 19:49:52 +0100 |
| commit | a0566270d9fa075afa36a7e3e68c690b1b23ba90 (patch) | |
| tree | 6bc88127ee67b7bf4d6a2d6f9d0a9e5f997d1dd1 /src/farmesh.cpp | |
| parent | 0d83bdc3aa9f1077836aacb833ac4ad9bbb9a4f4 (diff) | |
| parent | 1aa50b13622c1e264044839ecdf0152670dae6ce (diff) | |
| download | minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.tar.gz minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.tar.bz2 minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/farmesh.cpp')
| -rw-r--r-- | src/farmesh.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/farmesh.cpp b/src/farmesh.cpp index 443e2b3bf..ecf01ee07 100644 --- a/src/farmesh.cpp +++ b/src/farmesh.cpp @@ -112,13 +112,13 @@ struct HeightPoint float have_sand; float tree_amount; }; -core::map<v2s16, HeightPoint> g_heights; +std::map<v2s16, HeightPoint> g_heights; HeightPoint ground_height(u64 seed, v2s16 p2d) { - core::map<v2s16, HeightPoint>::Node *n = g_heights.find(p2d); - if(n) - return n->getValue(); + std::map<v2s16, HeightPoint>::iterator n = g_heights.find(p2d); + if(n != g_heights.end()) + return n->second; HeightPoint hp; s16 level = Mapgen::find_ground_level_from_noise(seed, p2d, 3); hp.gh = (level-4)*BS; |