QTfrontend/mapContainer.cpp
author Colin Rice (clr_)
Wed, 23 Mar 2011 16:32:24 +0100
changeset 5044 6e8da75e5f5e
parent 4976 088d40d8aba2
child 5238 46ddaf14509d
permissions -rw-r--r--
I changed r. Still not a perfect fix.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     1
/*
1066
1f1b3686a2b0 Update copyright headers a bit
unc0rr
parents: 883
diff changeset
     2
 * Hedgewars, a free turn based strategy game
4976
088d40d8aba2 Happy 2011 :)
koda
parents: 4973
diff changeset
     3
 * Copyright (c) 2006-2011 Igor Ulyanov <iulyanov@gmail.com>
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     4
 *
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     5
 * This program is free software; you can redistribute it and/or modify
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     6
 * it under the terms of the GNU General Public License as published by
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     7
 * the Free Software Foundation; version 2 of the License
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     8
 *
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     9
 * This program is distributed in the hope that it will be useful,
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    10
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    11
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    12
 * GNU General Public License for more details.
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    13
 *
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    14
 * You should have received a copy of the GNU General Public License
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    15
 * along with this program; if not, write to the Free Software
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    16
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    17
 */
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    18
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    19
#include <QPushButton>
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    20
#include <QBuffer>
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    21
#include <QUuid>
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    22
#include <QBitmap>
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    23
#include <QPainter>
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    24
#include <QLinearGradient>
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    25
#include <QColor>
249
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
    26
#include <QTextStream>
677
9d0bcc3c903a Save some vertical pixels using fewer margin in HWMapContainer
unc0rr
parents: 530
diff changeset
    27
#include <QApplication>
1209
7f6cb1d7be2a Start remaking multiplayer page
unc0rr
parents: 1164
diff changeset
    28
#include <QLabel>
7f6cb1d7be2a Start remaking multiplayer page
unc0rr
parents: 1164
diff changeset
    29
#include <QListWidget>
7f6cb1d7be2a Start remaking multiplayer page
unc0rr
parents: 1164
diff changeset
    30
#include <QVBoxLayout>
1224
0b9fbee5ceda - Add icons for each theme
unc0rr
parents: 1215
diff changeset
    31
#include <QIcon>
4519
aee36896d46b exposing seed for editing and viewing
Henek
parents: 4513
diff changeset
    32
#include <QLineEdit>
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
    33
#include <QMessageBox>
249
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
    34
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
    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
7f6cb1d7be2a Start remaking multiplayer page
unc0rr
parents: 1164
diff changeset
    37
#include "igbox.h"
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    38
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    39
HWMapContainer::HWMapContainer(QWidget * parent) :
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    40
    QWidget(parent),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    41
    mainLayout(this),
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
    42
    pMap(0),
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
    43
    mapgen(MAPGEN_REGULAR)
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    44
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    45
    hhSmall.load(":/res/hh_small.png");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    46
    hhLimit = 18;
1797
fedd8649fdd9 Templates filter by nemo
unc0rr
parents: 1790
diff changeset
    47
    templateFilter = 0;
2377
f3fab2b09e0c And in frontend
nemo
parents: 2021
diff changeset
    48
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    49
    mainLayout.setContentsMargins(QApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    50
        1,
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    51
        QApplication::style()->pixelMetric(QStyle::PM_LayoutRightMargin),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    52
        QApplication::style()->pixelMetric(QStyle::PM_LayoutBottomMargin));
2377
f3fab2b09e0c And in frontend
nemo
parents: 2021
diff changeset
    53
4557
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
    54
    QWidget* mapWidget = new QWidget(this);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
    55
    mainLayout.addWidget(mapWidget, 0, 0, Qt::AlignHCenter);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
    56
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
    57
    QGridLayout* mapLayout = new QGridLayout(mapWidget);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
    58
    mapLayout->setMargin(0);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
    59
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
    60
    imageButt = new QPushButton(mapWidget);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    61
    imageButt->setObjectName("imageButt");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    62
    imageButt->setFixedSize(256 + 6, 128 + 6);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    63
    imageButt->setFlat(true);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    64
    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
    65
    mapLayout->addWidget(imageButt, 0, 0, 1, 2);
4337
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
    66
    //connect(imageButt, SIGNAL(clicked()), this, SLOT(setRandomSeed()));
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
    67
    //connect(imageButt, SIGNAL(clicked()), this, SLOT(setRandomTheme()));
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
    68
    connect(imageButt, SIGNAL(clicked()), this, SLOT(setRandomMap()));
249
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
    69
4557
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
    70
    chooseMap = new QComboBox(mapWidget);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    71
    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
    72
    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
    73
// 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
    74
