equal
deleted
inserted
replaced
552 { |
552 { |
553 if (mapgen != m) |
553 if (mapgen != m) |
554 { |
554 { |
555 mapgen = m; |
555 mapgen = m; |
556 |
556 |
|
557 bool f = false; |
557 switch (m) |
558 switch (m) |
558 { |
559 { |
559 case MAPGEN_REGULAR: |
560 case MAPGEN_REGULAR: |
560 m_mapInfo.type = MapModel::GeneratedMap; |
561 m_mapInfo.type = MapModel::GeneratedMap; |
|
562 f = true; |
561 break; |
563 break; |
562 case MAPGEN_MAZE: |
564 case MAPGEN_MAZE: |
563 m_mapInfo.type = MapModel::GeneratedMaze; |
565 m_mapInfo.type = MapModel::GeneratedMaze; |
|
566 f = true; |
564 break; |
567 break; |
565 case MAPGEN_PERLIN: |
568 case MAPGEN_PERLIN: |
566 m_mapInfo.type = MapModel::GeneratedPerlin; |
569 m_mapInfo.type = MapModel::GeneratedPerlin; |
|
570 f = true; |
567 break; |
571 break; |
568 case MAPGEN_DRAWN: |
572 case MAPGEN_DRAWN: |
569 m_mapInfo.type = MapModel::HandDrawnMap; |
573 m_mapInfo.type = MapModel::HandDrawnMap; |
|
574 f = true; |
570 break; |
575 break; |
571 case MAPGEN_MAP: |
576 case MAPGEN_MAP: |
572 switch (m_mapInfo.type) |
577 switch (m_mapInfo.type) |
573 { |
578 { |
574 case MapModel::GeneratedMap: |
579 case MapModel::GeneratedMap: |
580 break; |
585 break; |
581 } |
586 } |
582 break; |
587 break; |
583 } |
588 } |
584 |
589 |
585 emit mapgenChanged(m); |
590 if(f) |
|
591 changeMapType(m_mapInfo.type, QModelIndex()); |
586 } |
592 } |
587 } |
593 } |
588 |
594 |
589 void HWMapContainer::setMapgen(MapGenerator m) |
595 void HWMapContainer::setMapgen(MapGenerator m) |
590 { |
596 { |
881 { |
887 { |
882 mapList->setCurrentIndex(map); |
888 mapList->setCurrentIndex(map); |
883 mapList->scrollTo(map); |
889 mapList->scrollTo(map); |
884 } |
890 } |
885 |
891 |
886 if (map.data(Qt::UserRole + 1).canConvert<MapModel::MapInfo>()) |
892 Q_ASSERT(map.data(Qt::UserRole + 1).canConvert<MapModel::MapInfo>()); // Houston, we have a problem. |
887 setMapInfo(map.data(Qt::UserRole + 1).value<MapModel::MapInfo>()); |
893 setMapInfo(map.data(Qt::UserRole + 1).value<MapModel::MapInfo>()); |
888 else |
|
889 Q_ASSERT(false); // Houston, we have a problem. |
|
890 |
|
891 } |
894 } |
892 |
895 |
893 void HWMapContainer::setMapInfo(MapModel::MapInfo mapInfo) |
896 void HWMapContainer::setMapInfo(MapModel::MapInfo mapInfo) |
894 { |
897 { |
895 m_mapInfo = mapInfo; |
898 m_mapInfo = mapInfo; |