games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-03 00:46:55 +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

6
lib/Mapping/CMapEditManager.cpp
View File

@ -50,7 +50,7 @@ CTerrainViewPatternConfig::CTerrainViewPatternConfig()
{
throw std::runtime_error("Size of pattern's data vector has to be 9.");
}
for(int i = 0; i < data.size(); ++i)
for(size_t i = 0; i < data.size(); ++i)
{
std::string cell = data[i].String();
boost::algorithm::erase_all(cell, " ");
@ -169,7 +169,7 @@ void CMapEditManager::updateTerrainViews(int posx, int posy, int width, int heig
// Detect a pattern which fits best
int bestPattern = -1, bestFlip = -1;
std::string transitionReplacement;
for(int k = 0; k < patterns.size(); ++k)
for(size_t k = 0; k < patterns.size(); ++k)
{
const TerrainViewPattern & pattern = patterns[k];
@ -275,7 +275,7 @@ CMapEditManager::ValidationResult CMapEditManager::validateTerrainView(int posx,
// Validate all rules per cell
int topPoints = -1;
for(int j = 0; j < pattern.data[i].size(); ++j)
for(size_t j = 0; j < pattern.data[i].size(); ++j)
{
TerrainViewPattern::WeightedRule rule = pattern.data[i][j];
if(!rule.isStandardRule())