//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
    75
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
    76
    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
    77
// 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
    78
//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
    79
QComboBox::tr("generated maze..."));
4487
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
    80
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
    81
    chooseMap->addItem(QComboBox::tr("hand drawn map..."));
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
    82
    chooseMap->insertSeparator(chooseMap->count()); // separator between generators and missions
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
    83
3185
19d84448835f Frontend:
smxx
parents: 3181
diff changeset
    84
    chooseMap->insertSeparator(chooseMap->count()); // separator between generators and missions
19d84448835f Frontend:
smxx
parents: 3181
diff changeset
    85
19d84448835f Frontend:
smxx
parents: 3181
diff changeset
    86
    int missionindex = chooseMap->count();
4337
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
    87
    numMissions = 0;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    88
    for (int i = 0; i < mapList->size(); ++i) {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    89
        QString map = (*mapList)[i];
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    90
        QFile mapCfgFile(
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    91
                QString("%1/Maps/%2/map.cfg")
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    92
                .arg(datadir->absolutePath())
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    93
                .arg(map));
3008
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
    94
        QFile mapLuaFile(
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
    95
                QString("%1/Maps/%2/map.lua")
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
    96
                .arg(datadir->absolutePath())
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
    97
                .arg(map));
1790
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
    98
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    99
        if (mapCfgFile.open(QFile::ReadOnly)) {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   100
            QString theme;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   101
            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
   102
            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
   103
            QString weapons;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   104
            QList<QVariant> mapInfo;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   105
            QTextStream input(&mapCfgFile);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   106
            input >> theme;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   107
            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
   108
            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
   109
            input >> weapons;
3008
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
   110
            mapInfo.push_back(map);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   111
            mapInfo.push_back(theme);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   112
            if (limit)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   113
                mapInfo.push_back(limit);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   114
            else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   115
                mapInfo.push_back(18);
3008
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
   116
            mapInfo.push_back(mapLuaFile.exists());
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
   117
            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
   118
                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
   119
            scheme.replace("_", " ");
1dd97c710f5a added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents: 4511
diff changeset
   120
            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
   121
                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
   122
            weapons.replace("_", " ");
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
            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
   124
            mapInfo.push_back(weapons);
3185
19d84448835f Frontend:
smxx
parents: 3181
diff changeset
   125
            if(mapLuaFile.exists())
4337
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   126
            {
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
   127
                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
   128
// 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
   129
//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
   130
QComboBox::tr("Mission") + ": " + map, mapInfo);
4337
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   131
                numMissions++;
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   132
            }
3185
19d84448835f Frontend:
smxx
parents: 3181
diff changeset
   133
            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
   134
                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
   135
// FIXME - need real icons. Disabling until then
4337
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   136
//QIcon(":/res/mapCustom.png"), 
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   137
map, mapInfo);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   138
            mapCfgFile.close();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   139
        }
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   140
    }
3185
19d84448835f Frontend:
smxx
parents: 3181
diff changeset
   141
    chooseMap->insertSeparator(missionindex); // separator between missions and maps
2377
f3fab2b09e0c And in frontend
nemo
parents: 2021
diff changeset
   142
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   143
    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
   144
    mapLayout->addWidget(chooseMap, 1, 1);
249
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   145
4557
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   146
    QLabel * lblMap = new QLabel(tr("Map"), mapWidget);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   147
    mapLayout->addWidget(lblMap, 1, 0);
1209
7f6cb1d7be2a Start remaking multiplayer page
unc0rr
parents: 1164
diff changeset
   148
4557
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   149
    lblFilter = new QLabel(tr("Filter"), mapWidget);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   150
    mapLayout->addWidget(lblFilter, 2, 0);
1802
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
   151
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   152
    cbTemplateFilter = new QComboBox(mapWidget);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   153
    cbTemplateFilter->addItem(tr("All"), 0);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   154
    cbTemplateFilter->addItem(tr("Small"), 1);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   155
    cbTemplateFilter->addItem(tr("Medium"), 2);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   156
    cbTemplateFilter->addItem(tr("Large"), 3);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   157
    cbTemplateFilter->addItem(tr("Cavern"), 4);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   158
    cbTemplateFilter->addItem(tr("Wacky"), 5);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   159
    mapLayout->addWidget(cbTemplateFilter, 2, 1);
1802
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
   160
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   161
    connect(cbTemplateFilter, SIGNAL(activated(int)), this, SLOT(setTemplateFilter(int)));
1802
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
   162
