--- a/QTfrontend/ui/widget/mapContainer.cpp Thu Nov 22 00:56:36 2012 +0400
+++ b/QTfrontend/ui/widget/mapContainer.cpp Thu Nov 22 01:19:16 2012 +0400
@@ -254,7 +254,7 @@
cbMazeSize->hide();
break;
default:
- mapgen = MAPGEN_MAP;
+ mapgen = MAPGEN_NAMED;
gbThemes->hide();
lblFilter->hide();
cbTemplateFilter->hide();
@@ -339,7 +339,7 @@
QString HWMapContainer::getCurrentMap() const
{
- if(chooseMap->currentIndex() < MAPGEN_MAP) return QString();
+ if(chooseMap->currentIndex() < MAPGEN_NAMED) return QString();
return(m_curMap);
}
@@ -468,7 +468,7 @@
updatePreview();
}
-MapGenerator HWMapContainer::get_mapgen(void) const
+int HWMapContainer::get_mapgen(void) const
{
return mapgen;
}
@@ -491,7 +491,7 @@
updatePreview();
}
-void HWMapContainer::intSetMapgen(MapGenerator m)
+void HWMapContainer::intSetMapgen(int m)
{
if (mapgen != m)
{
@@ -508,7 +508,7 @@
case MAPGEN_DRAWN:
m_mapInfo.type = MapModel::HandDrawnMap;
break;
- case MAPGEN_MAP:
+ case MAPGEN_NAMED:
switch (m_mapInfo.type)
{
case MapModel::GeneratedMap:
@@ -521,17 +521,17 @@
break;
}
- if(m != MAPGEN_MAP)
+ if(m != MAPGEN_NAMED)
chooseMap->setCurrentIndex(m);
emit mapgenChanged(m);
}
}
-void HWMapContainer::setMapgen(MapGenerator m)
+void HWMapContainer::setMapgen(int m)
{
intSetMapgen(m);
- if(m != MAPGEN_MAP)
+ if(m != MAPGEN_NAMED)
updatePreview();
}
@@ -619,7 +619,7 @@
}
}
-void HWMapContainer::setAllMapParameters(const QString &map, MapGenerator m, int mazesize, const QString &seed, int tmpl)
+void HWMapContainer::setAllMapParameters(const QString &map, int m, int mazesize, const QString &seed, int tmpl)
{
intSetMapgen(m);
intSetMazeSize(mazesize);