diff -r 31570b766315 -r ed5a6478e710 QTfrontend/net/hwmap.cpp --- a/QTfrontend/net/hwmap.cpp Tue Nov 10 18:16:35 2015 +0100 +++ b/QTfrontend/net/hwmap.cpp Tue Nov 10 20:43:13 2015 +0100 @@ -1,7 +1,7 @@ /* * Hedgewars, a free turn based strategy game * Copyright (c) 2006-2007 Ulyanov Igor - * Copyright (c) 2004-2013 Andrey Korotaev + * Copyright (c) 2004-2015 Andrey Korotaev * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,15 +14,23 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include +#include + #include "hwconsts.h" #include "hwmap.h" HWMap::HWMap(QObject * parent) : TCPBase(false, parent) { + templateFilter = 0; + m_mapgen = MAPGEN_REGULAR; + m_maze_size = 0; + m_feature_size = 50; } HWMap::~HWMap() @@ -34,12 +42,15 @@ return !m_hasStarted; } -void HWMap::getImage(const QString & seed, int filter, MapGenerator mapgen, int maze_size, const QByteArray & drawMapData) +void HWMap::getImage(const QString & seed, int filter, MapGenerator mapgen, int maze_size, const QByteArray & drawMapData, QString & script, QString & scriptparam, int feature_size) { m_seed = seed; + m_script = script; + m_scriptparam = scriptparam; templateFilter = filter; m_mapgen = mapgen; m_maze_size = maze_size; + m_feature_size = feature_size; if(mapgen == MAPGEN_DRAWN) m_drawMapData = drawMapData; Start(true); } @@ -52,19 +63,57 @@ arguments << QString("%1").arg(ipc_port); arguments << "--user-prefix"; arguments << cfgdir->absolutePath(); + arguments << "--prefix"; + arguments << datadir->absolutePath(); arguments << "--landpreview"; return arguments; } void HWMap::onClientDisconnect() -{ +{ + QLinearGradient linearGrad(QPoint(128, 0), QPoint(128, 128)); + linearGrad.setColorAt(1, QColor(0, 0, 192)); + linearGrad.setColorAt(0, QColor(66, 115, 225)); + if (readbuffer.size() == 128 * 32 + 1) { quint8 *buf = (quint8*) readbuffer.constData(); QImage im(buf, 256, 128, QImage::Format_Mono); im.setNumColors(2); + + QPixmap px(QSize(256, 128)); + QPixmap pxres(px.size()); + QPainter p(&pxres); + + px.fill(Qt::yellow); + QBitmap bm = QBitmap::fromImage(im); + px.setMask(bm); + + p.fillRect(pxres.rect(), linearGrad); + p.drawPixmap(0, 0, px); + emit HHLimitReceived(buf[128 * 32]); - emit ImageReceived(im); + emit ImageReceived(px); + } else if (readbuffer.size() == 128 * 256 + 1) + { + QVector colorTable; + colorTable.resize(256); + for(int i = 0; i < 256; ++i) + colorTable[i] = qRgba(255, 255, 0, i); + + const quint8 *buf = (const quint8*) readbuffer.constData(); + QImage im(buf, 256, 128, QImage::Format_Indexed8); + im.setColorTable(colorTable); + + QPixmap px = QPixmap::fromImage(im, Qt::ColorOnly); + QPixmap pxres(px.size()); + QPainter p(&pxres); + + p.fillRect(pxres.rect(), linearGrad); + p.drawPixmap(0, 0, px); + + emit HHLimitReceived(buf[128 * 256]); + emit ImageReceived(px); } } @@ -73,10 +122,17 @@ SendIPC(QString("eseed %1").arg(m_seed).toUtf8()); SendIPC(QString("e$template_filter %1").arg(templateFilter).toUtf8()); SendIPC(QString("e$mapgen %1").arg(m_mapgen).toUtf8()); + SendIPC(QString("e$feature_size %1").arg(m_feature_size).toUtf8()); + if (!m_script.isEmpty()) + { + SendIPC(QString("escript Scripts/Multiplayer/%1.lua").arg(m_script).toUtf8()); + SendIPC(QString("e$scriptparam %1").arg(m_scriptparam).toUtf8()); + } switch (m_mapgen) { case MAPGEN_MAZE: + case MAPGEN_PERLIN: SendIPC(QString("e$maze_size %1").arg(m_maze_size).toUtf8()); break;