1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00

Merge pull request #1221 from IvanSavenko/warnings_fix

Fix remaining compiler warnings
This commit is contained in:
Ivan Savenko
2022-12-29 21:51:55 +02:00
committed by GitHub
119 changed files with 427 additions and 411 deletions

View File

@@ -698,7 +698,7 @@ void MainWindow::loadObjectsTree()
addGroupIntoCatalog("OBSTACLES", true);
addGroupIntoCatalog("OTHER", false);
}
catch(const std::exception & e)
catch(const std::exception &)
{
QMessageBox::critical(this, "Mods loading problem", "Critical error during Mods loading. Disable invalid mods and restart.");
}
@@ -887,7 +887,7 @@ void MainWindow::on_terrainFilterCombo_currentTextChanged(const QString &arg1)
if(!objectBrowser)
return;
objectBrowser->terrain = arg1.isEmpty() ? Terrain::ANY_TERRAIN : VLC->terrainTypeHandler->getInfoByName(arg1.toStdString())->id;
objectBrowser->terrain = arg1.isEmpty() ? TerrainId(Terrain::ANY_TERRAIN) : VLC->terrainTypeHandler->getInfoByName(arg1.toStdString())->id;
objectBrowser->invalidate();
objectBrowser->sort(0);
}