4557
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   163
    maze_size_label = new QLabel(tr("Type"), mapWidget);
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   164
    mainLayout.addWidget(maze_size_label, 2, 0);
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   165
    maze_size_label->hide();
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   166
    cbMazeSize = new QComboBox(mapWidget);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   167
    cbMazeSize->addItem(tr("Small tunnels"), 0);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   168
    cbMazeSize->addItem(tr("Medium tunnels"), 1);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   169
    cbMazeSize->addItem(tr("Large tunnels"), 2);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   170
    cbMazeSize->addItem(tr("Small floating islands"), 3);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   171
    cbMazeSize->addItem(tr("Medium floating islands"), 4);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   172
    cbMazeSize->addItem(tr("Large floating islands"), 5);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   173
    cbMazeSize->setCurrentIndex(1);
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   174
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   175
    mapLayout->addWidget(cbMazeSize, 2, 1);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   176
    cbMazeSize->hide();
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   177
    connect(cbMazeSize, SIGNAL(activated(int)), this, SLOT(setMazeSize(int)));
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   178
4557
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   179
    gbThemes = new IconedGroupBox(mapWidget);
4701
7ed88cfc99b1 restore showing a bigger icon for themes
koda
parents: 4699
diff changeset
   180
    gbThemes->setTitleTextPadding(80);
7ed88cfc99b1 restore showing a bigger icon for themes
koda
parents: 4699
diff changeset
   181
    gbThemes->setContentTopPadding(15);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   182
    gbThemes->setTitle(tr("Themes"));
1248
8c77eec56bf4 Better theme selection widget look
unc0rr
parents: 1228
diff changeset
   183
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   184
    //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
   185
    mapLayout->addWidget(gbThemes, 0, 2, 3, 1);
2377
f3fab2b09e0c And in frontend
nemo
parents: 2021
diff changeset
   186
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   187
    QVBoxLayout * gbTLayout = new QVBoxLayout(gbThemes);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   188
    gbTLayout->setContentsMargins(0, 0, 0 ,0);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   189
    gbTLayout->setSpacing(0);
4557
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   190
    lwThemes = new QListWidget(mapWidget);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   191
    lwThemes->setMinimumHeight(30);
3951
c9a63db3e603 Correct another bug in slot switching, adjust width of theme list, really truly fix reset of weps (I hope) should also fix infinite teleport bug in place hogs mode. Slow update of health to 5s for inf attack mode.
nemo
parents: 3870
diff changeset
   192
    lwThemes->setFixedWidth(140);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   193
    for (int i = 0; i < Themes->size(); ++i) {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   194
        QListWidgetItem * lwi = new QListWidgetItem();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   195
        lwi->setText(Themes->at(i));
3869
d3d39bbb05f2 Frontend:
smaxx
parents: 3865
diff changeset
   196
        lwi->setIcon(QIcon(QString("%1/Themes/%2/icon.png").arg(datadir->absolutePath()).arg(Themes->at(i))));
d3d39bbb05f2 Frontend:
smaxx
parents: 3865
diff changeset
   197
        //lwi->setTextAlignment(Qt::AlignHCenter);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   198
        lwThemes->addItem(lwi);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   199
    }
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   200
    connect(lwThemes, SIGNAL(currentRowChanged(int)), this, SLOT(themeSelected(int)));
1802
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
   201
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
   202
    // override default style to tighten up theme scroller
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   203
    lwThemes->setStyleSheet(QString(
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   204
        "QListWidget{"
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   205
            "border: solid;"
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   206
            "border-width: 0px;"
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   207
            "border-radius: 0px;"
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   208
            "border-color: transparent;"
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   209
            "background-color: #0d0544;"
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   210
            "color: #ffcc00;"
3869
d3d39bbb05f2 Frontend:
smaxx
parents: 3865
diff changeset
   211
            "font: bold 13px;"
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   212
            "}"
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   213
        )
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   214
    );
2377
f3fab2b09e0c And in frontend
nemo
parents: 2021
diff changeset
   215
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   216
    gbTLayout->addWidget(lwThemes);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   217
    lwThemes->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Minimum);
2377
f3fab2b09e0c And in frontend
nemo
parents: 2021
diff changeset
   218
4557
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   219
    mapLayout->setSizeConstraint(QLayout::SetFixedSize);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   220
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   221
    QWidget* seedWidget = new QWidget(this);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   222
    mainLayout.addWidget(seedWidget, 1, 0);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   223
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   224
    QGridLayout* seedLayout = new QGridLayout(seedWidget);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   225
    seedLayout->setMargin(0);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   226
4699
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   227
    seedLabel = new QLabel(tr("Seed"), seedWidget);
4557
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   228
    seedLayout->addWidget(seedLabel, 3, 0);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   229
    seedEdit = new QLineEdit(seedWidget);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   230
    seedEdit->setMaxLength(54);
