# HG changeset patch
# User unc0rr
# Date 1403206331 -14400
# Node ID 3edfa6b68407fa73d77b11f2d694f0cf30bcc765
# Parent  d56b4c109abbdbad2872c19b372ad3704eb0fdd3
Fix issue #791:
 - Send drawn map data on room creation
 - Don't use MAP parameter to deduce mapgen when it is one of "+rnd+", "+drawn+", "+maze+"

diff -r d56b4c109abb -r 3edfa6b68407 QTfrontend/ui/widget/gamecfgwidget.cpp
--- a/QTfrontend/ui/widget/gamecfgwidget.cpp	Thu Jun 19 15:29:31 2014 +0400
+++ b/QTfrontend/ui/widget/gamecfgwidget.cpp	Thu Jun 19 23:32:11 2014 +0400
@@ -402,6 +402,9 @@
     mapgenChanged(pMapContainer->get_mapgen());
     maze_sizeChanged(pMapContainer->getMazeSize());
 
+    if(pMapContainer->get_mapgen() == 2)
+        onDrawnMapChanged(pMapContainer->getDrawnMapData());
+
     // map must be the last
     QString map = pMapContainer->getCurrentMap();
     if (map.size())
diff -r d56b4c109abb -r 3edfa6b68407 QTfrontend/ui/widget/mapContainer.cpp
--- a/QTfrontend/ui/widget/mapContainer.cpp	Thu Jun 19 15:29:31 2014 +0400
+++ b/QTfrontend/ui/widget/mapContainer.cpp	Thu Jun 19 23:32:11 2014 +0400
@@ -416,15 +416,15 @@
 {
     if (map == "+rnd+")
     {
-        changeMapType(MapModel::GeneratedMap);
+        //changeMapType(MapModel::GeneratedMap);
     }
     else if (map == "+maze+")
     {
-        changeMapType(MapModel::GeneratedMaze);
+        //changeMapType(MapModel::GeneratedMaze);
     }
     else if (map == "+drawn+")
     {
-        changeMapType(MapModel::HandDrawnMap);
+        //changeMapType(MapModel::HandDrawnMap);
     }
     else if (m_staticMapModel->mapExists(map))
     {