Object::Object() :
position(),
- type(0),
+ type(boxtype),
yaw(0),
pitch(0),
rotx(0),
{
}
-Object::Object(int _type, XYZ _position, float _yaw, float _pitch, float _scale) : Object()
+Object::Object(object_type _type, XYZ _position, float _yaw, float _pitch, float _scale) : Object()
{
scale = _scale;
type = _type;
{
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;
if (type == treeleavestype) {
scale = lastscale;
}
- objects.emplace_back(new Object(type, position, yaw, pitch, scale));
+ objects.emplace_back(new Object(object_type(type), position, yaw, pitch, scale));
lastscale = scale;
}
}
{
if ((atype != treeleavestype && atype != bushtype) || foliage == 1) {
unsigned nextid = objects.size();
- objects.emplace_back(new Object(atype, where, ayaw, apitch, ascale));
+ objects.emplace_back(new Object(object_type(atype), where, ayaw, apitch, ascale));
objects.back()->addToTerrain(nextid);
}
}
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;
}
}