QTfrontend/gamecfgwidget.cpp
changeset 4941 90572c338e60
parent 4936 d65d438acd23
child 4976 088d40d8aba2
--- a/QTfrontend/gamecfgwidget.cpp	Mon Feb 14 08:31:45 2011 -0500
+++ b/QTfrontend/gamecfgwidget.cpp	Tue Feb 15 21:12:22 2011 +0300
@@ -139,7 +139,7 @@
     connect(pMapContainer, SIGNAL(seedChanged(const QString &)), this, SLOT(seedChanged(const QString &)));
     connect(pMapContainer, SIGNAL(mapChanged(const QString &)), this, SLOT(mapChanged(const QString &)));
     connect(pMapContainer, SIGNAL(mapgenChanged(MapGenerator)), this, SLOT(mapgenChanged(MapGenerator)));
-    connect(pMapContainer, SIGNAL(maze_sizeChanged(int)), this, SLOT(maze_sizeChanged(int)));
+    connect(pMapContainer, SIGNAL(mazeSizeChanged(int)), this, SLOT(maze_sizeChanged(int)));
     connect(pMapContainer, SIGNAL(themeChanged(const QString &)), this, SLOT(themeChanged(const QString &)));
     connect(pMapContainer, SIGNAL(newTemplateFilter(int)), this, SLOT(templateFilterChanged(int)));
     connect(pMapContainer, SIGNAL(drawMapRequested()), this, SIGNAL(goToDrawMap()));
@@ -246,7 +246,7 @@
     switch (mapgen)
     {
         case MAPGEN_MAZE:
-            bcfg << QString("e$maze_size %1").arg(pMapContainer->get_maze_size()).toUtf8();
+            bcfg << QString("e$maze_size %1").arg(pMapContainer->getMazeSize()).toUtf8();
             break;
 
         case MAPGEN_DRAWN:
@@ -315,7 +315,7 @@
     scriptChanged(Scripts->currentIndex());
 
     mapgenChanged(pMapContainer->get_mapgen());
-    maze_sizeChanged(pMapContainer->get_maze_size());
+    maze_sizeChanged(pMapContainer->getMazeSize());
 
     // map must be the last
     QString map = pMapContainer->getCurrentMap();
@@ -352,7 +352,7 @@
             return;
         }
         if (param == "MAZE_SIZE") {
-            pMapContainer->setMaze_size(value.toUInt());
+            pMapContainer->setMazeSize(value.toUInt());
             return;
         }
         if (param == "SCRIPT") {
@@ -373,15 +373,21 @@
         }
     }
 
-    if (slValue.size() == 3)
+    if (slValue.size() == 5)
     {
-        if (param == "FULLGENCFG")
+        if (param == "FULLMAPCONFIG")
         {
-            QString seed = slValue[2];
+            QString seed = slValue[3];
             if (!seedRegexp.exactMatch(seed))
                 pMapContainer->seedEdit->setVisible(true);
 
-            pMapContainer->setMapMapgenSeed(slValue[0], (MapGenerator)slValue[1].toUInt(), seed);
+            pMapContainer->setAllMapParameters(
+                    slValue[0],
+                    (MapGenerator)slValue[1].toUInt(),
+                    slValue[2].toUInt(),
+                    seed,
+                    slValue[4].toUInt()
+                    );
             return;
         }
     }