equal
deleted
inserted
replaced
542 { |
542 { |
543 if (mapgen != m) |
543 if (mapgen != m) |
544 { |
544 { |
545 mapgen = m; |
545 mapgen = m; |
546 |
546 |
|
547 bool f = false; |
547 switch (m) |
548 switch (m) |
548 { |
549 { |
549 case MAPGEN_REGULAR: |
550 case MAPGEN_REGULAR: |
550 m_mapInfo.type = MapModel::GeneratedMap; |
551 m_mapInfo.type = MapModel::GeneratedMap; |
|
552 f = true; |
551 break; |
553 break; |
552 case MAPGEN_MAZE: |
554 case MAPGEN_MAZE: |
553 m_mapInfo.type = MapModel::GeneratedMaze; |
555 m_mapInfo.type = MapModel::GeneratedMaze; |
|
556 f = true; |
554 break; |
557 break; |
555 case MAPGEN_PERLIN: |
558 case MAPGEN_PERLIN: |
556 m_mapInfo.type = MapModel::GeneratedPerlin; |
559 m_mapInfo.type = MapModel::GeneratedPerlin; |
|
560 f = true; |
557 break; |
561 break; |
558 case MAPGEN_DRAWN: |
562 case MAPGEN_DRAWN: |
559 m_mapInfo.type = MapModel::HandDrawnMap; |
563 m_mapInfo.type = MapModel::HandDrawnMap; |
|
564 f = true; |
560 break; |
565 break; |
561 case MAPGEN_MAP: |
566 case MAPGEN_MAP: |
562 switch (m_mapInfo.type) |
567 switch (m_mapInfo.type) |
563 { |
568 { |
564 case MapModel::GeneratedMap: |
569 case MapModel::GeneratedMap: |
570 break; |
575 break; |
571 } |
576 } |
572 break; |
577 break; |
573 } |
578 } |
574 |
579 |
575 emit mapgenChanged(m); |
580 if(f) |
|
581 changeMapType(m_mapInfo.type, QModelIndex()); |
576 } |
582 } |
577 } |
583 } |
578 |
584 |
579 void HWMapContainer::setMapgen(MapGenerator m) |
585 void HWMapContainer::setMapgen(MapGenerator m) |
580 { |
586 { |
871 { |
877 { |
872 mapList->setCurrentIndex(map); |
878 mapList->setCurrentIndex(map); |
873 mapList->scrollTo(map); |
879 mapList->scrollTo(map); |
874 } |
880 } |
875 |
881 |
876 if (map.data(Qt::UserRole + 1).canConvert<MapModel::MapInfo>()) |
882 Q_ASSERT(map.data(Qt::UserRole + 1).canConvert<MapModel::MapInfo>()); // Houston, we have a problem. |
877 setMapInfo(map.data(Qt::UserRole + 1).value<MapModel::MapInfo>()); |
883 setMapInfo(map.data(Qt::UserRole + 1).value<MapModel::MapInfo>()); |
878 else |
|
879 Q_ASSERT(false); // Houston, we have a problem. |
|
880 |
|
881 } |
884 } |
882 |
885 |
883 void HWMapContainer::setMapInfo(MapModel::MapInfo mapInfo) |
886 void HWMapContainer::setMapInfo(MapModel::MapInfo mapInfo) |
884 { |
887 { |
885 m_mapInfo = mapInfo; |
888 m_mapInfo = mapInfo; |