diff options
| author | kwolekr <kwolekr@minetest.net> | 2013-09-17 02:57:10 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2013-11-04 23:59:26 -0500 |
| commit | e46c5277334e7435b74eedba7fdfe2c773f48d06 (patch) | |
| tree | 9f5ebc7fc83d5436e1931f1118b76e021b2246d4 /src/emerge.cpp | |
| parent | 1a96987d0fbbcf689825851ee282fe79e4658c02 (diff) | |
| download | minetest-e46c5277334e7435b74eedba7fdfe2c773f48d06.tar.gz minetest-e46c5277334e7435b74eedba7fdfe2c773f48d06.tar.bz2 minetest-e46c5277334e7435b74eedba7fdfe2c773f48d06.zip | |
Accept hexadecimal and string values for seeds
Diffstat (limited to 'src/emerge.cpp')
| -rw-r--r-- | src/emerge.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/emerge.cpp b/src/emerge.cpp index ed9aa9044..569f1b80a 100644 --- a/src/emerge.cpp +++ b/src/emerge.cpp @@ -351,8 +351,11 @@ MapgenParams *EmergeManager::getParamsFromSettings(Settings *settings) { if (!mgparams) return NULL; + std::string seedstr = settings->get(settings == g_settings ? + "fixed_map_seed" : "seed"); + mgparams->mg_name = mg_name; - mgparams->seed = settings->getU64(settings == g_settings ? "fixed_map_seed" : "seed"); + mgparams->seed = read_seed(seedstr.c_str()); mgparams->water_level = settings->getS16("water_level"); mgparams->chunksize = settings->getS16("chunksize"); mgparams->flags = settings->getFlagStr("mg_flags", flagdesc_mapgen); |