games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Fix build

Browse Source
This commit is contained in:
MichalZr6
2025-05-04 17:31:42 +02:00
parent eb3addd32e
commit ef95f34bdb
2 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mapeditor/mapcontroller.cpp
View File

@@ -683,7 +683,13 @@ void MapController::modAssessmentObject(const CGObjectInstance * obj, ModCompati
for(const auto & spellID : town->obligatorySpells) for(const auto & spellID : town->obligatorySpells)
{ {
auto hero = dynamic_cast<CGHeroInstance *>(obj.get()); extractEntityMod(spellID.toEntity(LIBRARY));
}
}
if(obj->ID == Obj::HERO || obj->ID == Obj::RANDOM_HERO)
{
auto hero = dynamic_cast<const CGHeroInstance *>(obj);
for(const auto & spellID : hero->getSpellsInSpellbook()) for(const auto & spellID : hero->getSpellsInSpellbook())
{ {
if(spellID == SpellID::PRESET || spellID == SpellID::SPELLBOOK_PRESET) if(spellID == SpellID::PRESET || spellID == SpellID::SPELLBOOK_PRESET)
@@ -701,28 +707,6 @@ void MapController::modAssessmentObject(const CGObjectInstance * obj, ModCompati
extractEntityMod(art.getArt()->getTypeId().toEntity(LIBRARY)); extractEntityMod(art.getArt()->getTypeId().toEntity(LIBRARY));
} }
} }
}
if(obj->ID == Obj::HERO || obj->ID == Obj::RANDOM_HERO)
{
auto hero = dynamic_cast<const CGHeroInstance *>(obj);
for(const auto & spellID : hero->getSpellsInSpellbook())
{
if(spellID == SpellID::PRESET || spellID == SpellID::SPELLBOOK_PRESET)
continue;
extractEntityMod(spellID.toEntity(LIBRARY));
}
for(const auto & [_, slotInfo] : hero->artifactsWorn)
{
extractEntityMod(slotInfo.artifact->getTypeId().toEntity(LIBRARY));
}
for(const auto & art : hero->artifactsInBackpack)
{
extractEntityMod(art.artifact->getTypeId().toEntity(LIBRARY));
}
}
//TODO: terrains? //TODO: terrains?
} }

2
mapeditor/mapview.cpp
View File

@@ -614,7 +614,7 @@ void MapView::dropEvent(QDropEvent * event)
if(sc->selectionObjectsView.newObject) if(sc->selectionObjectsView.newObject)
{ {
QString errorMsg; QString errorMsg;
if(controller->canPlaceObject(sc->selectionObjectsView.newObject, errorMsg)) if(controller->canPlaceObject(sc->selectionObjectsView.newObject.get(), errorMsg))
{ {
auto obj = sc->selectionObjectsView.newObject; auto obj = sc->selectionObjectsView.newObject;
controller->commitObjectCreate(sc->level); controller->commitObjectCreate(sc->level);