games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00
Code Issues Releases Activity

Fixed gcc/clang warnings

Browse Source
This commit is contained in:
Ivan Savenko
2015-12-04 01:06:02 +02:00
parent c2f4991e99
commit faa7cbff18
13 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mapping/CCampaignHandler.cpp
View File

@@ -292,7 +292,7 @@ CScenarioTravel CCampaignHandler::readScenarioTravelFromMemory(CBinaryReader & r
std::vector< std::vector<ui8> > CCampaignHandler::getFile(const std::string & name, bool headerOnly)
{
CCompressedStream stream(std::move(CResourceHandler::get()->load(ResourceID(name, EResType::CAMPAIGN))), true);
CCompressedStream stream(CResourceHandler::get()->load(ResourceID(name, EResType::CAMPAIGN)), true);
std::vector< std::vector<ui8> > ret;
do
@@ -363,7 +363,7 @@ std::vector<CGHeroInstance *> CCampaignScenario::getLostCrossoverHeroes() const
}
}
}
return std::move(lostCrossoverHeroes);
return lostCrossoverHeroes;
}
bool CScenarioTravel::STravelBonus::isBonusForHero() const