games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-05 13:04:54 +02:00
Code Issues Releases Activity

Load template name from user settings

Browse Source
This commit is contained in:
Tomasz Zielinski 2022-09-11 07:47:32 +02:00
parent 3656b2ef67
commit 73cc606ee2
4 changed files with 49 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/rmg/CRmgTemplateStorage.cpp
View File

@ -32,6 +32,8 @@ void CRmgTemplateStorage::loadObject(std::string scope, std::string name, const
templates[fullKey].setId(name);
templates[fullKey].serializeJson(handler);
templates[fullKey].validate();
templatesByName[name] = templates[fullKey];
}
catch(const std::exception & e)
{
@ -51,14 +53,22 @@ std::vector<JsonNode> CRmgTemplateStorage::loadLegacyData(size_t dataSize)
//it would be cool to load old rmg.txt files
}
const CRmgTemplate * CRmgTemplateStorage::getTemplate(const std::string & templateName) const
const CRmgTemplate * CRmgTemplateStorage::getTemplate(const std::string & templateFullId) const
{
auto iter = templates.find(templateName);
auto iter = templates.find(templateFullId);
if(iter==templates.end())
return nullptr;
return &iter->second;
}
const CRmgTemplate * CRmgTemplateStorage::getTemplateByName(const std::string & templateName) const
{
auto iter = templatesByName.find(templateName);
if(iter==templatesByName.end())
return nullptr;
return &iter->second;
}
std::vector<const CRmgTemplate *> CRmgTemplateStorage::getTemplates() const
{
std::vector<const CRmgTemplate *> result;

6
lib/rmg/CRmgTemplateStorage.h
View File

@ -29,10 +29,12 @@ public:
virtual void loadObject(std::string scope, std::string name, const JsonNode & data) override;
virtual void loadObject(std::string scope, std::string name, const JsonNode & data, size_t index) override;
const CRmgTemplate* getTemplate(const std::string & templateName) const;
const CRmgTemplate* getTemplate(const std::string & templateFullId) const;
const CRmgTemplate* getTemplateByName(const std::string & templateName) const;
std::vector<const CRmgTemplate *> getTemplates() const;
private:
std::map<std::string, CRmgTemplate> templates;
std::map<std::string, CRmgTemplate> templates; //FIXME: doesn't IHandlerBase cover this?
std::map<std::string, CRmgTemplate> templatesByName;
};

49
mapeditor/windownewmap.cpp
View File

@ -24,14 +24,18 @@ WindowNewMap::WindowNewMap(QWidget *parent) :
loadUserSettings();
show();
//setup initial parameters
//setup initial parameters - can depend on loaded settings
mapGenOptions.setWidth(ui->widthTxt->text().toInt());
mapGenOptions.setHeight(ui->heightTxt->text().toInt());
bool twoLevel = ui->twoLevelCheck->isChecked();
mapGenOptions.setHasTwoLevels(twoLevel);
mapGenOptions.setPlayerCount(ui->humanCombo->currentText().toInt());
mapGenOptions.setCompOnlyPlayerCount(ui->cpuCombo->currentText().toInt());
updateTemplateList();
loadLastTemplate();
show();
}
WindowNewMap::~WindowNewMap()
@ -42,7 +46,7 @@ WindowNewMap::~WindowNewMap()
void WindowNewMap::loadUserSettings()
{
//load window settings
//load last saved settings
QSettings s(Ui::teamName, Ui::appName);
auto width = s.value(newMapWidth);
@ -108,23 +112,26 @@ void WindowNewMap::loadUserSettings()
ui->monsterOpt4->setChecked(true); break;
}
}
}
void WindowNewMap::loadLastTemplate()
{
//this requires already loaded template list
QSettings s(Ui::teamName, Ui::appName);
auto templateName = s.value(newMapTemplate);
if (templateName.isValid())
{
updateTemplateList();
auto qstr = templateName.toString();
auto* templ = VLC->tplh->getTemplate(templateName.toString().toStdString());
if (templ)
{
ui->templateCombo->setCurrentText(templateName.toString());
//TODO: validate inside this method
mapGenOptions.setMapTemplate(templ);
}
else
{
//Display problem on status bar
}
//Template might have been removed, then silently comboBox will be set to empty string
auto index = ui->templateCombo->findText(qstr);
ui->templateCombo->setCurrentIndex(index);
on_templateCombo_activated(index);
}
else
{
QMessageBox::critical(this, "", "Failed to load template name");
}
}
@ -163,10 +170,14 @@ void WindowNewMap::saveUserSettings()
s.setValue(newMapMonsterStrength, static_cast<int>(monster));
auto templateName = ui->templateCombo->currentText();
if (templateName.size())
if (templateName.size() && templateName != defaultTemplate)
{
s.setValue(newMapTemplate, templateName);
}
else
{
s.setValue(newMapTemplate, "");
}
}
void WindowNewMap::on_cancelButton_clicked()
@ -351,7 +362,7 @@ void WindowNewMap::on_templateCombo_activated(int index)
return;
}
auto * templ = VLC->tplh->getTemplate(ui->templateCombo->currentText().toStdString());
auto * templ = VLC->tplh->getTemplateByName(ui->templateCombo->currentText().toStdString());
mapGenOptions.setMapTemplate(templ);
}
@ -390,7 +401,7 @@ void WindowNewMap::updateTemplateList()
if(templates.empty())
return;
ui->templateCombo->addItem("[default]");
ui->templateCombo->addItem(defaultTemplate);
for(auto * templ : templates)
{

3
mapeditor/windownewmap.h
View File

@ -23,6 +23,8 @@ class WindowNewMap : public QDialog
const QString newMapMonsterStrength = "NewMapWindow/MonsterStrength";
const QString newMapTemplate = "NewMapWindow/Template";
const QString defaultTemplate = "[default]";
const int playerLimit = 8;
const std::map<int, int> players
@ -81,6 +83,7 @@ private:
void updateTemplateList();
void loadUserSettings();
void loadLastTemplate();
void saveUserSettings();
private: