Fixes to 10760 to reduce desyncs on checkers and better heat my room during long dark winter nights
authorunc0rr
Fri, 31 Jul 2015 00:25:31 +0300
changeset 11031 4ad0252470dd
parent 11030 2ef7700c25e9
child 11032 6aa31d7b1fa5
Fixes to 10760 to reduce desyncs on checkers and better heat my room during long dark winter nights
gameServer/EngineInteraction.hs
--- a/gameServer/EngineInteraction.hs	Thu Jul 30 16:28:35 2015 -0400
+++ b/gameServer/EngineInteraction.hs	Fri Jul 31 00:25:31 2015 +0300
@@ -131,10 +131,12 @@
         maybeMap = let m = mParams Map.! "MAP" in if m `elem` mapGenTypes then [] else [eml ["emap ", m]]
         scheme = tail $ prms Map.! "SCHEME"
         mapgen = mParams Map.! "MAPGEN"
-        templateFilterMsg = eml ["e$maze_size ", mParams Map.! "MAZE_SIZE"]
+        mazeSizeMsg = eml ["e$maze_size ", mParams Map.! "MAZE_SIZE"]
         mapgenSpecific = case mapgen of
+            "1" -> [mazeSizeMsg]
+            "2" -> [mazeSizeMsg]
             "3" -> let d = head . fromMaybe [""] $ Map.lookup "DRAWNMAP" prms in if BW.length d <= 4 then [] else drawnMapData d
-            _ -> [templateFilterMsg]
+            _ -> []
         gameFlags :: Word32
         gameFlags = foldl (\r (b, f) -> if b == "false" then r else r .|. f) 0 $ zip scheme gameFlagConsts
         schemeFlags = map (\(v, (n, m)) -> eml [n, " ", showB $ (readInt_ v) * m])