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

Fixed lots of warnings.

Browse Source 
Disabled the following (for MSVC only) that couldn't (or shouldn't) be fixed.

4003: not enough actual parameters for macro 'identifier'
4250: 'class1' : inherits 'class2::member' via dominance
4251: 'type' : class 'type1' needs to have dll-interface to be used by clients of class 'type2'
4275: non dll-interface class 'type1' used as base for dll-interface class 'type2'
This commit is contained in:
John Bolton
2020-10-01 01:38:06 -07:00
parent ff471af3de
commit a05ae78e67
142 changed files with 854 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/mapping/CMapEditManager.cpp
View File

@ -608,7 +608,7 @@ void CDrawTerrainOperation::updateTerrainTypes()
terrainTile.terType = centerTile.terType;
auto testTile = getInvalidTiles(posToTest);
int nativeTilesCntNorm = testTile.nativeTiles.empty() ? std::numeric_limits<int>::max() : testTile.nativeTiles.size();
int nativeTilesCntNorm = testTile.nativeTiles.empty() ? std::numeric_limits<int>::max() : (int)testTile.nativeTiles.size();
bool putSuitableTile = false;
bool addToSuitableTiles = false;
@ -652,7 +652,7 @@ void CDrawTerrainOperation::updateTerrainTypes()
//}
invalidNativeTilesCnt = nativeTilesCntNorm;
invalidForeignTilesCnt = testTile.foreignTiles.size();
invalidForeignTilesCnt = static_cast<int>(testTile.foreignTiles.size());
suitableTiles.clear();
addToSuitableTiles = true;
}
@ -1081,7 +1081,7 @@ CInsertObjectOperation::CInsertObjectOperation(CMap * map, CGObjectInstance * ob
void CInsertObjectOperation::execute()
{
obj->id = ObjectInstanceID(map->objects.size());
obj->id = ObjectInstanceID((si32)map->objects.size());
boost::format fmt("%s_%d");
fmt % obj->typeName % obj->id.getNum();