4550
d300ea498486 added set button to seed edit so maps won't regenerate as often
Henek
parents: 4537
diff changeset
   231
    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
   232
    seedLayout->addWidget(seedEdit, 3, 1);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   233
    seedLayout->setColumnStretch(1, 5);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   234
    seedSet = new QPushButton(seedWidget);
4699
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   235
    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
   236
    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
   237
    seedLayout->setColumnStretch(2, 1);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   238
    seedLayout->addWidget(seedSet, 3, 2);
1215
0c1c294c0f7e Themes list now works
unc0rr
parents: 1214
diff changeset
   239
4699
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   240
    seedLabel->setVisible(false);
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   241
    seedEdit->setVisible(false);
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   242
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   243
    setRandomSeed();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   244
    setRandomTheme();
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   245
}
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   246
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   247
void HWMapContainer::setImage(const QImage newImage)
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   248
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   249
    QPixmap px(256, 128);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   250
    QPixmap pxres(256, 128);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   251
    QPainter p(&pxres);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   252
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   253
    px.fill(Qt::yellow);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   254
    QBitmap bm = QBitmap::fromImage(newImage);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   255
    px.setMask(bm);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   256
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   257
    QLinearGradient linearGrad(QPoint(128, 0), QPoint(128, 128));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   258
    linearGrad.setColorAt(1, QColor(0, 0, 192));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   259
    linearGrad.setColorAt(0, QColor(66, 115, 225));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   260
    p.fillRect(QRect(0, 0, 256, 128), linearGrad);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   261
    p.drawPixmap(QPoint(0, 0), px);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   262
1790
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   263
    addInfoToPreview(pxres);
4561
da9d27bc6ea6 Seems like just a source of bugs
unc0rr
parents: 4560
diff changeset
   264
    //chooseMap->setCurrentIndex(mapgen);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   265
    pMap = 0;
249
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   266
}
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   267
1790
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   268
void HWMapContainer::setHHLimit(int newHHLimit)
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   269
{
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   270
    hhLimit = newHHLimit;
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   271
}
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   272
249
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   273
void HWMapContainer::mapChanged(int index)
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   274
{
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   275
    switch(index) {
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   276
    case MAPGEN_REGULAR:
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   277
        mapgen = MAPGEN_REGULAR;
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   278
        updatePreview();
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   279
        gbThemes->show();
1802
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
   280
        lblFilter->show();
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   281
        cbTemplateFilter->show();
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   282
        maze_size_label->hide();
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   283
        cbMazeSize->hide();
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   284
        emit mapChanged("+rnd+");
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   285
        emit mapgenChanged(mapgen);
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   286
        emit themeChanged(chooseMap->itemData(index).toList()[1].toString());
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   287
        break;
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   288
    case MAPGEN_MAZE:
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   289
        mapgen = MAPGEN_MAZE;
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   290
        updatePreview();
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   291
        gbThemes->show();
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   292
        lblFilter->hide();
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   293
        cbTemplateFilter->hide();
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   294
        maze_size_label->show();
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   295
        cbMazeSize->show();
3141
70d65353bd60 prg adds option to toggle girders in maze, adjusts some frontend strings
nemo
parents: 3133
diff changeset
   296
        emit mapChanged("+maze+");
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   297
        emit mapgenChanged(mapgen);
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   298
        emit themeChanged(chooseMap->itemData(index).toList()[1].toString());
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   299
        break;
4487
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
   300
    case MAPGEN_DRAWN:
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
   301
        mapgen = MAPGEN_DRAWN;
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   302
        updatePreview();
4487
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
   303
        gbThemes->show();
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
   304
        lblFilter->hide();
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   305
        cbTemplateFilter->hide();
4487
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
   306
        maze_size_label->hide();
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   307
        cbMazeSize->hide();
4487
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
   308
        emit mapChanged("+drawn+");
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
   309
        emit mapgenChanged(mapgen);
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
   310
        emit themeChanged(chooseMap->itemData(index).toList()[1].toString());
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
   311
        break;
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   312
    default:
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   313
        updatePreview();
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   314
        gbThemes->hide();
1802
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
   315
        lblFilter->hide();
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   316
        cbTemplateFilter->hide();
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   317
        maze_size_label->hide();
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   318
        cbMazeSize->hide();
3009
8f4e6de8e4ef Frontend:
smxx
parents: 3008
diff changeset
   319
        emit mapChanged(chooseMap->itemData(index).toList()[0].toString());
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   320
    }
331
6bfc326e4976 Selecting map works in net game
unc0rr
parents: 329
diff changeset
   321
}
6bfc326e4976 Selecting map works in net game
unc0rr
parents: 329
diff changeset
   322
