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

Fixed teleporting animation (#818). Flying ability with subtype "1" will cause movement animation to skip (teleport).

Browse Source
This commit is contained in:
DjWarmonger
2012-09-29 12:40:12 +00:00
parent a602d7e9da
commit b6a20b6e99
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/CCreatureHandler.cpp
View File

@@ -387,15 +387,7 @@ void CCreatureHandler::loadCreatures()
if (!value->isNull() && value->Bool())
factionToTurretCreature[c->faction] = creatureID;
value = &creature["ability_add"];
if (!value->isNull()) {
BOOST_FOREACH(const JsonNode &ability, value->Vector())
{
AddAbility(c, ability.Vector());
}
}
value = &creature["ability_remove"];
value = &creature["ability_remove"];//remove first - arch devil
if (!value->isNull())
{
BOOST_FOREACH(const JsonNode &ability, value->Vector())
@@ -403,6 +395,14 @@ void CCreatureHandler::loadCreatures()
RemoveAbility(c, ability);
}
}
value = &creature["ability_add"];
if (!value->isNull()) {
BOOST_FOREACH(const JsonNode &ability, value->Vector())
{
AddAbility(c, ability.Vector());
}
}
}
BOOST_FOREACH(const JsonNode &creature, config["unused_creatures"].Vector())