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

(gcc) Fixed some warnings.

Browse Source
This commit is contained in:
Frank Zago 2009-10-31 16:32:18 +00:00
parent 46c1127cc4
commit 359ca49f26
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/map.h
View File

@ -375,11 +375,11 @@ struct DLL_EXPORT Mapa : public CMapHeader
if(h.saving) //create vector with all defs used on map
{
for(int i=0; i<objects.size(); i++)
for(unsigned int i=0; i<objects.size(); i++)
if(objects[i])
objects[i]->defInfo->serial = -1; //set serial to serial -1 - indicates that def is not present in defs vector
for(int i=0; i<objects.size(); i++)
for(unsigned int i=0; i<objects.size(); i++)
{
if(!objects[i]) continue;
CGDefInfo *cur = objects[i]->defInfo;
@ -413,7 +413,7 @@ struct DLL_EXPORT Mapa : public CMapHeader
h & CGMagi::eyelist;
h & CGPyramid::pyramidConfig;
for(int i=0; i<objects.size(); i++)
for(unsigned int i=0; i<objects.size(); i++)
{
CGObjectInstance *&obj = objects[i];
h & obj;
@ -431,7 +431,7 @@ struct DLL_EXPORT Mapa : public CMapHeader
if(!h.saving)
{
for(int i=0; i<objects.size(); i++)
for(unsigned int i=0; i<objects.size(); i++)
{
if(!objects[i]) continue;
if(objects[i]->ID == HEROI_TYPE)
@ -441,10 +441,10 @@ struct DLL_EXPORT Mapa : public CMapHeader
addBlockVisTiles(objects[i]); //recreate blockvis map
}
for(int i=0; i<heroes.size(); i++) //if hero is visiting/garrisoned in town set appropriate pointers
for(unsigned int i=0; i<heroes.size(); i++) //if hero is visiting/garrisoned in town set appropriate pointers
{
int3 vistile = heroes[i]->pos; vistile.x++;
for(int j=0; j<towns.size(); j++)
for(unsigned int j=0; j<towns.size(); j++)
{
if(vistile == towns[j]->pos) //hero stands on the town entrance
{
@ -467,7 +467,7 @@ struct DLL_EXPORT Mapa : public CMapHeader
const TerrainTile &t = getTile(vistile);
if(t.tertype != TerrainTile::water) continue;
//hero stands on the water - he must be in the boat
for(int j = 0; j < t.visitableObjects.size(); j++)
for(unsigned int j = 0; j < t.visitableObjects.size(); j++)
{
if(t.visitableObjects[j]->ID == 8)
{