1790
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   323
// Should this add text to identify map size?
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   324
void HWMapContainer::addInfoToPreview(QPixmap image)
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   325
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   326
    QPixmap finalImage = QPixmap(image.size());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   327
    finalImage.fill(QColor(0, 0, 0, 0));
2377
f3fab2b09e0c And in frontend
nemo
parents: 2021
diff changeset
   328
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   329
    QPainter p(&finalImage);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   330
    p.drawPixmap(image.rect(), image);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   331
    //p.setPen(QColor(0xf4,0x9e,0xe9));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   332
    p.setPen(QColor(0xff,0xcc,0x00));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   333
    p.setBrush(QColor(0, 0, 0));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   334
    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
   335
    p.setFont(QFont("MS Shell Dlg", 10));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   336
    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
   337
    p.drawPixmap(image.rect().width() - hhSmall.rect().width() - 5, 5, hhSmall.rect().width(), hhSmall.rect().height(), hhSmall);
1790
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   338
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   339
    imageButt->setIcon(finalImage);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   340
    imageButt->setIconSize(image.size());
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   341
}
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   342
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   343
void HWMapContainer::askForGeneratedPreview()
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   344
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   345
    if (pMap)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   346
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   347
        disconnect(pMap, 0, this, SLOT(setImage(const QImage)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   348
        disconnect(pMap, 0, this, SLOT(setHHLimit(int)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   349
        pMap = 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   350
    }
2021
a591afb43768 Some changes in try to fix issue when you enter
unc0rr
parents: 1874
diff changeset
   351
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   352
    pMap = new HWMap();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   353
    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
   354
    connect(pMap, SIGNAL(HHLimitReceived(int)), this, SLOT(setHHLimit(int)));
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   355
    pMap->getImage(m_seed,
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   356
                   getTemplateFilter(),
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   357
                   get_mapgen(),
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   358
                   getMazeSize(),
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   359
                   getDrawnMapData()
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   360
            );
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   361
}
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   362
1215
0c1c294c0f7e Themes list now works
unc0rr
parents: 1214
diff changeset
   363
void HWMapContainer::themeSelected(int currentRow)
0c1c294c0f7e Themes list now works
unc0rr
parents: 1214
diff changeset
   364
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   365
    QString theme = Themes->at(currentRow);
4487
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
   366
    QList<QVariant> mapInfo;
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
   367
    mapInfo.push_back(QString("+rnd+"));
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
   368
    mapInfo.push_back(theme);
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
   369
    mapInfo.push_back(18);
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
   370
    mapInfo.push_back(false);
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
   371
    chooseMap->setItemData(0, mapInfo);
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
   372
    mapInfo[0] = QString("+maze+");
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
   373
    chooseMap->setItemData(1, mapInfo);
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
   374
    mapInfo[0] = QString("+drawn+");
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
   375
    chooseMap->setItemData(2, mapInfo);
4701
7ed88cfc99b1 restore showing a bigger icon for themes
koda
parents: 4699
diff changeset
   376
    gbThemes->setIcon(QIcon(QString("%1/Themes/%2/icon@2x.png").arg(datadir->absolutePath()).arg(theme)));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   377
    emit themeChanged(theme);
1215
0c1c294c0f7e Themes list now works
unc0rr
parents: 1214
diff changeset
   378
}
0c1c294c0f7e Themes list now works
unc0rr
parents: 1214
diff changeset
   379
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   380
QString HWMapContainer::getCurrentSeed() const
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   381
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   382
    return m_seed;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   383
}
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   384
249
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   385
QString HWMapContainer::getCurrentMap() const
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   386
{
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   387
    if(chooseMap->currentIndex() < MAPGEN_MAP) return QString();
3008
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
   388
    return chooseMap->itemData(chooseMap->currentIndex()).toList()[0].toString();
249
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   389
}
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   390
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   391
QString HWMapContainer::getCurrentTheme() const
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   392
{
3008
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
   393
    return chooseMap->itemData(chooseMap->currentIndex()).toList()[1].toString();
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
   394
}
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
   395
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
   396
bool HWMapContainer::getCurrentIsMission() const
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
   397
{
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
   398
    if(!chooseMap->currentIndex()) return false;
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
   399
    return chooseMap->itemData(chooseMap->currentIndex()).toList()[3].toBool();
1790
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   400
}
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   401
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   402
int HWMapContainer::getCurrentHHLimit() const
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   403
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   404
    return hhLimit;
249
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   405
}
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   406
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
   407
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
   408
{
1dd97c710f5a added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents: 4511
diff changeset
   409
    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
   410
}
1dd97c710f5a added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents: 4511
diff changeset
   411
