127 cType->insertItem(2, tr("Hand-drawn"), MapModel::HandDrawnMap); |
127 cType->insertItem(2, tr("Hand-drawn"), MapModel::HandDrawnMap); |
128 cType->insertItem(3, tr("Randomly generated"), MapModel::GeneratedMap); |
128 cType->insertItem(3, tr("Randomly generated"), MapModel::GeneratedMap); |
129 cType->insertItem(4, tr("Random maze"), MapModel::GeneratedMaze); |
129 cType->insertItem(4, tr("Random maze"), MapModel::GeneratedMaze); |
130 cType->insertItem(5, tr("Random perlin"), MapModel::GeneratedPerlin); |
130 cType->insertItem(5, tr("Random perlin"), MapModel::GeneratedPerlin); |
131 cType->insertItem(6, tr("Forts"), MapModel::FortsMap); |
131 cType->insertItem(6, tr("Forts"), MapModel::FortsMap); |
132 connect(cType, SIGNAL(currentIndexChanged(int)), this, SLOT(mapTypeChanged(int))); |
132 cType->insertItem(7, tr("WFC"), MapModel::WfcMap); |
|
133 connect(cType, SIGNAL(currentIndexChanged(int)), this, |
|
134 SLOT(mapTypeChanged(int))); |
133 m_childWidgets << cType; |
135 m_childWidgets << cType; |
134 |
136 |
135 /* Randomize button */ |
137 /* Randomize button */ |
136 |
138 |
137 topLayout->addStretch(1); |
139 topLayout->addStretch(1); |
758 break; |
760 break; |
759 case MAPGEN_FORTS: |
761 case MAPGEN_FORTS: |
760 m_mapInfo.type = MapModel::FortsMap; |
762 m_mapInfo.type = MapModel::FortsMap; |
761 f = true; |
763 f = true; |
762 break; |
764 break; |
|
765 case MAPGEN_WFC: |
|
766 m_mapInfo.type = MapModel::WfcMap; |
|
767 f = true; |
|
768 break; |
763 case MAPGEN_MAP: |
769 case MAPGEN_MAP: |
764 switch (m_mapInfo.type) |
770 switch (m_mapInfo.type) { |
765 { |
771 case MapModel::GeneratedMap: |
766 case MapModel::GeneratedMap: |
772 case MapModel::GeneratedMaze: |
767 case MapModel::GeneratedMaze: |
773 case MapModel::GeneratedPerlin: |
768 case MapModel::GeneratedPerlin: |
774 case MapModel::HandDrawnMap: |
769 case MapModel::HandDrawnMap: |
775 case MapModel::FortsMap: |
770 case MapModel::FortsMap: |
776 case MapModel::WfcMap: |
771 m_mapInfo.type = MapModel::Invalid; |
777 m_mapInfo.type = MapModel::Invalid; |
772 default: |
778 default: |
773 break; |
779 break; |
774 } |
780 } |
775 break; |
781 break; |
776 } |
782 } |
777 |
783 |
778 if(f) |
784 if(f) |
779 changeMapType(m_mapInfo.type, QModelIndex()); |
785 changeMapType(m_mapInfo.type, QModelIndex()); |
780 } |
786 } |
946 switch (type) |
952 switch (type) |
947 { |
953 { |
948 case MapModel::GeneratedMap: |
954 case MapModel::GeneratedMap: |
949 case MapModel::GeneratedPerlin: |
955 case MapModel::GeneratedPerlin: |
950 case MapModel::GeneratedMaze: |
956 case MapModel::GeneratedMaze: |
951 mapPreview->setWhatsThis(randomAllPrev); |
957 case MapModel::WfcMap: |
952 mapFeatureSize->setWhatsThis(mfsComplex); |
958 mapPreview->setWhatsThis(randomAllPrev); |
953 btnRandomize->setWhatsThis(randomAll); |
959 mapFeatureSize->setWhatsThis(mfsComplex); |
954 break; |
960 btnRandomize->setWhatsThis(randomAll); |
|
961 break; |
955 case MapModel::MissionMap: |
962 case MapModel::MissionMap: |
956 case MapModel::StaticMap: |
963 case MapModel::StaticMap: |
957 mapPreview->setWhatsThis(randomAllPrev); |
964 mapPreview->setWhatsThis(randomAllPrev); |
958 btnRandomize->setWhatsThis(randomAll); |
965 btnRandomize->setWhatsThis(randomAll); |
959 break; |
966 break; |
1057 case MapModel::FortsMap: |
1064 case MapModel::FortsMap: |
1058 mapgen = MAPGEN_FORTS; |
1065 mapgen = MAPGEN_FORTS; |
1059 setMapInfo(MapModel::MapInfoForts); |
1066 setMapInfo(MapModel::MapInfoForts); |
1060 lblMapList->hide(); |
1067 lblMapList->hide(); |
1061 break; |
1068 break; |
|
1069 case MapModel::WfcMap: |
|
1070 mapgen = MAPGEN_WFC; |
|
1071 setMapInfo(MapModel::MapInfoRandom); |
|
1072 lblMapList->setText(tr("Map size:")); |
|
1073 lblMapList->show(); |
|
1074 generationStyles->show(); |
|
1075 break; |
1062 default: |
1076 default: |
1063 break; |
1077 break; |
1064 } |
1078 } |
1065 |
1079 |
1066 // Update theme button size |
1080 // Update theme button size |
1067 updateThemeButtonSize(); |
1081 updateThemeButtonSize(); |
1068 |
1082 |