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

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

Browse Source
This commit is contained in:
Tomasz Zieliński
2023-07-19 12:05:30 +02:00
parent 147f0bce8a b584250537
commit ad5081f9fe
41 changed files with 588 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mapping/MapFormatH3M.cpp
View File

@@ -1737,7 +1737,7 @@ CGObjectInstance * CMapLoaderH3M::readHero(const int3 & mapPosition, const Objec
if(!object->spells.empty())
{
object->clear();
logGlobal->warn("Hero %s subID=%d has spells set twice (in map properties and on adventure map instance). Using the latter set...", object->getNameTextID(), object->subID);
logGlobal->debug("Hero %s subID=%d has spells set twice (in map properties and on adventure map instance). Using the latter set...", object->getNameTextID(), object->subID);
}
object->spells.insert(SpellID::PRESET); //placeholder "preset spells"