1dd97c710f5a added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents: 4511
diff changeset
   412
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
   413
{
1dd97c710f5a added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents: 4511
diff changeset
   414
    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
   415
}
1dd97c710f5a added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents: 4511
diff changeset
   416
1802
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
   417
quint32 HWMapContainer::getTemplateFilter() const
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
   418
{
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   419
    return cbTemplateFilter->itemData(cbTemplateFilter->currentIndex()).toInt();
1802
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
   420
}
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
   421
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   422
void HWMapContainer::resizeEvent ( QResizeEvent * event )
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   423
{
4560
5d6c7f88db73 - Some work on drawMap widget and scene to allow undo, clear, save and load operations
unc0rr
parents: 4557
diff changeset
   424
    Q_UNUSED(event);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   425
  //imageButt->setIconSize(imageButt->size());
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   426
}
320
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   427
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
   428
void HWMapContainer::intSetSeed(const QString & seed)
320
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   429
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   430
    m_seed = seed;
4519
aee36896d46b exposing seed for editing and viewing
Henek
parents: 4513
diff changeset
   431
    if (seed != seedEdit->text())
aee36896d46b exposing seed for editing and viewing
Henek
parents: 4513
diff changeset
   432
        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
   433
}
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
   434
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
   435
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
   436
{
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
   437
    intSetSeed(seed);
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   438
    if (chooseMap->currentIndex() < MAPGEN_MAP)
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   439
        updatePreview();
320
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   440
}
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   441
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
   442
void HWMapContainer::intSetMap(const QString & map)
320
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   443
{
3008
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
   444
    int id = 0;
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
   445
    for(int i = 0; i < chooseMap->count(); i++)
3195
c6f58cff5ffc Frontend:
smxx
parents: 3185
diff changeset
   446
        if(!chooseMap->itemData(i).isNull() && chooseMap->itemData(i).toList()[0].toString() == map)
3008
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
   447
        {
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
   448
            id = i;
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
   449
            break;
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
   450
        }
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
   451
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   452
    if(id > 0) {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   453
        if (pMap)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   454
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   455
            disconnect(pMap, 0, this, SLOT(setImage(const QImage)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   456
            disconnect(pMap, 0, this, SLOT(setHHLimit(int)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   457
            pMap = 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   458
        }
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   459
        chooseMap->setCurrentIndex(id);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   460
    }
320
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   461
}
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   462
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
   463
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
   464
{
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
   465
    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
   466
    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
   467
}
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
   468
320
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   469
void HWMapContainer::setTheme(const QString & theme)
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   470
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   471
    QList<QListWidgetItem *> items = lwThemes->findItems(theme, Qt::MatchExactly);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   472
    if(items.size())
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   473
        lwThemes->setCurrentItem(items.at(0));
320
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   474
}
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   475
4337
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   476
void HWMapContainer::setRandomMap()
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   477
{
4419
3d99c2c806ec fix for frontend desync
prg
parents: 4337
diff changeset
   478
    setRandomSeed();
4337
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   479
    switch(chooseMap->currentIndex())
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   480
    {
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   481
    case MAPGEN_REGULAR:
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   482
    case MAPGEN_MAZE:
4511
df827e70ae63 Pretension to switch to draw map page
unc0rr
parents: 4494
diff changeset
   483
        setRandomTheme();
df827e70ae63 Pretension to switch to draw map page
unc0rr
parents: 4494
diff changeset
   484
        break;
4487
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
   485
    case MAPGEN_DRAWN:
4511
df827e70ae63 Pretension to switch to draw map page
unc0rr
parents: 4494
diff changeset
   486
        emit drawMapRequested();
4337
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   487
        break;
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   488
    default:
4566
87ee1be17d27 Adjust magic consts
unc0rr
parents: 4565
diff changeset
   489
        if(chooseMap->currentIndex() <= numMissions + MAPGEN_MAP + 1)
4337
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   490
            setRandomMission();
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   491
        else
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   492
            setRandomStatic();
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   493
        break;
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   494
    }
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   495
}
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   496
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   497
void HWMapContainer::setRandomStatic()
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   498
{
4566
87ee1be17d27 Adjust magic consts
unc0rr
parents: 4565
diff changeset
   499
    int i = MAPGEN_MAP + 3 + numMissions + rand() % (chooseMap->count() - MAPGEN_MAP - 3 - numMissions);
87ee1be17d27 Adjust magic consts
unc0rr
parents: 4565
diff changeset
   500
    chooseMap->setCurrentIndex(i);
4419
3d99c2c806ec fix for frontend desync
prg
parents: 4337
diff changeset
   501
    setRandomSeed();
4337
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   502
}
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   503
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   504
void HWMapContainer::setRandomMission()
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   505
{
4566
87ee1be17d27 Adjust magic consts
unc0rr
parents: 4565
diff changeset
   506
    int i = MAPGEN_MAP + 2 + rand() % numMissions;
87ee1be17d27 Adjust magic consts
unc0rr
parents: 4565
diff changeset
   507
    qDebug() << i << MAPGEN_MAP << numMissions;
87ee1be17d27 Adjust magic consts
unc0rr
parents: 4565
diff changeset
   508
    chooseMap->setCurrentIndex(i);
4419
3d99c2c806ec fix for frontend desync
prg
parents: 4337
diff changeset
   509
    setRandomSeed();
4337
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   510
}
320
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   511
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   512
void HWMapContainer::setRandomSeed()
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   513
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   514
    m_seed = QUuid::createUuid().toString();
4519
aee36896d46b exposing seed for editing and viewing
Henek
parents: 4513
diff changeset
   515
    seedEdit->setText(m_seed);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   516
    emit seedChanged(m_seed);
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   517
    if (chooseMap->currentIndex() < MAPGEN_MAP)
4563
b09f4a52aca4 Some debug info
unc0rr
parents: 4562
diff changeset
   518
        updatePreview();
320
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   519
}
1318
18da1c5e960d - Shut the client's tries to configure server up
unc0rr
parents: 1248
diff changeset
   520
18da1c5e960d - Shut the client's tries to configure server up
unc0rr
parents: 1248
diff changeset
   521
void HWMapContainer::setRandomTheme()
18da1c5e960d - Shut the client's tries to configure server up
unc0rr
parents: 1248
diff changeset
   522
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   523
    if(!Themes->size()) return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   524
    quint32 themeNum = rand() % Themes->size();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   525
    lwThemes->setCurrentRow(themeNum);
1318
18da1c5e960d - Shut the client's tries to configure server up
unc0rr
parents: 1248
diff changeset
   526
}
1797
fedd8649fdd9 Templates filter by nemo
unc0rr
parents: 1790
diff changeset
   527
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   528
void HWMapContainer::intSetTemplateFilter(int filter)
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   529
{
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   530
    cbTemplateFilter->setCurrentIndex(filter);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   531
    emit newTemplateFilter(filter);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   532
}
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   533
1797
fedd8649fdd9 Templates filter by nemo
unc0rr
parents: 1790
diff changeset
   534
