Revision: 1560
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1560&view=rev
Author: rorthomas
Date: 2010-12-19 16:45:05 +0000 (Sun, 19 Dec 2010)
Log Message:
-----------
fixed some collision warnings
Modified Paths:
--------------
trunk/source/main/collisions.cpp
Modified: trunk/source/main/collisions.cpp
===================================================================
--- trunk/source/main/collisions.cpp 2010-12-19 16:38:37 UTC (rev 1559)
+++ trunk/source/main/collisions.cpp 2010-12-19 16:45:05 UTC (rev 1560)
@@ -362,7 +362,7 @@
{
cell_t *cell = hashtable[pos].cell;
// cell has content, search it
- for(int i=0;i<cell->size();i++)
+ for(unsigned int i=0;i<cell->size();i++)
{
if((*cell)[i] == value)
{
@@ -401,14 +401,14 @@
newcell->push_back(value);
cells.push_back(newcell);
if (pos!=hashfunc(cellid)) collision_count++;
- if (newcell->size()>largest_cellcount)
largest_cellcount=newcell->size();
+ if ((int)newcell->size()>largest_cellcount)
largest_cellcount=newcell->size();
}
else if (hashtable[pos].cellid==cellid)
{
//there is already a cell ready
cell_t *cell=hashtable[pos].cell;
cell->push_back(value);
- if (cell->size()>largest_cellcount)
largest_cellcount=cell->size();
+ if ((int)cell->size()>largest_cellcount)
largest_cellcount=cell->size();
}
else
{
@@ -706,7 +706,7 @@
//find the correct cell
bool contacted=false;
int refx, refz;
- int k;
+ unsigned int k;
if (!(refpos->x>0 && refpos->x<mefl->mapsizex && refpos->z>0 &&
refpos->z<mefl->mapsizex)) return false;
@@ -914,7 +914,7 @@
bool smoky=false;
//float corrf=1.0;
Vector3 oripos=node->AbsPosition;
- int k;
+ unsigned int k;
//find the correct cell
int refx, refz;
refx=(int)(node->AbsPosition.x*inverse_CELL_SIZE);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
