# HG changeset patch # User unc0rr # Date 1420537957 -10800 # Node ID d85fe0cb5df2a656782d5162fac2ef72be53ecc7 # Parent 18afcfaa4d5ac65be326f2b5bc674c9e0418f92b Fix handling of perlin mapgen diff -r 18afcfaa4d5a -r d85fe0cb5df2 gameServer/EngineInteraction.hs --- a/gameServer/EngineInteraction.hs Tue Jan 06 12:12:34 2015 +0300 +++ b/gameServer/EngineInteraction.hs Tue Jan 06 12:52:37 2015 +0300 @@ -119,7 +119,7 @@ && Set.null (keys2 Set.\\ Map.keysSet prms) && (not . null . drop 41 $ scheme) && (not . null . tail $ prms Map.! "AMMO") - mapGenTypes = ["+rnd+", "+maze+", "+drawn+"] + mapGenTypes = ["+rnd+", "+maze+", "+drawn+", "+perlin+"] maybeScript = let s = head . fromMaybe ["Normal"] $ Map.lookup "SCRIPT" prms in if s == "Normal" then [] else [eml ["escript Scripts/Multiplayer/", s, ".lua"]] maybeMap = let m = mParams Map.! "MAP" in if m `elem` mapGenTypes then [] else [eml ["emap ", m]] scheme = tail $ prms Map.! "SCHEME"