void HWMapContainer::setTemplateFilter(int filter)
fedd8649fdd9 Templates filter by nemo
unc0rr
parents: 1790
diff changeset
   535
{
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   536
    intSetTemplateFilter(filter);
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   537
    updatePreview();
1802
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
   538
}
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
   539
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   540
MapGenerator HWMapContainer::get_mapgen(void) const
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   541
{
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   542
    return mapgen;
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   543
}
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   544
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   545
int HWMapContainer::getMazeSize(void) const
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   546
{
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   547
    return cbMazeSize->currentIndex();
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   548
}
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   549
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   550
void HWMapContainer::intSetMazeSize(int size)
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   551
{
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   552
    cbMazeSize->setCurrentIndex(size);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   553
    emit mazeSizeChanged(size);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   554
}
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   555
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   556
void HWMapContainer::setMazeSize(int size)
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   557
{
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   558
    intSetMazeSize(size);
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   559
    updatePreview();
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   560
}
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   561
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
   562
void HWMapContainer::intSetMapgen(MapGenerator m)
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   563
{
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   564
    mapgen = m;
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   565
    chooseMap->setCurrentIndex(m);
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   566
    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
   567
}
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
   568
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
   569
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
   570
{
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
   571
    intSetMapgen(m);
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   572
    updatePreview();
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   573
}
4489
c4ca9ced258b - Pass map drawing data to engine
unc0rr
parents: 4487
diff changeset
   574
4537
f95f7218531a Recieve and parse DRAWNMAP config
unc0rr
parents: 4534
diff changeset
   575
void HWMapContainer::setDrawnMapData(const QByteArray & ar)
f95f7218531a Recieve and parse DRAWNMAP config
unc0rr
parents: 4534
diff changeset
   576
{
f95f7218531a Recieve and parse DRAWNMAP config
unc0rr
parents: 4534
diff changeset
   577
    drawMapScene.decode(ar);
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   578
    updatePreview();
4537
f95f7218531a Recieve and parse DRAWNMAP config
unc0rr
parents: 4534
diff changeset
   579
}
f95f7218531a Recieve and parse DRAWNMAP config
unc0rr
parents: 4534
diff changeset
   580
4489
c4ca9ced258b - Pass map drawing data to engine
unc0rr
parents: 4487
diff changeset
   581
