X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects%2FObject.cpp;h=c91e5d8c2b3faf84a973c965856403fcc3168c91;hb=51a0860281c8978f5404c730eb809fb455d99aea;hp=db6249f7cd61c15057ce92f2c7cc7c008ecf2d5f;hpb=30f342b219632ea3e777388a9530340baf4d7aac;p=lugaru.git diff --git a/Source/Objects/Object.cpp b/Source/Objects/Object.cpp index db6249f..c91e5d8 100644 --- a/Source/Objects/Object.cpp +++ b/Source/Objects/Object.cpp @@ -689,7 +689,7 @@ void Object::ComputeRadius() { float maxdistance = 0; float tempdist; - for (int i = 0; i < objects.size(); i++) { + for (unsigned int i = 0; i < objects.size(); i++) { tempdist = distsq(¢er, &objects[i]->position); if (tempdist > maxdistance) { maxdistance = tempdist; @@ -825,9 +825,9 @@ int Object::checkcollide(XYZ startpoint, XYZ endpoint) maxy = max(startpoint.y, endpoint.y) + 1; maxz = max(startpoint.z, endpoint.z) + 1; - for (int i = 0; i < objects.size(); i++) { + for (unsigned int i = 0; i < objects.size(); i++) { if (checkcollide(startpoint, endpoint, i, minx, miny, minz, maxx, maxy, maxz) != -1) { - return i; + return (int) i; } }