# HG changeset patch # User prg # Date 1290649006 18000 # Node ID 3d99c2c806ecb734c61711c98d6be6a431d79e35 # Parent c4ce66435305e13487608e1b7a4d4b54bb0f2406 fix for frontend desync diff -r c4ce66435305 -r 3d99c2c806ec QTfrontend/hwmap.h --- a/QTfrontend/hwmap.h Wed Nov 24 16:41:35 2010 -0500 +++ b/QTfrontend/hwmap.h Wed Nov 24 20:36:46 2010 -0500 @@ -31,6 +31,7 @@ { MAPGEN_REGULAR, MAPGEN_MAZE, + MAPGEN_LAST }; class HWMap : public TCPBase diff -r c4ce66435305 -r 3d99c2c806ec QTfrontend/mapContainer.cpp --- a/QTfrontend/mapContainer.cpp Wed Nov 24 16:41:35 2010 -0500 +++ b/QTfrontend/mapContainer.cpp Wed Nov 24 20:36:46 2010 -0500 @@ -370,7 +370,8 @@ void HWMapContainer::setSeed(const QString & seed) { m_seed = seed; - changeImage(); + if (chooseMap->currentIndex() < MAPGEN_LAST) + changeImage(); } void HWMapContainer::setMap(const QString & map) @@ -410,11 +411,11 @@ #include void HWMapContainer::setRandomMap() { + setRandomSeed(); switch(chooseMap->currentIndex()) { case MAPGEN_REGULAR: case MAPGEN_MAZE: - setRandomSeed(); setRandomTheme(); break; default: @@ -429,20 +430,21 @@ void HWMapContainer::setRandomStatic() { chooseMap->setCurrentIndex(4 + numMissions + rand() % (chooseMap->count() - 4 - numMissions)); - m_seed = QUuid::createUuid().toString(); + setRandomSeed(); } void HWMapContainer::setRandomMission() { chooseMap->setCurrentIndex(3 + rand() % numMissions); - m_seed = QUuid::createUuid().toString(); + setRandomSeed(); } void HWMapContainer::setRandomSeed() { m_seed = QUuid::createUuid().toString(); emit seedChanged(m_seed); - changeImage(); + if (chooseMap->currentIndex() < MAPGEN_LAST) + changeImage(); } void HWMapContainer::setRandomTheme()