games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00
Code Issues Releases Activity

Synchronization with trunk (again), elimination of some warnings

Browse Source
This commit is contained in:
paracelsus
2013-03-07 19:17:23 +00:00
parent 2ad2fc83f1
commit 9ec431c37b
41 changed files with 677 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Mapping/CCampaignHandler.cpp
View File

@ -303,7 +303,7 @@ bool CCampaign::conquerable( int whichScenario ) const
return false;
}
//check preconditioned regions
for (int g=0; g<scenarios.size(); ++g)
for (size_t g=0; g<scenarios.size(); ++g)
{
if( vstd::contains(scenarios[whichScenario].preconditionRegions, g) && !scenarios[g].conquered)
return false; //prerequisite does not met
@ -462,7 +462,7 @@ CCampaignState::CCampaignState()
CCampaignState::CCampaignState( unique_ptr<CCampaign> _camp ) : camp(std::move(_camp))
{
for(int i = 0; i < camp->scenarios.size(); i++)
for(size_t i = 0; i < camp->scenarios.size(); i++)
{
if(vstd::contains(camp->mapPieces, i)) //not all maps must be present in a campaign
mapsRemaining.push_back(i);