games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00
Code Issues Releases Activity

Make IObjectInterface::cb non-static

Browse Source
This commit is contained in:
Ivan Savenko
2024-01-01 16:37:48 +02:00
parent c37ce05d06
commit a15366f5a5
89 changed files with 502 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mapeditor/mainwindow.cpp
View File

@@ -347,7 +347,7 @@ std::unique_ptr<CMap> MainWindow::openMapInternal(const QString & filenameSelect
if(!modList.empty())
throw ModIncompatibility(modList);
return mapService.loadMap(resId);
return mapService.loadMap(resId, nullptr);
}
else
throw std::runtime_error("Corrupted map");
@@ -546,7 +546,7 @@ void MainWindow::addGroupIntoCatalog(const std::string & groupName, bool useCust
}
//create object to extract name
std::unique_ptr<CGObjectInstance> temporaryObj(factory->create(templ));
std::unique_ptr<CGObjectInstance> temporaryObj(factory->create(nullptr, templ));
QString translated = useCustomName ? QString::fromStdString(temporaryObj->getObjectName().c_str()) : subGroupName;
itemType->setText(translated);