equal
deleted
inserted
replaced
252 cbTemplateFilter->hide(); |
252 cbTemplateFilter->hide(); |
253 maze_size_label->hide(); |
253 maze_size_label->hide(); |
254 cbMazeSize->hide(); |
254 cbMazeSize->hide(); |
255 break; |
255 break; |
256 default: |
256 default: |
257 mapgen = MAPGEN_MAP; |
257 mapgen = MAPGEN_NAMED; |
258 gbThemes->hide(); |
258 gbThemes->hide(); |
259 lblFilter->hide(); |
259 lblFilter->hide(); |
260 cbTemplateFilter->hide(); |
260 cbTemplateFilter->hide(); |
261 maze_size_label->hide(); |
261 maze_size_label->hide(); |
262 cbMazeSize->hide(); |
262 cbMazeSize->hide(); |
337 return m_seed; |
337 return m_seed; |
338 } |
338 } |
339 |
339 |
340 QString HWMapContainer::getCurrentMap() const |
340 QString HWMapContainer::getCurrentMap() const |
341 { |
341 { |
342 if(chooseMap->currentIndex() < MAPGEN_MAP) return QString(); |
342 if(chooseMap->currentIndex() < MAPGEN_NAMED) return QString(); |
343 return(m_curMap); |
343 return(m_curMap); |
344 } |
344 } |
345 |
345 |
346 QString HWMapContainer::getCurrentTheme() const |
346 QString HWMapContainer::getCurrentTheme() const |
347 { |
347 { |
466 intSetTemplateFilter(filter); |
466 intSetTemplateFilter(filter); |
467 if (m_mapInfo.type == MapModel::GeneratedMap) |
467 if (m_mapInfo.type == MapModel::GeneratedMap) |
468 updatePreview(); |
468 updatePreview(); |
469 } |
469 } |
470 |
470 |
471 MapGenerator HWMapContainer::get_mapgen(void) const |
471 int HWMapContainer::get_mapgen(void) const |
472 { |
472 { |
473 return mapgen; |
473 return mapgen; |
474 } |
474 } |
475 |
475 |
476 int HWMapContainer::getMazeSize(void) const |
476 int HWMapContainer::getMazeSize(void) const |
489 intSetMazeSize(size); |
489 intSetMazeSize(size); |
490 if (m_mapInfo.type == MapModel::GeneratedMaze) |
490 if (m_mapInfo.type == MapModel::GeneratedMaze) |
491 updatePreview(); |
491 updatePreview(); |
492 } |
492 } |
493 |
493 |
494 void HWMapContainer::intSetMapgen(MapGenerator m) |
494 void HWMapContainer::intSetMapgen(int m) |
495 { |
495 { |
496 if (mapgen != m) |
496 if (mapgen != m) |
497 { |
497 { |
498 mapgen = m; |
498 mapgen = m; |
499 |
499 |
506 m_mapInfo.type = MapModel::GeneratedMaze; |
506 m_mapInfo.type = MapModel::GeneratedMaze; |
507 break; |
507 break; |
508 case MAPGEN_DRAWN: |
508 case MAPGEN_DRAWN: |
509 m_mapInfo.type = MapModel::HandDrawnMap; |
509 m_mapInfo.type = MapModel::HandDrawnMap; |
510 break; |
510 break; |
511 case MAPGEN_MAP: |
511 case MAPGEN_NAMED: |
512 switch (m_mapInfo.type) |
512 switch (m_mapInfo.type) |
513 { |
513 { |
514 case MapModel::GeneratedMap: |
514 case MapModel::GeneratedMap: |
515 case MapModel::GeneratedMaze: |
515 case MapModel::GeneratedMaze: |
516 case MapModel::HandDrawnMap: |
516 case MapModel::HandDrawnMap: |
519 break; |
519 break; |
520 } |
520 } |
521 break; |
521 break; |
522 } |
522 } |
523 |
523 |
524 if(m != MAPGEN_MAP) |
524 if(m != MAPGEN_NAMED) |
525 chooseMap->setCurrentIndex(m); |
525 chooseMap->setCurrentIndex(m); |
526 |
526 |
527 emit mapgenChanged(m); |
527 emit mapgenChanged(m); |
528 } |
528 } |
529 } |
529 } |
530 |
530 |
531 void HWMapContainer::setMapgen(MapGenerator m) |
531 void HWMapContainer::setMapgen(int m) |
532 { |
532 { |
533 intSetMapgen(m); |
533 intSetMapgen(m); |
534 if(m != MAPGEN_MAP) |
534 if(m != MAPGEN_NAMED) |
535 updatePreview(); |
535 updatePreview(); |
536 } |
536 } |
537 |
537 |
538 void HWMapContainer::setDrawnMapData(const QByteArray & ar) |
538 void HWMapContainer::setDrawnMapData(const QByteArray & ar) |
539 { |
539 { |
617 hhLimit = m_mapInfo.limit; |
617 hhLimit = m_mapInfo.limit; |
618 addInfoToPreview(mapImage); |
618 addInfoToPreview(mapImage); |
619 } |
619 } |
620 } |
620 } |
621 |
621 |
622 void HWMapContainer::setAllMapParameters(const QString &map, MapGenerator m, int mazesize, const QString &seed, int tmpl) |
622 void HWMapContainer::setAllMapParameters(const QString &map, int m, int mazesize, const QString &seed, int tmpl) |
623 { |
623 { |
624 intSetMapgen(m); |
624 intSetMapgen(m); |
625 intSetMazeSize(mazesize); |
625 intSetMazeSize(mazesize); |
626 intSetSeed(seed); |
626 intSetSeed(seed); |
627 intSetTemplateFilter(tmpl); |
627 intSetTemplateFilter(tmpl); |