author | sheepluva |
Mon, 17 Oct 2011 20:40:15 +0200 | |
changeset 6143 | 898e3479a4e3 |
parent 6087 | 6e422ea250a1 |
permissions | -rw-r--r-- |
184 | 1 |
/* |
1066 | 2 |
* Hedgewars, a free turn based strategy game |
4976 | 3 |
* Copyright (c) 2006-2011 Igor Ulyanov <iulyanov@gmail.com> |
184 | 4 |
* |
5 |
* This program is free software; you can redistribute it and/or modify |
|
6 |
* it under the terms of the GNU General Public License as published by |
|
7 |
* the Free Software Foundation; version 2 of the License |
|
8 |
* |
|
9 |
* This program is distributed in the hope that it will be useful, |
|
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
12 |
* GNU General Public License for more details. |
|
13 |
* |
|
14 |
* You should have received a copy of the GNU General Public License |
|
15 |
* along with this program; if not, write to the Free Software |
|
16 |
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA |
|
17 |
*/ |
|
18 |
||
19 |
#include <QPushButton> |
|
20 |
#include <QBuffer> |
|
21 |
#include <QUuid> |
|
22 |
#include <QBitmap> |
|
23 |
#include <QPainter> |
|
24 |
#include <QLinearGradient> |
|
25 |
#include <QColor> |
|
249 | 26 |
#include <QTextStream> |
1209 | 27 |
#include <QLabel> |
5289
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
28 |
#include <QListView> |
1209 | 29 |
#include <QVBoxLayout> |
1224 | 30 |
#include <QIcon> |
4519 | 31 |
#include <QLineEdit> |
4562 | 32 |
#include <QMessageBox> |
5289
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
33 |
#include <QStringListModel> |
249 | 34 |
|
35 |
#include "hwconsts.h" |
|
788
00720357601f
- Get rid of PageSimpleGame, now pressing 'quick game' just starts round
unc0rr
parents:
682
diff
changeset
|
36 |
#include "mapContainer.h" |
1209 | 37 |
#include "igbox.h" |
5252 | 38 |
#include "HWApplication.h" |
184 | 39 |
|
40 |
HWMapContainer::HWMapContainer(QWidget * parent) : |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
41 |
QWidget(parent), |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
42 |
mainLayout(this), |
3133 | 43 |
pMap(0), |
4562 | 44 |
mapgen(MAPGEN_REGULAR) |
184 | 45 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
46 |
hhSmall.load(":/res/hh_small.png"); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
47 |
hhLimit = 18; |
1797 | 48 |
templateFilter = 0; |
2377 | 49 |
|
5252 | 50 |
mainLayout.setContentsMargins(HWApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin), |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
51 |
1, |
5252 | 52 |
HWApplication::style()->pixelMetric(QStyle::PM_LayoutRightMargin), |
53 |
HWApplication::style()->pixelMetric(QStyle::PM_LayoutBottomMargin)); |
|
2377 | 54 |
|
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
55 |
QWidget* mapWidget = new QWidget(this); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
56 |
mainLayout.addWidget(mapWidget, 0, 0, Qt::AlignHCenter); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
57 |
|
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
58 |
QGridLayout* mapLayout = new QGridLayout(mapWidget); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
59 |
mapLayout->setMargin(0); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
60 |
|
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
61 |
imageButt = new QPushButton(mapWidget); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
62 |
imageButt->setObjectName("imageButt"); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
63 |
imageButt->setFixedSize(256 + 6, 128 + 6); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
64 |
imageButt->setFlat(true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
65 |
imageButt->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);//QSizePolicy::Minimum, QSizePolicy::Minimum); |
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
66 |
mapLayout->addWidget(imageButt, 0, 0, 1, 2); |
4337 | 67 |
connect(imageButt, SIGNAL(clicked()), this, SLOT(setRandomMap())); |
249 | 68 |
|
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
69 |
chooseMap = new QComboBox(mapWidget); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
70 |
chooseMap->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); |
4125
877ecc9d9d82
Disable icons on maps/generated terrain dropdowns since they haven't been drawn yet. Add per-hog-ammo button
nemo
parents:
3951
diff
changeset
|
71 |
chooseMap->addItem( |
877ecc9d9d82
Disable icons on maps/generated terrain dropdowns since they haven't been drawn yet. Add per-hog-ammo button
nemo
parents:
3951
diff
changeset
|
72 |
// FIXME - need real icons. Disabling until then |
877ecc9d9d82
Disable icons on maps/generated terrain dropdowns since they haven't been drawn yet. Add per-hog-ammo button
nemo
parents:
3951
diff
changeset
|
73 |
//QIcon(":/res/mapRandom.png"), |
877ecc9d9d82
Disable icons on maps/generated terrain dropdowns since they haven't been drawn yet. Add per-hog-ammo button
nemo
parents:
3951
diff
changeset
|
74 |
QComboBox::tr("generated map...")); |
877ecc9d9d82
Disable icons on maps/generated terrain dropdowns since they haven't been drawn yet. Add per-hog-ammo button
nemo
parents:
3951
diff
changeset
|
75 |
chooseMap->addItem( |
877ecc9d9d82
Disable icons on maps/generated terrain dropdowns since they haven't been drawn yet. Add per-hog-ammo button
nemo
parents:
3951
diff
changeset
|
76 |
// FIXME - need real icons. Disabling until then |
877ecc9d9d82
Disable icons on maps/generated terrain dropdowns since they haven't been drawn yet. Add per-hog-ammo button
nemo
parents:
3951
diff
changeset
|
77 |
//QIcon(":/res/mapMaze.png"), |
877ecc9d9d82
Disable icons on maps/generated terrain dropdowns since they haven't been drawn yet. Add per-hog-ammo button
nemo
parents:
3951
diff
changeset
|
78 |
QComboBox::tr("generated maze...")); |
4487 | 79 |
|
80 |
chooseMap->addItem(QComboBox::tr("hand drawn map...")); |
|
81 |
chooseMap->insertSeparator(chooseMap->count()); // separator between generators and missions |
|
82 |
||
3185 | 83 |
chooseMap->insertSeparator(chooseMap->count()); // separator between generators and missions |
84 |
||
85 |
int missionindex = chooseMap->count(); |
|
4337 | 86 |
numMissions = 0; |
5238
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
87 |
QFile mapLuaFile; |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
88 |
QFile mapCfgFile; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
89 |
for (int i = 0; i < mapList->size(); ++i) { |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
90 |
QString map = (*mapList)[i]; |
5238
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
91 |
mapCfgFile.setFileName( |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
92 |
QString("%1/Data/Maps/%2/map.cfg") |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
93 |
.arg(cfgdir->absolutePath()) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
94 |
.arg(map)); |
5238
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
95 |
if (mapCfgFile.exists()) { |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
96 |
mapLuaFile.setFileName( |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
97 |
QString("%1/Data/Maps/%2/map.lua") |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
98 |
.arg(cfgdir->absolutePath()) |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
99 |
.arg(map)); |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
100 |
} else { |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
101 |
mapCfgFile.setFileName( |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
102 |
QString("%1/Maps/%2/map.cfg") |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
103 |
.arg(datadir->absolutePath()) |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
104 |
.arg(map)); |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
105 |
mapLuaFile.setFileName( |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
106 |
QString("%1/Maps/%2/map.lua") |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
107 |
.arg(datadir->absolutePath()) |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
108 |
.arg(map)); |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
109 |
} |
1790 | 110 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
111 |
if (mapCfgFile.open(QFile::ReadOnly)) { |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
112 |
QString theme; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
113 |
quint32 limit = 0; |
4513
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
114 |
QString scheme; |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
115 |
QString weapons; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
116 |
QList<QVariant> mapInfo; |
6087 | 117 |
bool isMission = mapLuaFile.exists(); |
118 |
||
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
119 |
QTextStream input(&mapCfgFile); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
120 |
input >> theme; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
121 |
input >> limit; |
4513
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
122 |
input >> scheme; |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
123 |
input >> weapons; |
3008 | 124 |
mapInfo.push_back(map); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
125 |
mapInfo.push_back(theme); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
126 |
if (limit) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
127 |
mapInfo.push_back(limit); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
128 |
else |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
129 |
mapInfo.push_back(18); |
6087 | 130 |
|
131 |
||
132 |
mapInfo.push_back(isMission); |
|
133 |
||
4513
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
134 |
if (scheme.isEmpty()) |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
135 |
scheme = "locked"; |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
136 |
scheme.replace("_", " "); |
6087 | 137 |
|
4513
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
138 |
if (weapons.isEmpty()) |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
139 |
weapons = "locked"; |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
140 |
weapons.replace("_", " "); |
6087 | 141 |
|
4513
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
142 |
mapInfo.push_back(scheme); |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
143 |
mapInfo.push_back(weapons); |
6087 | 144 |
|
145 |
if(isMission) |
|
4337 | 146 |
{ |
4125
877ecc9d9d82
Disable icons on maps/generated terrain dropdowns since they haven't been drawn yet. Add per-hog-ammo button
nemo
parents:
3951
diff
changeset
|
147 |
chooseMap->insertItem(missionindex++, |
877ecc9d9d82
Disable icons on maps/generated terrain dropdowns since they haven't been drawn yet. Add per-hog-ammo button
nemo
parents:
3951
diff
changeset
|
148 |
// FIXME - need real icons. Disabling until then |
877ecc9d9d82
Disable icons on maps/generated terrain dropdowns since they haven't been drawn yet. Add per-hog-ammo button
nemo
parents:
3951
diff
changeset
|
149 |
//QIcon(":/res/mapMission.png"), |
877ecc9d9d82
Disable icons on maps/generated terrain dropdowns since they haven't been drawn yet. Add per-hog-ammo button
nemo
parents:
3951
diff
changeset
|
150 |
QComboBox::tr("Mission") + ": " + map, mapInfo); |
4337 | 151 |
numMissions++; |
152 |
} |
|
3185 | 153 |
else |
4125
877ecc9d9d82
Disable icons on maps/generated terrain dropdowns since they haven't been drawn yet. Add per-hog-ammo button
nemo
parents:
3951
diff
changeset
|
154 |
chooseMap->addItem( |
877ecc9d9d82
Disable icons on maps/generated terrain dropdowns since they haven't been drawn yet. Add per-hog-ammo button
nemo
parents:
3951
diff
changeset
|
155 |
// FIXME - need real icons. Disabling until then |
4337 | 156 |
//QIcon(":/res/mapCustom.png"), |
157 |
map, mapInfo); |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
158 |
mapCfgFile.close(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
159 |
} |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
160 |
} |
3185 | 161 |
chooseMap->insertSeparator(missionindex); // separator between missions and maps |
2377 | 162 |
|
4941 | 163 |
connect(chooseMap, SIGNAL(activated(int)), this, SLOT(mapChanged(int))); |
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
164 |
mapLayout->addWidget(chooseMap, 1, 1); |
249 | 165 |
|
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
166 |
QLabel * lblMap = new QLabel(tr("Map"), mapWidget); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
167 |
mapLayout->addWidget(lblMap, 1, 0); |
1209 | 168 |
|
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
169 |
lblFilter = new QLabel(tr("Filter"), mapWidget); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
170 |
mapLayout->addWidget(lblFilter, 2, 0); |
1802 | 171 |
|
4941 | 172 |
cbTemplateFilter = new QComboBox(mapWidget); |
173 |
cbTemplateFilter->addItem(tr("All"), 0); |
|
174 |
cbTemplateFilter->addItem(tr("Small"), 1); |
|
175 |
cbTemplateFilter->addItem(tr("Medium"), 2); |
|
176 |
cbTemplateFilter->addItem(tr("Large"), 3); |
|
177 |
cbTemplateFilter->addItem(tr("Cavern"), 4); |
|
178 |
cbTemplateFilter->addItem(tr("Wacky"), 5); |
|
179 |
mapLayout->addWidget(cbTemplateFilter, 2, 1); |
|
1802 | 180 |
|
4941 | 181 |
connect(cbTemplateFilter, SIGNAL(activated(int)), this, SLOT(setTemplateFilter(int))); |
1802 | 182 |
|
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
183 |
maze_size_label = new QLabel(tr("Type"), mapWidget); |
5434
99078dea3a8f
fix wrong location of "Type"-label in map-selection
sheepluva
parents:
5289
diff
changeset
|
184 |
mapLayout->addWidget(maze_size_label, 2, 0); |
3133 | 185 |
maze_size_label->hide(); |
4941 | 186 |
cbMazeSize = new QComboBox(mapWidget); |
187 |
cbMazeSize->addItem(tr("Small tunnels"), 0); |
|
188 |
cbMazeSize->addItem(tr("Medium tunnels"), 1); |
|
189 |
cbMazeSize->addItem(tr("Large tunnels"), 2); |
|
190 |
cbMazeSize->addItem(tr("Small floating islands"), 3); |
|
191 |
cbMazeSize->addItem(tr("Medium floating islands"), 4); |
|
192 |
cbMazeSize->addItem(tr("Large floating islands"), 5); |
|
193 |
cbMazeSize->setCurrentIndex(1); |
|
4562 | 194 |
|
4941 | 195 |
mapLayout->addWidget(cbMazeSize, 2, 1); |
196 |
cbMazeSize->hide(); |
|
197 |
connect(cbMazeSize, SIGNAL(activated(int)), this, SLOT(setMazeSize(int))); |
|
3133 | 198 |
|
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
199 |
gbThemes = new IconedGroupBox(mapWidget); |
4701 | 200 |
gbThemes->setTitleTextPadding(80); |
201 |
gbThemes->setContentTopPadding(15); |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
202 |
gbThemes->setTitle(tr("Themes")); |
1248 | 203 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
204 |
//gbThemes->setStyleSheet("padding: 0px"); // doesn't work - stylesheet is set with icon |
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
205 |
mapLayout->addWidget(gbThemes, 0, 2, 3, 1); |
2377 | 206 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
207 |
QVBoxLayout * gbTLayout = new QVBoxLayout(gbThemes); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
208 |
gbTLayout->setContentsMargins(0, 0, 0 ,0); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
209 |
gbTLayout->setSpacing(0); |
5289
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
210 |
lvThemes = new QListView(mapWidget); |
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
211 |
lvThemes->setMinimumHeight(30); |
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
212 |
lvThemes->setFixedWidth(140); |
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
213 |
lvThemes->setModel(themesModel); |
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
214 |
lvThemes->setIconSize(QSize(16, 16)); |
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
215 |
lvThemes->setEditTriggers(QListView::NoEditTriggers); |
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
216 |
|
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
217 |
connect(lvThemes->selectionModel(), SIGNAL(currentRowChanged( const QModelIndex &, const QModelIndex &)), this, SLOT(themeSelected( const QModelIndex &, const QModelIndex &))); |
1802 | 218 |
|
219 |
// override default style to tighten up theme scroller |
|
5289
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
220 |
lvThemes->setStyleSheet(QString( |
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
221 |
"QListView{" |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
222 |
"border: solid;" |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
223 |
"border-width: 0px;" |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
224 |
"border-radius: 0px;" |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
225 |
"border-color: transparent;" |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
226 |
"background-color: #0d0544;" |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
227 |
"color: #ffcc00;" |
3869 | 228 |
"font: bold 13px;" |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
229 |
"}" |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
230 |
) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
231 |
); |
2377 | 232 |
|
5289
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
233 |
gbTLayout->addWidget(lvThemes); |
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
234 |
lvThemes->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Minimum); |
2377 | 235 |
|
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
236 |
mapLayout->setSizeConstraint(QLayout::SetFixedSize); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
237 |
|
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
238 |
QWidget* seedWidget = new QWidget(this); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
239 |
mainLayout.addWidget(seedWidget, 1, 0); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
240 |
|
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
241 |
QGridLayout* seedLayout = new QGridLayout(seedWidget); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
242 |
seedLayout->setMargin(0); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
243 |
|
4699 | 244 |
seedLabel = new QLabel(tr("Seed"), seedWidget); |
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
245 |
seedLayout->addWidget(seedLabel, 3, 0); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
246 |
seedEdit = new QLineEdit(seedWidget); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
247 |
seedEdit->setMaxLength(54); |
4550
d300ea498486
added set button to seed edit so maps won't regenerate as often
Henek
parents:
4537
diff
changeset
|
248 |
connect(seedEdit, SIGNAL(returnPressed()), this, SLOT(seedEdited())); |
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
249 |
seedLayout->addWidget(seedEdit, 3, 1); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
250 |
seedLayout->setColumnStretch(1, 5); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
251 |
seedSet = new QPushButton(seedWidget); |
4699 | 252 |
seedSet->setText(QPushButton::tr("more")); |
4550
d300ea498486
added set button to seed edit so maps won't regenerate as often
Henek
parents:
4537
diff
changeset
|
253 |
connect(seedSet, SIGNAL(clicked()), this, SLOT(seedEdited())); |
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
254 |
seedLayout->setColumnStretch(2, 1); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
255 |
seedLayout->addWidget(seedSet, 3, 2); |
1215 | 256 |
|
4699 | 257 |
seedLabel->setVisible(false); |
258 |
seedEdit->setVisible(false); |
|
259 |
||
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
260 |
setRandomSeed(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
261 |
setRandomTheme(); |
184 | 262 |
} |
263 |
||
264 |
void HWMapContainer::setImage(const QImage newImage) |
|
265 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
266 |
QPixmap px(256, 128); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
267 |
QPixmap pxres(256, 128); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
268 |
QPainter p(&pxres); |
184 | 269 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
270 |
px.fill(Qt::yellow); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
271 |
QBitmap bm = QBitmap::fromImage(newImage); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
272 |
px.setMask(bm); |
184 | 273 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
274 |
QLinearGradient linearGrad(QPoint(128, 0), QPoint(128, 128)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
275 |
linearGrad.setColorAt(1, QColor(0, 0, 192)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
276 |
linearGrad.setColorAt(0, QColor(66, 115, 225)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
277 |
p.fillRect(QRect(0, 0, 256, 128), linearGrad); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
278 |
p.drawPixmap(QPoint(0, 0), px); |
184 | 279 |
|
1790 | 280 |
addInfoToPreview(pxres); |
4561 | 281 |
//chooseMap->setCurrentIndex(mapgen); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
282 |
pMap = 0; |
249 | 283 |
} |
284 |
||
1790 | 285 |
void HWMapContainer::setHHLimit(int newHHLimit) |
286 |
{ |
|
287 |
hhLimit = newHHLimit; |
|
288 |
} |
|
289 |
||
249 | 290 |
void HWMapContainer::mapChanged(int index) |
291 |
{ |
|
3133 | 292 |
switch(index) { |
293 |
case MAPGEN_REGULAR: |
|
294 |
mapgen = MAPGEN_REGULAR; |
|
4562 | 295 |
updatePreview(); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
296 |
gbThemes->show(); |
1802 | 297 |
lblFilter->show(); |
4941 | 298 |
cbTemplateFilter->show(); |
3133 | 299 |
maze_size_label->hide(); |
4941 | 300 |
cbMazeSize->hide(); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
301 |
emit mapChanged("+rnd+"); |
3133 | 302 |
emit themeChanged(chooseMap->itemData(index).toList()[1].toString()); |
303 |
break; |
|
304 |
case MAPGEN_MAZE: |
|
305 |
mapgen = MAPGEN_MAZE; |
|
4562 | 306 |
updatePreview(); |
3133 | 307 |
gbThemes->show(); |
308 |
lblFilter->hide(); |
|
4941 | 309 |
cbTemplateFilter->hide(); |
3133 | 310 |
maze_size_label->show(); |
4941 | 311 |
cbMazeSize->show(); |
3141
70d65353bd60
prg adds option to toggle girders in maze, adjusts some frontend strings
nemo
parents:
3133
diff
changeset
|
312 |
emit mapChanged("+maze+"); |
3133 | 313 |
emit themeChanged(chooseMap->itemData(index).toList()[1].toString()); |
314 |
break; |
|
4487 | 315 |
case MAPGEN_DRAWN: |
316 |
mapgen = MAPGEN_DRAWN; |
|
4562 | 317 |
updatePreview(); |
4487 | 318 |
gbThemes->show(); |
319 |
lblFilter->hide(); |
|
4941 | 320 |
cbTemplateFilter->hide(); |
4487 | 321 |
maze_size_label->hide(); |
4941 | 322 |
cbMazeSize->hide(); |
4487 | 323 |
emit mapChanged("+drawn+"); |
324 |
emit themeChanged(chooseMap->itemData(index).toList()[1].toString()); |
|
325 |
break; |
|
3133 | 326 |
default: |
5794 | 327 |
mapgen = MAPGEN_MAP; |
4562 | 328 |
updatePreview(); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
329 |
gbThemes->hide(); |
1802 | 330 |
lblFilter->hide(); |
4941 | 331 |
cbTemplateFilter->hide(); |
3133 | 332 |
maze_size_label->hide(); |
4941 | 333 |
cbMazeSize->hide(); |
3009 | 334 |
emit mapChanged(chooseMap->itemData(index).toList()[0].toString()); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
335 |
} |
5794 | 336 |
|
337 |
emit mapgenChanged(mapgen); |
|
331 | 338 |
} |
339 |
||
1790 | 340 |
// Should this add text to identify map size? |
341 |
void HWMapContainer::addInfoToPreview(QPixmap image) |
|
342 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
343 |
QPixmap finalImage = QPixmap(image.size()); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
344 |
finalImage.fill(QColor(0, 0, 0, 0)); |
2377 | 345 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
346 |
QPainter p(&finalImage); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
347 |
p.drawPixmap(image.rect(), image); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
348 |
//p.setPen(QColor(0xf4,0x9e,0xe9)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
349 |
p.setPen(QColor(0xff,0xcc,0x00)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
350 |
p.setBrush(QColor(0, 0, 0)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
351 |
p.drawRect(image.rect().width() - hhSmall.rect().width() - 28, 3, 40, 20); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
352 |
p.setFont(QFont("MS Shell Dlg", 10)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
353 |
p.drawText(image.rect().width() - hhSmall.rect().width() - 14 - (hhLimit > 9 ? 10 : 0), 18, QString::number(hhLimit)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
354 |
p.drawPixmap(image.rect().width() - hhSmall.rect().width() - 5, 5, hhSmall.rect().width(), hhSmall.rect().height(), hhSmall); |
1790 | 355 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
356 |
imageButt->setIcon(finalImage); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
357 |
imageButt->setIconSize(image.size()); |
184 | 358 |
} |
359 |
||
4562 | 360 |
void HWMapContainer::askForGeneratedPreview() |
184 | 361 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
362 |
if (pMap) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
363 |
{ |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
364 |
disconnect(pMap, 0, this, SLOT(setImage(const QImage))); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
365 |
disconnect(pMap, 0, this, SLOT(setHHLimit(int))); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
366 |
pMap = 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
367 |
} |
2021 | 368 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
369 |
pMap = new HWMap(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
370 |
connect(pMap, SIGNAL(ImageReceived(const QImage)), this, SLOT(setImage(const QImage))); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
371 |
connect(pMap, SIGNAL(HHLimitReceived(int)), this, SLOT(setHHLimit(int))); |
4562 | 372 |
pMap->getImage(m_seed, |
373 |
getTemplateFilter(), |
|
374 |
get_mapgen(), |
|
4941 | 375 |
getMazeSize(), |
4562 | 376 |
getDrawnMapData() |
377 |
); |
|
184 | 378 |
} |
379 |
||
5289
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
380 |
void HWMapContainer::themeSelected(const QModelIndex & current, const QModelIndex &) |
1215 | 381 |
{ |
5289
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
382 |
QString theme = current.data().toString(); |
4487 | 383 |
QList<QVariant> mapInfo; |
384 |
mapInfo.push_back(QString("+rnd+")); |
|
385 |
mapInfo.push_back(theme); |
|
386 |
mapInfo.push_back(18); |
|
387 |
mapInfo.push_back(false); |
|
388 |
chooseMap->setItemData(0, mapInfo); |
|
389 |
mapInfo[0] = QString("+maze+"); |
|
390 |
chooseMap->setItemData(1, mapInfo); |
|
391 |
mapInfo[0] = QString("+drawn+"); |
|
392 |
chooseMap->setItemData(2, mapInfo); |
|
5289
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
393 |
|
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
394 |
gbThemes->setIcon(qVariantValue<QIcon>(current.data(Qt::UserRole))); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
395 |
emit themeChanged(theme); |
1215 | 396 |
} |
397 |
||
184 | 398 |
QString HWMapContainer::getCurrentSeed() const |
399 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
400 |
return m_seed; |
184 | 401 |
} |
402 |
||
249 | 403 |
QString HWMapContainer::getCurrentMap() const |
404 |
{ |
|
4562 | 405 |
if(chooseMap->currentIndex() < MAPGEN_MAP) return QString(); |
3008 | 406 |
return chooseMap->itemData(chooseMap->currentIndex()).toList()[0].toString(); |
249 | 407 |
} |
408 |
||
409 |
QString HWMapContainer::getCurrentTheme() const |
|
410 |
{ |
|
3008 | 411 |
return chooseMap->itemData(chooseMap->currentIndex()).toList()[1].toString(); |
412 |
} |
|
413 |
||
414 |
bool HWMapContainer::getCurrentIsMission() const |
|
415 |
{ |
|
416 |
if(!chooseMap->currentIndex()) return false; |
|
417 |
return chooseMap->itemData(chooseMap->currentIndex()).toList()[3].toBool(); |
|
1790 | 418 |
} |
419 |
||
420 |
int HWMapContainer::getCurrentHHLimit() const |
|
421 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
422 |
return hhLimit; |
249 | 423 |
} |
424 |
||
4513
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
425 |
QString HWMapContainer::getCurrentScheme() const |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
426 |
{ |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
427 |
return chooseMap->itemData(chooseMap->currentIndex()).toList()[4].toString(); |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
428 |
} |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
429 |
|
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
430 |
QString HWMapContainer::getCurrentWeapons() const |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
431 |
{ |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
432 |
return chooseMap->itemData(chooseMap->currentIndex()).toList()[5].toString(); |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
433 |
} |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
434 |
|
1802 | 435 |
quint32 HWMapContainer::getTemplateFilter() const |
436 |
{ |
|
4941 | 437 |
return cbTemplateFilter->itemData(cbTemplateFilter->currentIndex()).toInt(); |
1802 | 438 |
} |
439 |
||
184 | 440 |
void HWMapContainer::resizeEvent ( QResizeEvent * event ) |
441 |
{ |
|
4560
5d6c7f88db73
- Some work on drawMap widget and scene to allow undo, clear, save and load operations
unc0rr
parents:
4557
diff
changeset
|
442 |
Q_UNUSED(event); |
184 | 443 |
//imageButt->setIconSize(imageButt->size()); |
444 |
} |
|
320 | 445 |
|
4936
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
446 |
void HWMapContainer::intSetSeed(const QString & seed) |
320 | 447 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
448 |
m_seed = seed; |
4519 | 449 |
if (seed != seedEdit->text()) |
450 |
seedEdit->setText(seed); |
|
4936
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
451 |
} |
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
452 |
|
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
453 |
void HWMapContainer::setSeed(const QString & seed) |
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
454 |
{ |
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
455 |
intSetSeed(seed); |
5794 | 456 |
if (chooseMap->currentIndex() < MAPGEN_DRAWN) |
4562 | 457 |
updatePreview(); |
320 | 458 |
} |
459 |
||
4936
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
460 |
void HWMapContainer::intSetMap(const QString & map) |
320 | 461 |
{ |
3008 | 462 |
int id = 0; |
463 |
for(int i = 0; i < chooseMap->count(); i++) |
|
3195 | 464 |
if(!chooseMap->itemData(i).isNull() && chooseMap->itemData(i).toList()[0].toString() == map) |
3008 | 465 |
{ |
466 |
id = i; |
|
467 |
break; |
|
468 |
} |
|
469 |
||
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
470 |
if(id > 0) { |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
471 |
if (pMap) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
472 |
{ |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
473 |
disconnect(pMap, 0, this, SLOT(setImage(const QImage))); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
474 |
disconnect(pMap, 0, this, SLOT(setHHLimit(int))); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
475 |
pMap = 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
476 |
} |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
477 |
chooseMap->setCurrentIndex(id); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
478 |
} |
320 | 479 |
} |
480 |
||
4936
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
481 |
void HWMapContainer::setMap(const QString &map) |
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
482 |
{ |
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
483 |
intSetMap(map); |
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
484 |
updatePreview(); |
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
485 |
} |
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
486 |
|
320 | 487 |
void HWMapContainer::setTheme(const QString & theme) |
488 |
{ |
|
5289
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
489 |
QModelIndexList mdl = themesModel->match(themesModel->index(0), Qt::DisplayRole, theme); |
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
490 |
|
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
491 |
if(mdl.size()) |
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
492 |
lvThemes->setCurrentIndex(mdl.at(0)); |
320 | 493 |
} |
4562 | 494 |
|
4337 | 495 |
void HWMapContainer::setRandomMap() |
496 |
{ |
|
4419 | 497 |
setRandomSeed(); |
4337 | 498 |
switch(chooseMap->currentIndex()) |
499 |
{ |
|
500 |
case MAPGEN_REGULAR: |
|
501 |
case MAPGEN_MAZE: |
|
4511 | 502 |
setRandomTheme(); |
503 |
break; |
|
4487 | 504 |
case MAPGEN_DRAWN: |
4511 | 505 |
emit drawMapRequested(); |
4337 | 506 |
break; |
507 |
default: |
|
4566 | 508 |
if(chooseMap->currentIndex() <= numMissions + MAPGEN_MAP + 1) |
4337 | 509 |
setRandomMission(); |
510 |
else |
|
511 |
setRandomStatic(); |
|
512 |
break; |
|
513 |
} |
|
514 |
} |
|
515 |
||
516 |
void HWMapContainer::setRandomStatic() |
|
517 |
{ |
|
4566 | 518 |
int i = MAPGEN_MAP + 3 + numMissions + rand() % (chooseMap->count() - MAPGEN_MAP - 3 - numMissions); |
519 |
chooseMap->setCurrentIndex(i); |
|
5993
412ada3d2041
randomly selected static/mission maps weren't properly reported to others in room (only new seed was)
sheepluva
parents:
5795
diff
changeset
|
520 |
mapChanged(i); |
4337 | 521 |
} |
522 |
||
523 |
void HWMapContainer::setRandomMission() |
|
524 |
{ |
|
4566 | 525 |
int i = MAPGEN_MAP + 2 + rand() % numMissions; |
526 |
chooseMap->setCurrentIndex(i); |
|
5993
412ada3d2041
randomly selected static/mission maps weren't properly reported to others in room (only new seed was)
sheepluva
parents:
5795
diff
changeset
|
527 |
mapChanged(i); |
4337 | 528 |
} |
320 | 529 |
|
530 |
void HWMapContainer::setRandomSeed() |
|
531 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
532 |
m_seed = QUuid::createUuid().toString(); |
4519 | 533 |
seedEdit->setText(m_seed); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
534 |
emit seedChanged(m_seed); |
4562 | 535 |
if (chooseMap->currentIndex() < MAPGEN_MAP) |
4563 | 536 |
updatePreview(); |
320 | 537 |
} |
1318 | 538 |
|
539 |
void HWMapContainer::setRandomTheme() |
|
540 |
{ |
|
5289
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
541 |
if(!themesModel->rowCount()) return; |
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
542 |
quint32 themeNum = rand() % themesModel->rowCount(); |
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
543 |
lvThemes->setCurrentIndex(themesModel->index(themeNum)); |
1318 | 544 |
} |
1797 | 545 |
|
4941 | 546 |
void HWMapContainer::intSetTemplateFilter(int filter) |
547 |
{ |
|
548 |
cbTemplateFilter->setCurrentIndex(filter); |
|
549 |
emit newTemplateFilter(filter); |
|
550 |
} |
|
551 |
||
1797 | 552 |
void HWMapContainer::setTemplateFilter(int filter) |
553 |
{ |
|
4941 | 554 |
intSetTemplateFilter(filter); |
4562 | 555 |
updatePreview(); |
1802 | 556 |
} |
557 |
||
3133 | 558 |
MapGenerator HWMapContainer::get_mapgen(void) const |
559 |
{ |
|
560 |
return mapgen; |
|
561 |
} |
|
562 |
||
4941 | 563 |
int HWMapContainer::getMazeSize(void) const |
3133 | 564 |
{ |
4941 | 565 |
return cbMazeSize->currentIndex(); |
3133 | 566 |
} |
567 |
||
4941 | 568 |
void HWMapContainer::intSetMazeSize(int size) |
3133 | 569 |
{ |
4941 | 570 |
cbMazeSize->setCurrentIndex(size); |
571 |
emit mazeSizeChanged(size); |
|
572 |
} |
|
573 |
||
574 |
void HWMapContainer::setMazeSize(int size) |
|
575 |
{ |
|
576 |
intSetMazeSize(size); |
|
4562 | 577 |
updatePreview(); |
3133 | 578 |
} |
579 |
||
4936
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
580 |
void HWMapContainer::intSetMapgen(MapGenerator m) |
3133 | 581 |
{ |
582 |
mapgen = m; |
|
5793
401ab167bd9f
This should be a real fix (7643cbb88f09 reverted). Not tested.
unc0rr
parents:
5789
diff
changeset
|
583 |
|
401ab167bd9f
This should be a real fix (7643cbb88f09 reverted). Not tested.
unc0rr
parents:
5789
diff
changeset
|
584 |
if(m != MAPGEN_MAP) |
401ab167bd9f
This should be a real fix (7643cbb88f09 reverted). Not tested.
unc0rr
parents:
5789
diff
changeset
|
585 |
chooseMap->setCurrentIndex(m); |
401ab167bd9f
This should be a real fix (7643cbb88f09 reverted). Not tested.
unc0rr
parents:
5789
diff
changeset
|
586 |
|
3133 | 587 |
emit mapgenChanged(m); |
4936
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
588 |
} |
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
589 |
|
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
590 |
void HWMapContainer::setMapgen(MapGenerator m) |
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
591 |
{ |
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
592 |
intSetMapgen(m); |
4562 | 593 |
updatePreview(); |
3133 | 594 |
} |
4489 | 595 |
|
4537 | 596 |
void HWMapContainer::setDrawnMapData(const QByteArray & ar) |
597 |
{ |
|
598 |
drawMapScene.decode(ar); |
|
4562 | 599 |
updatePreview(); |
4537 | 600 |
} |
601 |
||
4489 | 602 |
QByteArray HWMapContainer::getDrawnMapData() |
603 |
{ |
|
4520
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
604 |
return drawMapScene.encode(); |
4513
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
605 |
} |
4519 | 606 |
|
4550
d300ea498486
added set button to seed edit so maps won't regenerate as often
Henek
parents:
4537
diff
changeset
|
607 |
void HWMapContainer::seedEdited() |
4519 | 608 |
{ |
4699 | 609 |
if (seedLabel->isVisible() == false ) |
610 |
{ |
|
611 |
seedLabel->setVisible(true); |
|
612 |
seedEdit->setVisible(true); |
|
613 |
seedSet->setText(tr("Set")); |
|
614 |
return; |
|
615 |
} |
|
616 |
||
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
617 |
if (seedEdit->text().isEmpty()) |
4519 | 618 |
seedEdit->setText(m_seed); |
619 |
else |
|
620 |
{ |
|
4550
d300ea498486
added set button to seed edit so maps won't regenerate as often
Henek
parents:
4537
diff
changeset
|
621 |
setSeed(seedEdit->text()); |
d300ea498486
added set button to seed edit so maps won't regenerate as often
Henek
parents:
4537
diff
changeset
|
622 |
emit seedChanged(seedEdit->text()); |
4519 | 623 |
} |
624 |
} |
|
4520
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
625 |
|
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
626 |
DrawMapScene * HWMapContainer::getDrawMapScene() |
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
627 |
{ |
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
628 |
return &drawMapScene; |
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
629 |
} |
4525 | 630 |
|
631 |
void HWMapContainer::mapDrawingFinished() |
|
632 |
{ |
|
4526 | 633 |
emit drawnMapChanged(getDrawnMapData()); |
4525 | 634 |
|
4562 | 635 |
updatePreview(); |
4550
d300ea498486
added set button to seed edit so maps won't regenerate as often
Henek
parents:
4537
diff
changeset
|
636 |
} |
4562 | 637 |
|
638 |
void HWMapContainer::updatePreview() |
|
639 |
{ |
|
4563 | 640 |
int curIndex = chooseMap->currentIndex(); |
641 |
||
642 |
switch(curIndex) |
|
4562 | 643 |
{ |
644 |
case MAPGEN_REGULAR: |
|
645 |
askForGeneratedPreview(); |
|
646 |
break; |
|
647 |
case MAPGEN_MAZE: |
|
648 |
askForGeneratedPreview(); |
|
649 |
break; |
|
650 |
case MAPGEN_DRAWN: |
|
651 |
askForGeneratedPreview(); |
|
652 |
break; |
|
653 |
default: |
|
654 |
QPixmap mapImage; |
|
5238
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
655 |
QFile tmpfile; |
5794 | 656 |
tmpfile.setFileName(cfgdir->absolutePath() + "/Data/Maps/" + chooseMap->itemData(curIndex).toList()[0].toString() + "/preview.png"); |
5238
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
657 |
if (!tmpfile.exists()) tmpfile.setFileName(datadir->absolutePath() + "/Maps/" + chooseMap->itemData(curIndex).toList()[0].toString() + "/preview.png"); |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
4976
diff
changeset
|
658 |
if(!mapImage.load(QFileInfo(tmpfile).absoluteFilePath())) { |
4562 | 659 |
imageButt->setIcon(QIcon()); |
660 |
return; |
|
661 |
} |
|
662 |
||
663 |
hhLimit = chooseMap->itemData(curIndex).toList()[2].toInt(); |
|
664 |
addInfoToPreview(mapImage); |
|
665 |
} |
|
666 |
} |
|
4936
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
667 |
|
4941 | 668 |
void HWMapContainer::setAllMapParameters(const QString &map, MapGenerator m, int mazesize, const QString &seed, int tmpl) |
4936
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
669 |
{ |
4941 | 670 |
intSetMap(map); |
5793
401ab167bd9f
This should be a real fix (7643cbb88f09 reverted). Not tested.
unc0rr
parents:
5789
diff
changeset
|
671 |
intSetMapgen(m); |
4941 | 672 |
intSetMazeSize(mazesize); |
673 |
intSetSeed(seed); |
|
674 |
intSetTemplateFilter(tmpl); |
|
4936
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
675 |
|
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
676 |
updatePreview(); |
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
677 |
} |