diff options
Diffstat (limited to 'src/map.cpp')
| -rw-r--r-- | src/map.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/map.cpp b/src/map.cpp index ea82194b8..717b0cf9b 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -2013,10 +2013,10 @@ ServerMap::ServerMap(std::string savedir, IGameDef *gamedef, EmergeManager *emer if (g_settings->get("fixed_map_seed").empty()) { - m_seed = (((u64)(myrand()%0xffff)<<0) - + ((u64)(myrand()%0xffff)<<16) - + ((u64)(myrand()%0xffff)<<32) - + ((u64)(myrand()&0xffff)<<48)); + m_seed = (((u64)(myrand() & 0xffff) << 0) + | ((u64)(myrand() & 0xffff) << 16) + | ((u64)(myrand() & 0xffff) << 32) + | ((u64)(myrand() & 0xffff) << 48)); m_mgparams->seed = m_seed; } @@ -3078,14 +3078,7 @@ void ServerMap::saveMapMeta() Settings params; - params.set("mg_name", m_emerge->params->mg_name); - params.setU64("seed", m_emerge->params->seed); - params.setS16("water_level", m_emerge->params->water_level); - params.setS16("chunksize", m_emerge->params->chunksize); - params.setS32("mg_flags", m_emerge->params->flags); - - m_emerge->params->writeParams(¶ms); - + m_emerge->setParamsToSettings(¶ms); params.writeLines(os); os<<"[end_of_params]\n"; |