games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

Merge pull request #5805 from MichalZr6/rmg_callback_fix

Browse Source 
Fix RMG not getting callback when new map is created
This commit is contained in:
Ivan Savenko
2025-06-18 09:48:07 +03:00
committed by GitHub
parent a7732db0fe af08091472
commit f7210fc8be
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mapeditor/windownewmap.cpp
View File

@@ -275,6 +275,8 @@ void WindowNewMap::on_okButton_clicked()
saveUserSettings();
std::unique_ptr<CMap> nmap;
auto & mapController = static_cast<MainWindow *>(parent())->controller;
if(ui->randomMapCheck->isChecked())
{
//verify map template
@@ -290,7 +292,7 @@ void WindowNewMap::on_okButton_clicked()
if(ui->checkSeed->isChecked() && ui->lineSeed->value() != 0)
seed = ui->lineSeed->value();
CMapGenerator generator(mapGenOptions, nullptr, seed);
CMapGenerator generator(mapGenOptions, mapController.getCallback(), seed);
auto progressBarWnd = new GeneratorProgress(generator, this);
progressBarWnd->show();
@@ -312,8 +314,8 @@ void WindowNewMap::on_okButton_clicked()
}
nmap->mods = MapController::modAssessmentMap(*nmap);
static_cast<MainWindow*>(parent())->controller.setMap(std::move(nmap));
static_cast<MainWindow*>(parent())->initializeMap(true);
mapController.setMap(std::move(nmap));
static_cast<MainWindow *>(parent())->initializeMap(true);
close();
}