From c6c5edd73a97f2991113ba48d9c2415222fe4709 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Wed, 5 Feb 2014 00:05:58 -0500 Subject: Revert "Fix settings to honor numeric conversion errors" This reverts commit 3f376a092e1c16429fb52f24736e9da98aff4cd5. --- src/mapgen_v6.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mapgen_v6.cpp') diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp index 92ae7dff0..526d4af2e 100644 --- a/src/mapgen_v6.cpp +++ b/src/mapgen_v6.cpp @@ -112,9 +112,9 @@ MapgenV6Params::MapgenV6Params() { void MapgenV6Params::readParams(Settings *settings) { - settings->getFlagStrNoEx("mgv6_spflags", spflags, flagdesc_mapgen_v6); - settings->getFloatNoEx("mgv6_freq_desert", freq_desert); - settings->getFloatNoEx("mgv6_freq_beach", freq_beach); + settings->tryGetFlagStr("mgv6_spflags", spflags, flagdesc_mapgen_v6); + settings->tryGetFloat("mgv6_freq_desert", freq_desert); + settings->tryGetFloat("mgv6_freq_beach", freq_beach); settings->getNoiseParams("mgv6_np_terrain_base", np_terrain_base); settings->getNoiseParams("mgv6_np_terrain_higher", np_terrain_higher); -- cgit v1.2.3