# HG changeset patch # User unc0rr # Date 1292348810 -10800 # Node ID 0a81be113e21dd5ef3c4f606731ac769cf9dbbc7 # Parent 65c294aedaea7757a2388650d3bc84d77a12c833 Try to send drawn map data to net server diff -r 65c294aedaea -r 0a81be113e21 QTfrontend/gamecfgwidget.cpp --- a/QTfrontend/gamecfgwidget.cpp Tue Dec 14 20:01:27 2010 +0300 +++ b/QTfrontend/gamecfgwidget.cpp Tue Dec 14 20:46:50 2010 +0300 @@ -140,6 +140,7 @@ connect(pMapContainer, SIGNAL(themeChanged(const QString &)), this, SLOT(themeChanged(const QString &))); connect(pMapContainer, SIGNAL(newTemplateFilter(int)), this, SLOT(templateFilterChanged(int))); connect(pMapContainer, SIGNAL(drawMapRequested()), this, SIGNAL(goToDrawMap())); + connect(pMapContainer, SIGNAL(drawnMapChanged(const QByteArray &)), this, SLOT(onDrawnMapChanged(const QByteArray &))); } void GameCFGWidget::jumpToSchemes() @@ -529,3 +530,10 @@ { schemeChanged(GameSchemes->currentIndex()); } + +void GameCFGWidget::onDrawnMapChanged(const QByteArray & data) +{ + QStringList sl; + sl << QString(qCompress(data).toBase64()); + emit paramChanged("DRAWNMAP", sl); +} \ No newline at end of file diff -r 65c294aedaea -r 0a81be113e21 QTfrontend/gamecfgwidget.h --- a/QTfrontend/gamecfgwidget.h Tue Dec 14 20:01:27 2010 +0300 +++ b/QTfrontend/gamecfgwidget.h Tue Dec 14 20:46:50 2010 +0300 @@ -70,6 +70,7 @@ void jumpToWeapons(); void mapgenChanged(MapGenerator m); void maze_sizeChanged(int s); + void onDrawnMapChanged(const QByteArray & data); private: QGridLayout mainLayout; diff -r 65c294aedaea -r 0a81be113e21 QTfrontend/hwform.cpp --- a/QTfrontend/hwform.cpp Tue Dec 14 20:01:27 2010 +0300 +++ b/QTfrontend/hwform.cpp Tue Dec 14 20:46:50 2010 +0300 @@ -446,9 +446,9 @@ if(lastid == ID_PAGE_DRAWMAP) { if(id = ID_PAGE_MULTIPLAYER) - ui.pageMultiplayer->gameCFG->pMapContainer->changeImage(); + ui.pageMultiplayer->gameCFG->pMapContainer->mapDrawingFinished(); else - ui.pageNetGame->pGameCFG->pMapContainer->changeImage(); + ui.pageNetGame->pGameCFG->pMapContainer->mapDrawingFinished(); } if (id == ID_PAGE_MULTIPLAYER || id == ID_PAGE_NETGAME) { diff -r 65c294aedaea -r 0a81be113e21 QTfrontend/mapContainer.cpp --- a/QTfrontend/mapContainer.cpp Tue Dec 14 20:01:27 2010 +0300 +++ b/QTfrontend/mapContainer.cpp Tue Dec 14 20:46:50 2010 +0300 @@ -559,3 +559,10 @@ { return &drawMapScene; } + +void HWMapContainer::mapDrawingFinished() +{ + changeImage(); + + emit drawnMapChanged(getDrawnMapData()); +} \ No newline at end of file diff -r 65c294aedaea -r 0a81be113e21 QTfrontend/mapContainer.h --- a/QTfrontend/mapContainer.h Tue Dec 14 20:01:27 2010 +0300 +++ b/QTfrontend/mapContainer.h Tue Dec 14 20:46:50 2010 +0300 @@ -58,6 +58,7 @@ public slots: void changeImage(); + void mapDrawingFinished(); void setSeed(const QString & seed); void setMap(const QString & map); void setTheme(const QString & theme); @@ -73,6 +74,7 @@ void mapgenChanged(MapGenerator m); void maze_sizeChanged(int s); void drawMapRequested(); + void drawnMapChanged(const QByteArray & data); private slots: void setImage(const QImage newImage);