games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Cleanup & formatting

Browse Source
This commit is contained in:
AlexVinS
2017-07-04 01:32:40 +03:00
parent dfbc9cea8a
commit dbaf3cb023
6 changed files with 41 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/spells/AdventureSpellMechanics.cpp
View File

@@ -426,7 +426,7 @@ ESpellCastResult TownPortalMechanics::beginCast(const SpellCastEnvironment * env
return ESpellCastResult::CANCEL;
}
if(!parameters.pos.valid() && parameters.caster->getSpellSchoolLevel(owner) >= 2)
if(!parameters.pos.valid() && parameters.caster->getSpellSchoolLevel(owner) >= 2)
{
auto queryCallback = [=](const JsonNode & reply) -> void
{
@@ -458,7 +458,7 @@ ESpellCastResult TownPortalMechanics::beginCast(const SpellCastEnvironment * env
for(auto t : towns)
{
if (t->visitingHero == nullptr) //empty town
if(t->visitingHero == nullptr) //empty town
request.objects.push_back(t->id);
}
@@ -472,10 +472,10 @@ ESpellCastResult TownPortalMechanics::beginCast(const SpellCastEnvironment * env
}
request.player = parameters.caster->getOwner();
request.title.addTxt(MetaString::JK_TXT, 40);
request.description.addTxt(MetaString::JK_TXT, 41);
request.icon.id = Component::SPELL;
request.icon.subtype = owner->id.toEnum();
request.title.addTxt(MetaString::JK_TXT, 40);
request.description.addTxt(MetaString::JK_TXT, 41);
request.icon.id = Component::SPELL;
request.icon.subtype = owner->id.toEnum();
env->genericQuery(&request, request.player, queryCallback);
@@ -493,11 +493,11 @@ const CGTownInstance * TownPortalMechanics::findNearestTown(const SpellCastEnvir
auto nearest = pool.cbegin(); //nearest town's iterator
si32 dist = (*nearest)->pos.dist2dSQ(parameters.caster->pos);
for (auto i = nearest + 1; i != pool.cend(); ++i)
for(auto i = nearest + 1; i != pool.cend(); ++i)
{
si32 curDist = (*i)->pos.dist2dSQ(parameters.caster->pos);
if (curDist < dist)
if(curDist < dist)
{
nearest = i;
dist = curDist;