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

Merge remote-tracking branch 'origin/develop' into ban_stuff_on_water_maps

Browse Source
This commit is contained in:
Tomasz Zieliński
2023-07-15 14:36:32 +02:00
parent 700d8459ac 65d3b96ed0
commit a200e87640
166 changed files with 3016 additions and 1559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/mapping/CMap.cpp
View File

@@ -466,15 +466,15 @@ void CMap::checkForObjectives()
void CMap::addNewArtifactInstance(CArtifactInstance * art)
{
art->id = ArtifactInstanceID(static_cast<si32>(artInstances.size()));
art->setId(static_cast<ArtifactInstanceID>(artInstances.size()));
artInstances.emplace_back(art);
}
void CMap::eraseArtifactInstance(CArtifactInstance * art)
{
//TODO: handle for artifacts removed in map editor
assert(artInstances[art->id.getNum()] == art);
artInstances[art->id.getNum()].dellNull();
assert(artInstances[art->getId().getNum()] == art);
artInstances[art->getId().getNum()].dellNull();
}
void CMap::addNewQuestInstance(CQuest* quest)

2
lib/mapping/MapFormatH3M.cpp
View File

@@ -746,7 +746,7 @@ void CMapLoaderH3M::readAllowedArtifacts()
if(!features.levelSOD)
{
for(CArtifact * artifact : VLC->arth->objects)
if(artifact->constituents)
if(artifact->isCombined())
map->allowedArtifact[artifact->getId()] = false;
}