- if ( Object::objects[i]->position.x > minx - Object::objects[i]->model.boundingsphereradius &&
- Object::objects[i]->position.x < maxx + Object::objects[i]->model.boundingsphereradius &&
- Object::objects[i]->position.y > miny - Object::objects[i]->model.boundingsphereradius &&
- Object::objects[i]->position.y < maxy + Object::objects[i]->model.boundingsphereradius &&
- Object::objects[i]->position.z > minz - Object::objects[i]->model.boundingsphereradius &&
- Object::objects[i]->position.z < maxz + Object::objects[i]->model.boundingsphereradius) {
- if ( Object::objects[i]->type != treeleavestype &&
- Object::objects[i]->type != bushtype &&
- Object::objects[i]->type != firetype) {
- colviewer = startpoint;
- coltarget = endpoint;
- if (Object::objects[i]->model.LineCheck(&colviewer, &coltarget, &colpoint, &Object::objects[i]->position, &Object::objects[i]->yaw) != -1)
- return i;
- }
+ if (checkcollide(startpoint, endpoint, i, minx, miny, minz, maxx, maxy, maxz) != -1) {
+ return i;