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

Fix indentation of logging code and around it

Browse Source 
That wouldn't be as big issue if problem affected few files, but it everywhere in codebase.
Fixed it everywhere since in most files that is the only code with wrong indentation.
This commit is contained in:
Arseniy Shestakov
2016-03-12 04:41:27 +03:00
parent faae305ec0
commit 10dbbead2d
54 changed files with 580 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/mapping/CCampaignHandler.cpp
View File

@@ -245,7 +245,7 @@ CScenarioTravel CCampaignHandler::readScenarioTravelFromMemory(CBinaryReader & r
break;
}
default:
logGlobal->warnStream() << "Corrupted h3c file";
logGlobal->warnStream() << "Corrupted h3c file";
break;
}
ret.bonusesToChoose.push_back(bonus);
@@ -282,8 +282,8 @@ CScenarioTravel CCampaignHandler::readScenarioTravelFromMemory(CBinaryReader & r
}
default:
{
logGlobal->warnStream() << "Corrupted h3c file";
break;
logGlobal->warnStream() << "Corrupted h3c file";
break;
}
}

14
lib/mapping/MapFormatH3M.cpp
View File

@@ -126,7 +126,7 @@ void CMapLoaderH3M::init()
{
for(MapLoadingTime & mlt : times)
{
logGlobal->debugStream() << "\tReading " << mlt.name << " took " << mlt.time << " ms.";
logGlobal->debugStream() << "\tReading " << mlt.name << " took " << mlt.time << " ms.";
}
}
map->calculateGuardingGreaturePositions();
@@ -873,14 +873,14 @@ bool CMapLoaderH3M::loadArtifactToSlot(CGHeroInstance * hero, int slot)
{
if(vstd::contains(VLC->arth->bigArtifacts, aid) && slot >= GameConstants::BACKPACK_START)
{
logGlobal->warnStream() << "Warning: A big artifact (war machine) in hero's backpack, ignoring...";
logGlobal->warnStream() << "Warning: A big artifact (war machine) in hero's backpack, ignoring...";
return false;
}
if(aid == 0 && slot == ArtifactPosition::MISC5)
{
//TODO: check how H3 handles it -> art 0 in slot 18 in AB map
logGlobal->warnStream() << "Spellbook to MISC5 slot? Putting it spellbook place. AB format peculiarity ? (format "
<< static_cast<int>(map->version) << ")";
logGlobal->warnStream() << "Spellbook to MISC5 slot? Putting it spellbook place. AB format peculiarity ? (format "
<< static_cast<int>(map->version) << ")";
slot = ArtifactPosition::SPELLBOOK;
}
@@ -1536,7 +1536,7 @@ CGObjectInstance * CMapLoaderH3M::readHero(ObjectInstanceID idToBeGiven, const i
{
if(elem->subID == nhi->subID)
{
logGlobal->debugStream() << "Hero " << nhi->subID << " will be taken from the predefined heroes list.";
logGlobal->debugStream() << "Hero " << nhi->subID << " will be taken from the predefined heroes list.";
delete nhi;
nhi = elem;
break;
@@ -2067,8 +2067,8 @@ std::set<BuildingID> CMapLoaderH3M::convertBuildings(const std::set<BuildingID>
}
else
{
logGlobal->warnStream() << "Conversion warning: unknown building " << elem << " in castle "
<< castleID;
logGlobal->warnStream() << "Conversion warning: unknown building " << elem << " in castle "
<< castleID;
}
}