equal
deleted
inserted
replaced
224 |
224 |
225 stateFull = state1 + state2 + state3 + state4; |
225 stateFull = state1 + state2 + state3 + state4; |
226 |
226 |
227 for(int i = 0; i < cDefaultAmmos.size(); i++) |
227 for(int i = 0; i < cDefaultAmmos.size(); i++) |
228 { |
228 { |
229 if (cDefaultAmmos[i].first.compare(m_name->text()) == 0) |
229 // Don't allow same name as default weapon set, even case-insensitively. |
|
230 // This prevents some problems with saving/loading. |
|
231 if (cDefaultAmmos[i].first.toLower().compare(m_name->text().toLower()) == 0) |
230 { |
232 { |
231 // don't show warning if no change |
233 // don't show warning if no change |
232 if (cDefaultAmmos[i].second.compare(stateFull) == 0) |
234 if (cDefaultAmmos[i].second.compare(stateFull) == 0) |
233 return; |
235 return; |
234 |
236 |
|
237 m_name->setText(curWeaponsName); |
235 QMessageBox deniedMsg(this); |
238 QMessageBox deniedMsg(this); |
236 deniedMsg.setIcon(QMessageBox::Warning); |
239 deniedMsg.setIcon(QMessageBox::Warning); |
237 deniedMsg.setWindowTitle(QMessageBox::tr("Weapons - Warning")); |
240 deniedMsg.setWindowTitle(QMessageBox::tr("Weapons - Warning")); |
238 deniedMsg.setText(QMessageBox::tr("Cannot overwrite default weapon set '%1'!").arg(cDefaultAmmos[i].first)); |
241 deniedMsg.setText(QMessageBox::tr("Cannot overwrite default weapon set '%1'!").arg(cDefaultAmmos[i].first)); |
239 deniedMsg.setWindowModality(Qt::WindowModal); |
242 deniedMsg.setWindowModality(Qt::WindowModal); |