QByteArray HWMapContainer::getDrawnMapData()
c4ca9ced258b - Pass map drawing data to engine
unc0rr
parents: 4487
diff changeset
   582
{
4520
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents: 4519
diff changeset
   583
    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
   584
}
4519
aee36896d46b exposing seed for editing and viewing
Henek
parents: 4513
diff changeset
   585
4550
d300ea498486 added set button to seed edit so maps won't regenerate as often
Henek
parents: 4537
diff changeset
   586
void HWMapContainer::seedEdited()
4519
aee36896d46b exposing seed for editing and viewing
Henek
parents: 4513
diff changeset
   587
{
4699
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   588
    if (seedLabel->isVisible() == false )
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   589
    {
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   590
        seedLabel->setVisible(true);
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   591
        seedEdit->setVisible(true);
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   592
        seedSet->setText(tr("Set"));
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   593
        return;
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   594
    }
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   595
4557
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   596
    if (seedEdit->text().isEmpty())
4519
aee36896d46b exposing seed for editing and viewing
Henek
parents: 4513
diff changeset
   597
        seedEdit->setText(m_seed);
aee36896d46b exposing seed for editing and viewing
Henek
parents: 4513
diff changeset
   598
    else
aee36896d46b exposing seed for editing and viewing
Henek
parents: 4513
diff changeset
   599
    {
4550
d300ea498486 added set button to seed edit so maps won't regenerate as often
Henek
parents: 4537
diff changeset
   600
        setSeed(seedEdit->text());
d300ea498486 added set button to seed edit so maps won't regenerate as often
Henek
parents: 4537
diff changeset
   601
        emit seedChanged(seedEdit->text());
4519
aee36896d46b exposing seed for editing and viewing
Henek
parents: 4513
diff changeset
   602
    }
aee36896d46b exposing seed for editing and viewing
Henek
parents: 4513
diff changeset
   603
}
4520
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents: 4519
diff changeset
   604
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents: 4519
diff changeset
   605
DrawMapScene * HWMapContainer::getDrawMapScene()
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents: 4519
diff changeset
   606
{
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents: 4519
diff changeset
   607
    return &drawMapScene;
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents: 4519
diff changeset
   608
}
4525
0a81be113e21 Try to send drawn map data to net server
unc0rr
parents: 4520
diff changeset
   609
0a81be113e21 Try to send drawn map data to net server
unc0rr
parents: 4520
diff changeset
   610
void HWMapContainer::mapDrawingFinished()
0a81be113e21 Try to send drawn map data to net server
unc0rr
parents: 4520
diff changeset
   611
{
4526
38afca1e4248 Debug messages
unc0rr
parents: 4525
diff changeset
   612
    emit drawnMapChanged(getDrawnMapData());
4525
0a81be113e21 Try to send drawn map data to net server
unc0rr
parents: 4520
diff changeset
   613
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   614
    updatePreview();
4550
d300ea498486 added set button to seed edit so maps won't regenerate as often
Henek
parents: 4537
diff changeset
   615
}
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   616
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   617
void HWMapContainer::updatePreview()
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   618
{
4563
b09f4a52aca4 Some debug info
unc0rr
parents: 4562
diff changeset
   619
    int curIndex = chooseMap->currentIndex();
b09f4a52aca4 Some debug info
unc0rr
parents: 4562
diff changeset
   620
b09f4a52aca4 Some debug info
unc0rr
parents: 4562
diff changeset
   621
    switch(curIndex)
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   622
    {
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   623
    case MAPGEN_REGULAR:
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   624
        askForGeneratedPreview();
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   625
        break;
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   626
    case MAPGEN_MAZE:
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   627
        askForGeneratedPreview();
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   628
        break;
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   629
    case MAPGEN_DRAWN:
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   630
        askForGeneratedPreview();
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   631
        break;
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   632
    default:
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   633
        QPixmap mapImage;
4563
b09f4a52aca4 Some debug info
unc0rr
parents: 4562
diff changeset
   634
        qDebug() << "Map data" << curIndex << chooseMap->currentText() << chooseMap->itemData(curIndex);
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   635
        if(!mapImage.load(datadir->absolutePath() + "/Maps/" + chooseMap->itemData(curIndex).toList()[0].toString() + "/preview.png")) {
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   636
            imageButt->setIcon(QIcon());
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   637
            return;
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   638
        }
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   639
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   640
        hhLimit = chooseMap->itemData(curIndex).toList()[2].toInt();
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   641
        addInfoToPreview(mapImage);
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   642
    }
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   643
}
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
   644
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   645
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
   646
{
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   647
    intSetMap(map);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   648
    intSetMapgen(m);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   649
    intSetMazeSize(mazesize);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   650
    intSetSeed(seed);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   651
    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
   652
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
   653
    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
   654
}