author | nemo |
Thu, 23 Mar 2023 16:21:39 -0400 | |
changeset 15934 | d754d03e4dfe |
parent 15638 | 1ee7790caa0f |
child 15971 | cee831693af1 |
permissions | -rw-r--r-- |
612
333d095319de
abstract class for items container (hedgehogs num, bullets, etc.)
displacer
parents:
598
diff
changeset
|
1 |
/* |
1066 | 2 |
* Hedgewars, a free turn based strategy game |
4976 | 3 |
* Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com> |
11046 | 4 |
* Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com> |
612
333d095319de
abstract class for items container (hedgehogs num, bullets, etc.)
displacer
parents:
598
diff
changeset
|
5 |
* |
333d095319de
abstract class for items container (hedgehogs num, bullets, etc.)
displacer
parents:
598
diff
changeset
|
6 |
* This program is free software; you can redistribute it and/or modify |
333d095319de
abstract class for items container (hedgehogs num, bullets, etc.)
displacer
parents:
598
diff
changeset
|
7 |
* it under the terms of the GNU General Public License as published by |
333d095319de
abstract class for items container (hedgehogs num, bullets, etc.)
displacer
parents:
598
diff
changeset
|
8 |
* the Free Software Foundation; version 2 of the License |
333d095319de
abstract class for items container (hedgehogs num, bullets, etc.)
displacer
parents:
598
diff
changeset
|
9 |
* |
333d095319de
abstract class for items container (hedgehogs num, bullets, etc.)
displacer
parents:
598
diff
changeset
|
10 |
* This program is distributed in the hope that it will be useful, |
333d095319de
abstract class for items container (hedgehogs num, bullets, etc.)
displacer
parents:
598
diff
changeset
|
11 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
333d095319de
abstract class for items container (hedgehogs num, bullets, etc.)
displacer
parents:
598
diff
changeset
|
12 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
333d095319de
abstract class for items container (hedgehogs num, bullets, etc.)
displacer
parents:
598
diff
changeset
|
13 |
* GNU General Public License for more details. |
333d095319de
abstract class for items container (hedgehogs num, bullets, etc.)
displacer
parents:
598
diff
changeset
|
14 |
* |
333d095319de
abstract class for items container (hedgehogs num, bullets, etc.)
displacer
parents:
598
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License |
333d095319de
abstract class for items container (hedgehogs num, bullets, etc.)
displacer
parents:
598
diff
changeset
|
16 |
* along with this program; if not, write to the Free Software |
10108
c68cf030eded
update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers
sheepluva
parents:
9998
diff
changeset
|
17 |
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
612
333d095319de
abstract class for items container (hedgehogs num, bullets, etc.)
displacer
parents:
598
diff
changeset
|
18 |
*/ |
1509 | 19 |
|
624 | 20 |
#include "selectWeapon.h" |
629 | 21 |
#include "weaponItem.h" |
681 | 22 |
#include "hwconsts.h" |
612
333d095319de
abstract class for items container (hedgehogs num, bullets, etc.)
displacer
parents:
598
diff
changeset
|
23 |
|
12922 | 24 |
#include <QDebug> |
624 | 25 |
#include <QPushButton> |
26 |
#include <QGridLayout> |
|
629 | 27 |
#include <QHBoxLayout> |
28 |
#include <QLabel> |
|
630 | 29 |
#include <QBitmap> |
694 | 30 |
#include <QLineEdit> |
31 |
#include <QSettings> |
|
724 | 32 |
#include <QMessageBox> |
2369
c3eb11f1ab3a
Implement probability editor for weapon schemes (engine doesn't support that yet)
unc0rr
parents:
1967
diff
changeset
|
33 |
#include <QTabWidget> |
14839
e239378a9400
Prevent entering “/”, “\” and “:” in team and scheme names.
Wuzzy <Wuzzy2@mail.ru>
parents:
14836
diff
changeset
|
34 |
#include <QRegExp> |
e239378a9400
Prevent entering “/”, “\” and “:” in team and scheme names.
Wuzzy <Wuzzy2@mail.ru>
parents:
14836
diff
changeset
|
35 |
#include <QRegExpValidator> |
e239378a9400
Prevent entering “/”, “\” and “:” in team and scheme names.
Wuzzy <Wuzzy2@mail.ru>
parents:
14836
diff
changeset
|
36 |
|
2467 | 37 |
#include <math.h> |
624 | 38 |
|
629 | 39 |
QImage getAmmoImage(int num) |
40 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
41 |
static QImage ammo(":Ammos.png"); |
5112
4e2ebd8ac298
avoided some ambiguous function calls
Jonathan@Jonathan-PC.fritz.box
parents:
5051
diff
changeset
|
42 |
int x = num/(ammo.height()/32); |
2471
1cfc9f897616
properly do offsets into mult-column ammo image (forgot y)
nemo
parents:
2467
diff
changeset
|
43 |
int y = (num-((ammo.height()/32)*x))*32; |
1cfc9f897616
properly do offsets into mult-column ammo image (forgot y)
nemo
parents:
2467
diff
changeset
|
44 |
x*=32; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
45 |
return ammo.copy(x, y, 32, 32); |
629 | 46 |
} |
47 |
||
4412
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
48 |
SelWeaponItem::SelWeaponItem(bool allowInfinite, int iconNum, int wNum, QImage image, QImage imagegrey, QWidget* parent) : |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
49 |
QWidget(parent) |
629 | 50 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
51 |
QHBoxLayout* hbLayout = new QHBoxLayout(this); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
52 |
hbLayout->setSpacing(1); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
53 |
hbLayout->setMargin(1); |
2377 | 54 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
55 |
QLabel* lbl = new QLabel(this); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
56 |
lbl->setPixmap(QPixmap::fromImage(getAmmoImage(iconNum))); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
57 |
lbl->setMaximumWidth(30); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
58 |
lbl->setGeometry(0, 0, 30, 30); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
59 |
hbLayout->addWidget(lbl); |
639 | 60 |
|
4412
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
61 |
item = new WeaponItem(image, imagegrey, this); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
62 |
item->setItemsNum(wNum); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
63 |
item->setInfinityState(allowInfinite); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
64 |
hbLayout->addWidget(item); |
639 | 65 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
66 |
hbLayout->setStretchFactor(lbl, 1); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
67 |
hbLayout->setStretchFactor(item, 99); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
68 |
hbLayout->setAlignment(lbl, Qt::AlignLeft | Qt::AlignVCenter); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
69 |
hbLayout->setAlignment(item, Qt::AlignLeft | Qt::AlignVCenter); |
629 | 70 |
} |
612
333d095319de
abstract class for items container (hedgehogs num, bullets, etc.)
displacer
parents:
598
diff
changeset
|
71 |
|
683 | 72 |
void SelWeaponItem::setItemsNum(const unsigned char num) |
73 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
74 |
item->setItemsNum(num); |
683 | 75 |
} |
76 |
||
681 | 77 |
unsigned char SelWeaponItem::getItemsNum() const |
78 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
79 |
return item->getItemsNum(); |
681 | 80 |
} |
81 |
||
4412
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
82 |
void SelWeaponItem::setEnabled(bool value) |
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
83 |
{ |
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
84 |
item->setEnabled(value); |
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
85 |
} |
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
86 |
|
15594
fdca2af677a9
Cleaner digit parsing of ammo schemes
Wuzzy <Wuzzy2@mail.ru>
parents:
15542
diff
changeset
|
87 |
int SelWeaponWidget::readWeaponValue(const QChar chr, int max) |
fdca2af677a9
Cleaner digit parsing of ammo schemes
Wuzzy <Wuzzy2@mail.ru>
parents:
15542
diff
changeset
|
88 |
{ |
fdca2af677a9
Cleaner digit parsing of ammo schemes
Wuzzy <Wuzzy2@mail.ru>
parents:
15542
diff
changeset
|
89 |
int value = chr.digitValue(); |
fdca2af677a9
Cleaner digit parsing of ammo schemes
Wuzzy <Wuzzy2@mail.ru>
parents:
15542
diff
changeset
|
90 |
if (value == -1) |
fdca2af677a9
Cleaner digit parsing of ammo schemes
Wuzzy <Wuzzy2@mail.ru>
parents:
15542
diff
changeset
|
91 |
value = 0; |
fdca2af677a9
Cleaner digit parsing of ammo schemes
Wuzzy <Wuzzy2@mail.ru>
parents:
15542
diff
changeset
|
92 |
else if (value > max) |
fdca2af677a9
Cleaner digit parsing of ammo schemes
Wuzzy <Wuzzy2@mail.ru>
parents:
15542
diff
changeset
|
93 |
value = max; |
fdca2af677a9
Cleaner digit parsing of ammo schemes
Wuzzy <Wuzzy2@mail.ru>
parents:
15542
diff
changeset
|
94 |
return value; |
fdca2af677a9
Cleaner digit parsing of ammo schemes
Wuzzy <Wuzzy2@mail.ru>
parents:
15542
diff
changeset
|
95 |
} |
fdca2af677a9
Cleaner digit parsing of ammo schemes
Wuzzy <Wuzzy2@mail.ru>
parents:
15542
diff
changeset
|
96 |
|
683 | 97 |
SelWeaponWidget::SelWeaponWidget(int numItems, QWidget* parent) : |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
98 |
QFrame(parent), |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
99 |
m_numItems(numItems) |
612
333d095319de
abstract class for items container (hedgehogs num, bullets, etc.)
displacer
parents:
598
diff
changeset
|
100 |
{ |
13314
fe85ba81b01b
I guess "Fix weapon scheme lookup being unnecesarily persisted"?.. or something
alfadur
parents:
13196
diff
changeset
|
101 |
wconf = new QMap<QString, QString>(); |
fe85ba81b01b
I guess "Fix weapon scheme lookup being unnecesarily persisted"?.. or something
alfadur
parents:
13196
diff
changeset
|
102 |
for(int i = 0; i < cDefaultAmmos.size(); ++i) |
13315 | 103 |
{ |
13314
fe85ba81b01b
I guess "Fix weapon scheme lookup being unnecesarily persisted"?.. or something
alfadur
parents:
13196
diff
changeset
|
104 |
wconf->insert(cDefaultAmmos[i].first, cDefaultAmmos[i].second); |
13315 | 105 |
} |
13314
fe85ba81b01b
I guess "Fix weapon scheme lookup being unnecesarily persisted"?.. or something
alfadur
parents:
13196
diff
changeset
|
106 |
|
13195
7d9462d49d4c
Fix bad import of old ammo schemes, improve debug output when importing schemes from old .ini files
Wuzzy <Wuzzy2@mail.ru>
parents:
12923
diff
changeset
|
107 |
if (!QDir(cfgdir->absolutePath() + "/Schemes").exists()) { |
7d9462d49d4c
Fix bad import of old ammo schemes, improve debug output when importing schemes from old .ini files
Wuzzy <Wuzzy2@mail.ru>
parents:
12923
diff
changeset
|
108 |
QDir().mkdir(cfgdir->absolutePath() + "/Schemes"); |
7d9462d49d4c
Fix bad import of old ammo schemes, improve debug output when importing schemes from old .ini files
Wuzzy <Wuzzy2@mail.ru>
parents:
12923
diff
changeset
|
109 |
} |
13852
e7c69e849005
Don't save default weapon scheme in file; don't load weapon scheme from file if name collides with default scheme
Wuzzy <Wuzzy2@mail.ru>
parents:
13555
diff
changeset
|
110 |
QStringList defaultAmmos; |
e7c69e849005
Don't save default weapon scheme in file; don't load weapon scheme from file if name collides with default scheme
Wuzzy <Wuzzy2@mail.ru>
parents:
13555
diff
changeset
|
111 |
for(int i = 0; i < cDefaultAmmos.size(); ++i) |
e7c69e849005
Don't save default weapon scheme in file; don't load weapon scheme from file if name collides with default scheme
Wuzzy <Wuzzy2@mail.ru>
parents:
13555
diff
changeset
|
112 |
{ |
e7c69e849005
Don't save default weapon scheme in file; don't load weapon scheme from file if name collides with default scheme
Wuzzy <Wuzzy2@mail.ru>
parents:
13555
diff
changeset
|
113 |
defaultAmmos.append(cDefaultAmmos[i].first.toLower()); |
e7c69e849005
Don't save default weapon scheme in file; don't load weapon scheme from file if name collides with default scheme
Wuzzy <Wuzzy2@mail.ru>
parents:
13555
diff
changeset
|
114 |
} |
12923 | 115 |
if (!QDir(cfgdir->absolutePath() + "/Schemes/Ammo").exists()) { |
13195
7d9462d49d4c
Fix bad import of old ammo schemes, improve debug output when importing schemes from old .ini files
Wuzzy <Wuzzy2@mail.ru>
parents:
12923
diff
changeset
|
116 |
qDebug("No /Schemes/Ammo directory found. Trying to import weapon schemes from weapons.ini."); |
12923 | 117 |
QDir().mkdir(cfgdir->absolutePath() + "/Schemes/Ammo"); |
13314
fe85ba81b01b
I guess "Fix weapon scheme lookup being unnecesarily persisted"?.. or something
alfadur
parents:
13196
diff
changeset
|
118 |
|
12923 | 119 |
QSettings old_wconf(cfgdir->absolutePath() + "/weapons.ini", QSettings::IniFormat); |
1004
4cbd91296df7
Don't let updated hedgewars version to make errors due to old weapons.ini
unc0rr
parents:
883
diff
changeset
|
120 |
|
12923 | 121 |
QStringList keys = old_wconf.allKeys(); |
13195
7d9462d49d4c
Fix bad import of old ammo schemes, improve debug output when importing schemes from old .ini files
Wuzzy <Wuzzy2@mail.ru>
parents:
12923
diff
changeset
|
122 |
int imported = 0; |
12922 | 123 |
for(int i = 0; i < keys.size(); i++) |
124 |
{ |
|
13852
e7c69e849005
Don't save default weapon scheme in file; don't load weapon scheme from file if name collides with default scheme
Wuzzy <Wuzzy2@mail.ru>
parents:
13555
diff
changeset
|
125 |
if (!defaultAmmos.contains(keys[i].toLower())) { |
13314
fe85ba81b01b
I guess "Fix weapon scheme lookup being unnecesarily persisted"?.. or something
alfadur
parents:
13196
diff
changeset
|
126 |
wconf->insert(keys[i], fixWeaponSet(old_wconf.value(keys[i]).toString())); |
12923 | 127 |
QFile file(cfgdir->absolutePath() + "/Schemes/Ammo/" + keys[i] + ".hwa"); |
128 |
if (file.open(QIODevice::WriteOnly)) { |
|
129 |
QTextStream stream( &file ); |
|
130 |
stream << old_wconf.value(keys[i]).toString() << endl; |
|
13196
f93658732448
Game scheme handling: Use QFile instead of QSettings for increased efficiency
Wuzzy <Wuzzy2@mail.ru>
parents:
13195
diff
changeset
|
131 |
file.close(); |
12923 | 132 |
} |
13195
7d9462d49d4c
Fix bad import of old ammo schemes, improve debug output when importing schemes from old .ini files
Wuzzy <Wuzzy2@mail.ru>
parents:
12923
diff
changeset
|
133 |
imported++; |
12922 | 134 |
} |
135 |
} |
|
13195
7d9462d49d4c
Fix bad import of old ammo schemes, improve debug output when importing schemes from old .ini files
Wuzzy <Wuzzy2@mail.ru>
parents:
12923
diff
changeset
|
136 |
qDebug("%d weapon scheme(s) imported.", imported); |
13315 | 137 |
} else { |
13320
b024cf25bde1
Use QDir::Files to read ammo schemes
Wuzzy <Wuzzy2@mail.ru>
parents:
13315
diff
changeset
|
138 |
QStringList schemes = QDir(cfgdir->absolutePath() + "/Schemes/Ammo").entryList(QDir::Files); |
12922 | 139 |
|
140 |
for(int i = 0; i < schemes.size(); i++) |
|
141 |
{ |
|
12923 | 142 |
QFile file(cfgdir->absolutePath() + "/Schemes/Ammo/" + schemes[i]); |
12922 | 143 |
QString config; |
144 |
if (file.open(QIODevice::ReadOnly)) { |
|
145 |
QTextStream stream( &file ); |
|
146 |
stream >> config; |
|
13196
f93658732448
Game scheme handling: Use QFile instead of QSettings for increased efficiency
Wuzzy <Wuzzy2@mail.ru>
parents:
13195
diff
changeset
|
147 |
file.close(); |
12922 | 148 |
} |
149 |
||
13196
f93658732448
Game scheme handling: Use QFile instead of QSettings for increased efficiency
Wuzzy <Wuzzy2@mail.ru>
parents:
13195
diff
changeset
|
150 |
// Chop off file name suffix |
f93658732448
Game scheme handling: Use QFile instead of QSettings for increased efficiency
Wuzzy <Wuzzy2@mail.ru>
parents:
13195
diff
changeset
|
151 |
QString schemeName = schemes[i]; |
f93658732448
Game scheme handling: Use QFile instead of QSettings for increased efficiency
Wuzzy <Wuzzy2@mail.ru>
parents:
13195
diff
changeset
|
152 |
if (schemeName.endsWith(".hwa", Qt::CaseInsensitive)) { |
f93658732448
Game scheme handling: Use QFile instead of QSettings for increased efficiency
Wuzzy <Wuzzy2@mail.ru>
parents:
13195
diff
changeset
|
153 |
schemeName.chop(4); |
f93658732448
Game scheme handling: Use QFile instead of QSettings for increased efficiency
Wuzzy <Wuzzy2@mail.ru>
parents:
13195
diff
changeset
|
154 |
} |
13852
e7c69e849005
Don't save default weapon scheme in file; don't load weapon scheme from file if name collides with default scheme
Wuzzy <Wuzzy2@mail.ru>
parents:
13555
diff
changeset
|
155 |
// Don't load weapon scheme if name collides with any default scheme |
e7c69e849005
Don't save default weapon scheme in file; don't load weapon scheme from file if name collides with default scheme
Wuzzy <Wuzzy2@mail.ru>
parents:
13555
diff
changeset
|
156 |
if (!defaultAmmos.contains(schemeName.toLower())) |
e7c69e849005
Don't save default weapon scheme in file; don't load weapon scheme from file if name collides with default scheme
Wuzzy <Wuzzy2@mail.ru>
parents:
13555
diff
changeset
|
157 |
wconf->insert(schemeName, fixWeaponSet(config)); |
e7c69e849005
Don't save default weapon scheme in file; don't load weapon scheme from file if name collides with default scheme
Wuzzy <Wuzzy2@mail.ru>
parents:
13555
diff
changeset
|
158 |
else |
e7c69e849005
Don't save default weapon scheme in file; don't load weapon scheme from file if name collides with default scheme
Wuzzy <Wuzzy2@mail.ru>
parents:
13555
diff
changeset
|
159 |
qWarning("Weapon scheme \"%s\" not loaded from file, name collides with a default scheme!", qPrintable(schemeName)); |
12922 | 160 |
} |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
161 |
} |
1576
a02353129a41
Check for deprecated ammo schemes at startup and delete them
unc0rr
parents:
1509
diff
changeset
|
162 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
163 |
QString currentState = *cDefaultAmmoStore; |
683 | 164 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
165 |
QTabWidget * tbw = new QTabWidget(this); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
166 |
QWidget * page1 = new QWidget(this); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
167 |
p1Layout = new QGridLayout(page1); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
168 |
p1Layout->setSpacing(1); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
169 |
p1Layout->setMargin(1); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
170 |
QWidget * page2 = new QWidget(this); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
171 |
p2Layout = new QGridLayout(page2); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
172 |
p2Layout->setSpacing(1); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
173 |
p2Layout->setMargin(1); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
174 |
QWidget * page3 = new QWidget(this); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
175 |
p3Layout = new QGridLayout(page3); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
176 |
p3Layout->setSpacing(1); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
177 |
p3Layout->setMargin(1); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
178 |
QWidget * page4 = new QWidget(this); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
179 |
p4Layout = new QGridLayout(page4); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
180 |
p4Layout->setSpacing(1); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
181 |
p4Layout->setMargin(1); |
2377 | 182 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
183 |
tbw->addTab(page1, tr("Weapon set")); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
184 |
tbw->addTab(page2, tr("Probabilities")); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
185 |
tbw->addTab(page4, tr("Ammo in boxes")); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
186 |
tbw->addTab(page3, tr("Delays")); |
2377 | 187 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
188 |
QGridLayout * pageLayout = new QGridLayout(this); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
189 |
pageLayout->addWidget(tbw); |
2369
c3eb11f1ab3a
Implement probability editor for weapon schemes (engine doesn't support that yet)
unc0rr
parents:
1967
diff
changeset
|
190 |
|
629 | 191 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
192 |
int j = -1; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
193 |
int i = 0, k = 0; |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
194 |
for(; i < m_numItems; ++i) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
195 |
{ |
15638 | 196 |
if (k % cAmmoMenuRows == 0) |
197 |
++j; |
|
198 |
unsigned int ammo = ammoMenuAmmos[i]; |
|
199 |
// Hide amSkip (7) |
|
200 |
if (ammo == 7) |
|
201 |
continue; |
|
202 |
// Hide unused amCreeper (58) |
|
203 |
else if (ammo == 58) |
|
204 |
{ |
|
205 |
++k; |
|
206 |
continue; |
|
207 |
} |
|
208 |
int a = ammo-1; // ammo ID for SelWeaponItem |
|
209 |
SelWeaponItem * swi = new SelWeaponItem(true, a, readWeaponValue(currentState[a], 9), QImage(":/res/ammopic.png"), QImage(":/res/ammopicgrey.png"), this); |
|
210 |
weaponItems[a].append(swi); |
|
211 |
p1Layout->addWidget(swi, j, k % cAmmoMenuRows); |
|
2377 | 212 |
|
15638 | 213 |
SelWeaponItem * pwi = new SelWeaponItem(false, a, readWeaponValue(currentState[numItems + a], 8), QImage(":/res/ammopicbox.png"), QImage(":/res/ammopicboxgrey.png"), this); |
214 |
weaponItems[a].append(pwi); |
|
215 |
p2Layout->addWidget(pwi, j, k % cAmmoMenuRows); |
|
3697 | 216 |
|
15638 | 217 |
SelWeaponItem * dwi = new SelWeaponItem(false, a, readWeaponValue(currentState[numItems*2 + a], 8), QImage(":/res/ammopicdelay.png"), QImage(":/res/ammopicdelaygrey.png"), this); |
218 |
weaponItems[a].append(dwi); |
|
219 |
p3Layout->addWidget(dwi, j, k % cAmmoMenuRows); |
|
3697 | 220 |
|
15638 | 221 |
SelWeaponItem * awi = new SelWeaponItem(false, a, readWeaponValue(currentState[numItems*3 + a], 8), QImage(":/res/ammopic.png"), QImage(":/res/ammopicgrey.png"), this); |
222 |
weaponItems[a].append(awi); |
|
223 |
p4Layout->addWidget(awi, j, k % cAmmoMenuRows); |
|
2377 | 224 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
225 |
++k; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
226 |
} |
694 | 227 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
228 |
//pLayout->setRowStretch(5, 100); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
229 |
m_name = new QLineEdit(this); |
14839
e239378a9400
Prevent entering “/”, “\” and “:” in team and scheme names.
Wuzzy <Wuzzy2@mail.ru>
parents:
14836
diff
changeset
|
230 |
QRegExp rx(*cSafeFileNameRegExp); |
e239378a9400
Prevent entering “/”, “\” and “:” in team and scheme names.
Wuzzy <Wuzzy2@mail.ru>
parents:
14836
diff
changeset
|
231 |
QRegExpValidator* val = new QRegExpValidator(rx, m_name); |
e239378a9400
Prevent entering “/”, “\” and “:” in team and scheme names.
Wuzzy <Wuzzy2@mail.ru>
parents:
14836
diff
changeset
|
232 |
m_name->setValidator(val); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
233 |
pageLayout->addWidget(m_name, i, 0, 1, 5); |
612
333d095319de
abstract class for items container (hedgehogs num, bullets, etc.)
displacer
parents:
598
diff
changeset
|
234 |
} |
681 | 235 |
|
694 | 236 |
void SelWeaponWidget::setWeapons(const QString& ammo) |
683 | 237 |
{ |
4412
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
238 |
bool enable = true; |
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
239 |
for(int i = 0; i < cDefaultAmmos.size(); i++) |
13315 | 240 |
{ |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
241 |
if (!cDefaultAmmos[i].first.compare(m_name->text())) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
242 |
{ |
4412
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
243 |
enable = false; |
13315 | 244 |
break; |
4412
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
245 |
} |
13315 | 246 |
} |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
247 |
for(int i = 0; i < m_numItems; ++i) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
248 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
249 |
twi::iterator it = weaponItems.find(i); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
250 |
if (it == weaponItems.end()) continue; |
15594
fdca2af677a9
Cleaner digit parsing of ammo schemes
Wuzzy <Wuzzy2@mail.ru>
parents:
15542
diff
changeset
|
251 |
it.value()[0]->setItemsNum(readWeaponValue(ammo[i], 9)); |
fdca2af677a9
Cleaner digit parsing of ammo schemes
Wuzzy <Wuzzy2@mail.ru>
parents:
15542
diff
changeset
|
252 |
it.value()[1]->setItemsNum(readWeaponValue(ammo[m_numItems + i], 8)); |
fdca2af677a9
Cleaner digit parsing of ammo schemes
Wuzzy <Wuzzy2@mail.ru>
parents:
15542
diff
changeset
|
253 |
it.value()[2]->setItemsNum(readWeaponValue(ammo[m_numItems*2 + i], 8)); |
fdca2af677a9
Cleaner digit parsing of ammo schemes
Wuzzy <Wuzzy2@mail.ru>
parents:
15542
diff
changeset
|
254 |
it.value()[3]->setItemsNum(readWeaponValue(ammo[m_numItems*3 + i], 8)); |
4412
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
255 |
it.value()[0]->setEnabled(enable); |
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
256 |
it.value()[1]->setEnabled(enable); |
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
257 |
it.value()[2]->setEnabled(enable); |
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
258 |
it.value()[3]->setEnabled(enable); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
259 |
} |
4412
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
260 |
m_name->setEnabled(enable); |
683 | 261 |
} |
262 |
||
263 |
void SelWeaponWidget::setDefault() |
|
264 |
{ |
|
4412
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
265 |
for(int i = 0; i < cDefaultAmmos.size(); i++) |
13315 | 266 |
{ |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
267 |
if (!cDefaultAmmos[i].first.compare(m_name->text())) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
268 |
{ |
4412
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
269 |
return; |
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
270 |
} |
13315 | 271 |
} |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
272 |
setWeapons(*cDefaultAmmoStore); |
683 | 273 |
} |
274 |
||
12665
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
275 |
//Save current weapons set. |
683 | 276 |
void SelWeaponWidget::save() |
277 |
{ |
|
12665
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
278 |
//The save() function is called by ANY change of the combo box. |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
279 |
//If an entry is deleted, this code would just re-add the deleted |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
280 |
//item. We use isDeleted to check if we are currently deleting to |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
281 |
//prevent this. |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
282 |
if (isDeleting) |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
283 |
return; |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
284 |
if (m_name->text() == "") |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
285 |
return; |
2377 | 286 |
|
13852
e7c69e849005
Don't save default weapon scheme in file; don't load weapon scheme from file if name collides with default scheme
Wuzzy <Wuzzy2@mail.ru>
parents:
13555
diff
changeset
|
287 |
// Don't save an default ammo scheme |
e7c69e849005
Don't save default weapon scheme in file; don't load weapon scheme from file if name collides with default scheme
Wuzzy <Wuzzy2@mail.ru>
parents:
13555
diff
changeset
|
288 |
for(int i = 0; i < cDefaultAmmos.size(); ++i) |
e7c69e849005
Don't save default weapon scheme in file; don't load weapon scheme from file if name collides with default scheme
Wuzzy <Wuzzy2@mail.ru>
parents:
13555
diff
changeset
|
289 |
{ |
e7c69e849005
Don't save default weapon scheme in file; don't load weapon scheme from file if name collides with default scheme
Wuzzy <Wuzzy2@mail.ru>
parents:
13555
diff
changeset
|
290 |
if(curWeaponsName == cDefaultAmmos[i].first) |
e7c69e849005
Don't save default weapon scheme in file; don't load weapon scheme from file if name collides with default scheme
Wuzzy <Wuzzy2@mail.ru>
parents:
13555
diff
changeset
|
291 |
return; |
e7c69e849005
Don't save default weapon scheme in file; don't load weapon scheme from file if name collides with default scheme
Wuzzy <Wuzzy2@mail.ru>
parents:
13555
diff
changeset
|
292 |
} |
e7c69e849005
Don't save default weapon scheme in file; don't load weapon scheme from file if name collides with default scheme
Wuzzy <Wuzzy2@mail.ru>
parents:
13555
diff
changeset
|
293 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
294 |
QString state1; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
295 |
QString state2; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
296 |
QString state3; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
297 |
QString state4; |
7830
72e52da6ea7f
fix for issue 441 ("Cannot overwrite default weapon set 'Default'!" message when no change to weapon set was made)
sheepluva
parents:
7797
diff
changeset
|
298 |
QString stateFull; |
2377 | 299 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
300 |
for(int i = 0; i < m_numItems; ++i) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
301 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
302 |
twi::const_iterator it = weaponItems.find(i); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
303 |
int num = it == weaponItems.end() ? 9 : it.value()[0]->getItemsNum(); // 9 is for 'skip turn' |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
304 |
state1.append(QString::number(num)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
305 |
int prob = it == weaponItems.end() ? 0 : it.value()[1]->getItemsNum(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
306 |
state2.append(QString::number(prob)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
307 |
int del = it == weaponItems.end() ? 0 : it.value()[2]->getItemsNum(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
308 |
state3.append(QString::number(del)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
309 |
int am = it == weaponItems.end() ? 0 : it.value()[3]->getItemsNum(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
310 |
state4.append(QString::number(am)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
311 |
} |
7830
72e52da6ea7f
fix for issue 441 ("Cannot overwrite default weapon set 'Default'!" message when no change to weapon set was made)
sheepluva
parents:
7797
diff
changeset
|
312 |
|
72e52da6ea7f
fix for issue 441 ("Cannot overwrite default weapon set 'Default'!" message when no change to weapon set was made)
sheepluva
parents:
7797
diff
changeset
|
313 |
stateFull = state1 + state2 + state3 + state4; |
72e52da6ea7f
fix for issue 441 ("Cannot overwrite default weapon set 'Default'!" message when no change to weapon set was made)
sheepluva
parents:
7797
diff
changeset
|
314 |
|
13555
43b72629d453
Prevent saving weapon scheme if name was already taken
Wuzzy <Wuzzy2@mail.ru>
parents:
13320
diff
changeset
|
315 |
// Check for duplicates |
43b72629d453
Prevent saving weapon scheme if name was already taken
Wuzzy <Wuzzy2@mail.ru>
parents:
13320
diff
changeset
|
316 |
QString inputNameLower = m_name->text().toLower(); |
43b72629d453
Prevent saving weapon scheme if name was already taken
Wuzzy <Wuzzy2@mail.ru>
parents:
13320
diff
changeset
|
317 |
QString curWeaponsNameLower = curWeaponsName.toLower(); |
43b72629d453
Prevent saving weapon scheme if name was already taken
Wuzzy <Wuzzy2@mail.ru>
parents:
13320
diff
changeset
|
318 |
QStringList keys = wconf->keys(); |
43b72629d453
Prevent saving weapon scheme if name was already taken
Wuzzy <Wuzzy2@mail.ru>
parents:
13320
diff
changeset
|
319 |
for(int i = 0; i < keys.size(); i++) |
7830
72e52da6ea7f
fix for issue 441 ("Cannot overwrite default weapon set 'Default'!" message when no change to weapon set was made)
sheepluva
parents:
7797
diff
changeset
|
320 |
{ |
13555
43b72629d453
Prevent saving weapon scheme if name was already taken
Wuzzy <Wuzzy2@mail.ru>
parents:
13320
diff
changeset
|
321 |
QString compName = keys[i]; |
43b72629d453
Prevent saving weapon scheme if name was already taken
Wuzzy <Wuzzy2@mail.ru>
parents:
13320
diff
changeset
|
322 |
QString compNameLower = compName.toLower(); |
43b72629d453
Prevent saving weapon scheme if name was already taken
Wuzzy <Wuzzy2@mail.ru>
parents:
13320
diff
changeset
|
323 |
// Don't allow same name as other weapon set, even case-insensitively. |
12689
5b135c26f320
Don't let player save ammo scheme with pre-installed name, even case-insensitively
Wuzzy <almikes@aol.com>
parents:
12665
diff
changeset
|
324 |
// This prevents some problems with saving/loading. |
13555
43b72629d453
Prevent saving weapon scheme if name was already taken
Wuzzy <Wuzzy2@mail.ru>
parents:
13320
diff
changeset
|
325 |
if ((compNameLower == inputNameLower) && (compNameLower != curWeaponsNameLower)) |
7830
72e52da6ea7f
fix for issue 441 ("Cannot overwrite default weapon set 'Default'!" message when no change to weapon set was made)
sheepluva
parents:
7797
diff
changeset
|
326 |
{ |
13555
43b72629d453
Prevent saving weapon scheme if name was already taken
Wuzzy <Wuzzy2@mail.ru>
parents:
13320
diff
changeset
|
327 |
// Discard changed made to current weapon scheme if there's a duplicate |
12689
5b135c26f320
Don't let player save ammo scheme with pre-installed name, even case-insensitively
Wuzzy <almikes@aol.com>
parents:
12665
diff
changeset
|
328 |
m_name->setText(curWeaponsName); |
7830
72e52da6ea7f
fix for issue 441 ("Cannot overwrite default weapon set 'Default'!" message when no change to weapon set was made)
sheepluva
parents:
7797
diff
changeset
|
329 |
QMessageBox deniedMsg(this); |
72e52da6ea7f
fix for issue 441 ("Cannot overwrite default weapon set 'Default'!" message when no change to weapon set was made)
sheepluva
parents:
7797
diff
changeset
|
330 |
deniedMsg.setIcon(QMessageBox::Warning); |
72e52da6ea7f
fix for issue 441 ("Cannot overwrite default weapon set 'Default'!" message when no change to weapon set was made)
sheepluva
parents:
7797
diff
changeset
|
331 |
deniedMsg.setWindowTitle(QMessageBox::tr("Weapons - Warning")); |
13555
43b72629d453
Prevent saving weapon scheme if name was already taken
Wuzzy <Wuzzy2@mail.ru>
parents:
13320
diff
changeset
|
332 |
deniedMsg.setText(QMessageBox::tr("A weapon scheme with the name '%1' already exists. Changes made to the weapon scheme have been discarded.").arg(compName)); |
14836
b9437746bffb
Frontend: Force plain text mode for many message windows
Wuzzy <Wuzzy2@mail.ru>
parents:
13854
diff
changeset
|
333 |
deniedMsg.setTextFormat(Qt::PlainText); |
7830
72e52da6ea7f
fix for issue 441 ("Cannot overwrite default weapon set 'Default'!" message when no change to weapon set was made)
sheepluva
parents:
7797
diff
changeset
|
334 |
deniedMsg.setWindowModality(Qt::WindowModal); |
72e52da6ea7f
fix for issue 441 ("Cannot overwrite default weapon set 'Default'!" message when no change to weapon set was made)
sheepluva
parents:
7797
diff
changeset
|
335 |
deniedMsg.exec(); |
72e52da6ea7f
fix for issue 441 ("Cannot overwrite default weapon set 'Default'!" message when no change to weapon set was made)
sheepluva
parents:
7797
diff
changeset
|
336 |
return; |
72e52da6ea7f
fix for issue 441 ("Cannot overwrite default weapon set 'Default'!" message when no change to weapon set was made)
sheepluva
parents:
7797
diff
changeset
|
337 |
} |
72e52da6ea7f
fix for issue 441 ("Cannot overwrite default weapon set 'Default'!" message when no change to weapon set was made)
sheepluva
parents:
7797
diff
changeset
|
338 |
} |
72e52da6ea7f
fix for issue 441 ("Cannot overwrite default weapon set 'Default'!" message when no change to weapon set was made)
sheepluva
parents:
7797
diff
changeset
|
339 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
340 |
if (curWeaponsName != "") |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
341 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
342 |
// remove old entry |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
343 |
wconf->remove(curWeaponsName); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
344 |
} |
13314
fe85ba81b01b
I guess "Fix weapon scheme lookup being unnecesarily persisted"?.. or something
alfadur
parents:
13196
diff
changeset
|
345 |
wconf->insert(m_name->text(), stateFull); |
12923 | 346 |
QFile file(cfgdir->absolutePath() + "/Schemes/Ammo/" + m_name->text()+ ".hwa"); |
12922 | 347 |
if (file.open(QIODevice::WriteOnly)) { |
348 |
QTextStream stream( &file ); |
|
349 |
stream << stateFull << endl; |
|
13196
f93658732448
Game scheme handling: Use QFile instead of QSettings for increased efficiency
Wuzzy <Wuzzy2@mail.ru>
parents:
13195
diff
changeset
|
350 |
file.close(); |
12922 | 351 |
} |
12665
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
352 |
emit weaponsEdited(curWeaponsName, m_name->text(), stateFull); |
15542
3b0b6ce76303
Fix weapon schemes sometimes not being saved properly
Wuzzy <Wuzzy2@mail.ru>
parents:
14839
diff
changeset
|
353 |
curWeaponsName = m_name->text(); |
683 | 354 |
} |
355 |
||
681 | 356 |
int SelWeaponWidget::operator [] (unsigned int weaponIndex) const |
357 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
358 |
twi::const_iterator it = weaponItems.find(weaponIndex); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
359 |
return it == weaponItems.end() ? 9 : it.value()[0]->getItemsNum(); |
681 | 360 |
} |
361 |
||
696 | 362 |
QString SelWeaponWidget::getWeaponsString(const QString& name) const |
363 |
{ |
|
13314
fe85ba81b01b
I guess "Fix weapon scheme lookup being unnecesarily persisted"?.. or something
alfadur
parents:
13196
diff
changeset
|
364 |
return wconf->find(name).value(); |
696 | 365 |
} |
366 |
||
718 | 367 |
void SelWeaponWidget::deleteWeaponsName() |
368 |
{ |
|
12665
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
369 |
QString delWeaponsName = curWeaponsName; |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
370 |
if (delWeaponsName == "") return; |
724 | 371 |
|
4412
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
372 |
for(int i = 0; i < cDefaultAmmos.size(); i++) |
13315 | 373 |
{ |
12665
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
374 |
if (!cDefaultAmmos[i].first.compare(delWeaponsName)) |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
375 |
{ |
7797 | 376 |
QMessageBox deniedMsg(this); |
377 |
deniedMsg.setIcon(QMessageBox::Warning); |
|
378 |
deniedMsg.setWindowTitle(QMessageBox::tr("Weapons - Warning")); |
|
379 |
deniedMsg.setText(QMessageBox::tr("Cannot delete default weapon set '%1'!").arg(cDefaultAmmos[i].first)); |
|
14836
b9437746bffb
Frontend: Force plain text mode for many message windows
Wuzzy <Wuzzy2@mail.ru>
parents:
13854
diff
changeset
|
380 |
deniedMsg.setTextFormat(Qt::PlainText); |
7797 | 381 |
deniedMsg.setWindowModality(Qt::WindowModal); |
382 |
deniedMsg.exec(); |
|
4412
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
383 |
return; |
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
384 |
} |
13315 | 385 |
} |
1509 | 386 |
|
7797 | 387 |
QMessageBox reallyDeleteMsg(this); |
388 |
reallyDeleteMsg.setIcon(QMessageBox::Question); |
|
389 |
reallyDeleteMsg.setWindowTitle(QMessageBox::tr("Weapons - Are you sure?")); |
|
12665
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
390 |
reallyDeleteMsg.setText(QMessageBox::tr("Do you really want to delete the weapon set '%1'?").arg(delWeaponsName)); |
14836
b9437746bffb
Frontend: Force plain text mode for many message windows
Wuzzy <Wuzzy2@mail.ru>
parents:
13854
diff
changeset
|
391 |
reallyDeleteMsg.setTextFormat(Qt::PlainText); |
7797 | 392 |
reallyDeleteMsg.setWindowModality(Qt::WindowModal); |
393 |
reallyDeleteMsg.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel); |
|
2377 | 394 |
|
7797 | 395 |
if (reallyDeleteMsg.exec() == QMessageBox::Ok) |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
396 |
{ |
12665
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
397 |
isDeleting = true; |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
398 |
wconf->remove(delWeaponsName); |
12923 | 399 |
QFile(cfgdir->absolutePath() + "/Schemes/Ammo/" + curWeaponsName + ".hwa").remove(); |
12665
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
400 |
emit weaponsDeleted(delWeaponsName); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
401 |
} |
718 | 402 |
} |
403 |
||
4416
29d2d1548387
adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area.
Henek
parents:
4412
diff
changeset
|
404 |
void SelWeaponWidget::newWeaponsName() |
29d2d1548387
adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area.
Henek
parents:
4412
diff
changeset
|
405 |
{ |
12665
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
406 |
save(); |
11817
5f21387edff1
Slightly better naming of new or copied ammo/game schemes
Wuzzy <almikes@aol.com>
parents:
11763
diff
changeset
|
407 |
QString newName = tr("New"); |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
408 |
if(wconf->contains(newName)) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
409 |
{ |
5029
97c650500991
solved issue 197 and other issues that were caused when copying or creating a new weapon set that was named like an already existing one. this will now be avoided.
Tobias Domhan <tdomhan@gmail.com>
parents:
4976
diff
changeset
|
410 |
//name already used -> look for an appropriate name: |
97c650500991
solved issue 197 and other issues that were caused when copying or creating a new weapon set that was named like an already existing one. this will now be avoided.
Tobias Domhan <tdomhan@gmail.com>
parents:
4976
diff
changeset
|
411 |
int i=2; |
11817
5f21387edff1
Slightly better naming of new or copied ammo/game schemes
Wuzzy <almikes@aol.com>
parents:
11763
diff
changeset
|
412 |
while(wconf->contains(newName = tr("New (%1)").arg(i++))) ; |
5029
97c650500991
solved issue 197 and other issues that were caused when copying or creating a new weapon set that was named like an already existing one. this will now be avoided.
Tobias Domhan <tdomhan@gmail.com>
parents:
4976
diff
changeset
|
413 |
} |
97c650500991
solved issue 197 and other issues that were caused when copying or creating a new weapon set that was named like an already existing one. this will now be avoided.
Tobias Domhan <tdomhan@gmail.com>
parents:
4976
diff
changeset
|
414 |
setWeaponsName(newName); |
13314
fe85ba81b01b
I guess "Fix weapon scheme lookup being unnecesarily persisted"?.. or something
alfadur
parents:
13196
diff
changeset
|
415 |
wconf->insert(newName, *cEmptyAmmoStore); |
12665
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
416 |
emit weaponsAdded(newName, *cEmptyAmmoStore); |
4416
29d2d1548387
adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area.
Henek
parents:
4412
diff
changeset
|
417 |
} |
29d2d1548387
adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area.
Henek
parents:
4412
diff
changeset
|
418 |
|
1509 | 419 |
void SelWeaponWidget::setWeaponsName(const QString& name) |
694 | 420 |
{ |
4412
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
421 |
m_name->setText(name); |
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
422 |
|
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
423 |
curWeaponsName = name; |
c9a78ba03679
added disabling option to itemNum and grey images for that. also made default weapon sets uneditable and not deleteable.
Henek
parents:
3697
diff
changeset
|
424 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
425 |
if(name != "" && wconf->contains(name)) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
426 |
{ |
13314
fe85ba81b01b
I guess "Fix weapon scheme lookup being unnecesarily persisted"?.. or something
alfadur
parents:
13196
diff
changeset
|
427 |
setWeapons(wconf->find(name).value()); |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
428 |
} |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
429 |
else |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
430 |
{ |
11763
59e979b1408f
Add empty weapons scheme (instead of default) when using “New” button
Wuzzy <almikes@aol.com>
parents:
11046
diff
changeset
|
431 |
setWeapons(*cEmptyAmmoStore); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
432 |
} |
694 | 433 |
} |
434 |
||
12665
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
435 |
void SelWeaponWidget::switchWeapons(const QString& name) |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
436 |
{ |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
437 |
// Rescue old weapons set, then select new one |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
438 |
save(); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
439 |
setWeaponsName(name); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
440 |
} |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
441 |
|
694 | 442 |
QStringList SelWeaponWidget::getWeaponNames() const |
443 |
{ |
|
13314
fe85ba81b01b
I guess "Fix weapon scheme lookup being unnecesarily persisted"?.. or something
alfadur
parents:
13196
diff
changeset
|
444 |
return wconf->keys(); |
694 | 445 |
} |
4598 | 446 |
|
447 |
void SelWeaponWidget::copy() |
|
448 |
{ |
|
12665
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
449 |
save(); |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
450 |
if(wconf->contains(curWeaponsName)) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
451 |
{ |
5029
97c650500991
solved issue 197 and other issues that were caused when copying or creating a new weapon set that was named like an already existing one. this will now be avoided.
Tobias Domhan <tdomhan@gmail.com>
parents:
4976
diff
changeset
|
452 |
QString ammo = getWeaponsString(curWeaponsName); |
11817
5f21387edff1
Slightly better naming of new or copied ammo/game schemes
Wuzzy <almikes@aol.com>
parents:
11763
diff
changeset
|
453 |
QString newName = tr("Copy of %1").arg(curWeaponsName); |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
454 |
if(wconf->contains(newName)) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6479
diff
changeset
|
455 |
{ |
5029
97c650500991
solved issue 197 and other issues that were caused when copying or creating a new weapon set that was named like an already existing one. this will now be avoided.
Tobias Domhan <tdomhan@gmail.com>
parents:
4976
diff
changeset
|
456 |
//name already used -> look for an appropriate name: |
97c650500991
solved issue 197 and other issues that were caused when copying or creating a new weapon set that was named like an already existing one. this will now be avoided.
Tobias Domhan <tdomhan@gmail.com>
parents:
4976
diff
changeset
|
457 |
int i=2; |
12663
d7492247a368
Fix argument bug in default name of copy of copy of ammo scheme
Wuzzy <almikes@aol.com>
parents:
11817
diff
changeset
|
458 |
while(wconf->contains(newName = tr("Copy of %1 (%2)").arg(curWeaponsName).arg(i++))); |
5029
97c650500991
solved issue 197 and other issues that were caused when copying or creating a new weapon set that was named like an already existing one. this will now be avoided.
Tobias Domhan <tdomhan@gmail.com>
parents:
4976
diff
changeset
|
459 |
} |
97c650500991
solved issue 197 and other issues that were caused when copying or creating a new weapon set that was named like an already existing one. this will now be avoided.
Tobias Domhan <tdomhan@gmail.com>
parents:
4976
diff
changeset
|
460 |
setWeaponsName(newName); |
97c650500991
solved issue 197 and other issues that were caused when copying or creating a new weapon set that was named like an already existing one. this will now be avoided.
Tobias Domhan <tdomhan@gmail.com>
parents:
4976
diff
changeset
|
461 |
setWeapons(ammo); |
13314
fe85ba81b01b
I guess "Fix weapon scheme lookup being unnecesarily persisted"?.. or something
alfadur
parents:
13196
diff
changeset
|
462 |
wconf->insert(newName, ammo); |
12665
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
463 |
emit weaponsAdded(newName, ammo); |
5029
97c650500991
solved issue 197 and other issues that were caused when copying or creating a new weapon set that was named like an already existing one. this will now be avoided.
Tobias Domhan <tdomhan@gmail.com>
parents:
4976
diff
changeset
|
464 |
} |
4598 | 465 |
} |
9900 | 466 |
|
467 |
QString SelWeaponWidget::fixWeaponSet(const QString &s) |
|
468 |
{ |
|
469 |
int neededLength = cDefaultAmmoStore->size() / 4; |
|
470 |
int thisSetLength = s.size() / 4; |
|
471 |
||
472 |
QStringList sl; |
|
473 |
sl |
|
474 |
<< s.left(thisSetLength) |
|
475 |
<< s.mid(thisSetLength, thisSetLength) |
|
476 |
<< s.mid(thisSetLength * 2, thisSetLength) |
|
477 |
<< s.right(thisSetLength) |
|
478 |
; |
|
479 |
||
480 |
for(int i = sl.length() - 1; i >= 0; --i) |
|
13315 | 481 |
{ |
9900 | 482 |
sl[i] = sl[i].leftJustified(neededLength, '0', true); |
13315 | 483 |
} |
9900 | 484 |
|
485 |
return sl.join(QString()); |
|
486 |
} |
|
12665
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
487 |
|
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
488 |
void SelWeaponWidget::deletionDone() |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
489 |
{ |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
490 |
isDeleting = false; |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12663
diff
changeset
|
491 |
} |
12763
ad67a3804981
Fix sometimes ammo schemes not being saved after changing before an ammo scheme got deleted in session
Wuzzy <Wuzzy2@mail.ru>
parents:
12689
diff
changeset
|
492 |
|
ad67a3804981
Fix sometimes ammo schemes not being saved after changing before an ammo scheme got deleted in session
Wuzzy <Wuzzy2@mail.ru>
parents:
12689
diff
changeset
|
493 |
void SelWeaponWidget::init() |
ad67a3804981
Fix sometimes ammo schemes not being saved after changing before an ammo scheme got deleted in session
Wuzzy <Wuzzy2@mail.ru>
parents:
12689
diff
changeset
|
494 |
{ |
ad67a3804981
Fix sometimes ammo schemes not being saved after changing before an ammo scheme got deleted in session
Wuzzy <Wuzzy2@mail.ru>
parents:
12689
diff
changeset
|
495 |
isDeleting = false; |
ad67a3804981
Fix sometimes ammo schemes not being saved after changing before an ammo scheme got deleted in session
Wuzzy <Wuzzy2@mail.ru>
parents:
12689
diff
changeset
|
496 |
} |