diff --git a/TR5Main/Game/collide.cpp b/TR5Main/Game/collide.cpp index fb8feb200..94e10b0a8 100644 --- a/TR5Main/Game/collide.cpp +++ b/TR5Main/Game/collide.cpp @@ -75,15 +75,6 @@ int CollideStaticObjects(COLL_INFO* coll, int x, int y, int z, short roomNumber, int yMax = mesh->y + sInfo->collisionBox.Y2; short yRot = mesh->yRot; - std::array box{sInfo->collisionBox.X1, sInfo->collisionBox.Z1, sInfo->collisionBox.X2, sInfo->collisionBox.Z2}; - RotateBoundingBox(box, mesh->yRot); - - xMin = box[0]; - zMin = box[1]; - xMax = box[2]; - zMax = box[3]; - - if (yRot == ANGLE(180)) { xMin = mesh->x - sInfo->collisionBox.X2; @@ -2419,30 +2410,6 @@ Vector2 GetDiagonalIntersect(int xPos, int zPos, int splitType, int radius, shor return vect; } -void RotateBoundingBox(std::array& box, short angle) -{ - float s = sin(TO_RAD(angle)); - float c = cos(TO_RAD(angle)); - - std::array x, z; - x[0] = box[0] * c; - z[0] = -box[0] * s; - x[1] = box[1] * s; - z[1] = box[1] * c; - x[2] = box[2] * c; - z[2] = -box[2] * s; - x[3] = box[3] * s; - z[3] = box[3] * c; - - auto xPair = std::minmax_element(begin(x), end(x)); - auto zPair = std::minmax_element(begin(z), end(z)); - - box[0] = *xPair.first; - box[1] = *zPair.first; - box[2] = *xPair.second; - box[3] = *zPair.second; -} - Vector2 GetOrthogonalIntersect(int xPos, int zPos, int radius, short yRot) { Vector2 vect; diff --git a/TR5Main/Game/collide.h b/TR5Main/Game/collide.h index c4041c6bf..cc6784ec4 100644 --- a/TR5Main/Game/collide.h +++ b/TR5Main/Game/collide.h @@ -131,7 +131,6 @@ void LaraBaddieCollision(ITEM_INFO* item, COLL_INFO* coll); bool SnapToQuadrant(short& angle, int interval); int GetQuadrant(short angle); bool SnapToDiagonal(short& angle, int interval); -void RotateBoundingBox(std::array& box, short angle); // New function for rotating item along XZ slopes. // (int radiusDivide) is for radiusZ, else the MaxZ is too high and cause rotation problem ! // Dont need to set a value in radiusDivide if you dont need it (radiusDivide is set to 1 by default). diff --git a/TR5Main/Game/control.h b/TR5Main/Game/control.h index 7e5c9c8b7..a8bac23b8 100644 --- a/TR5Main/Game/control.h +++ b/TR5Main/Game/control.h @@ -45,18 +45,6 @@ enum HEADINGS WEST }; -enum OCTANTS -{ - O_NORTH, - O_NORTHEAST, - O_EAST, - O_SOUTHEAST, - O_SOUTH, - O_SOUTHWEST, - O_WEST, - O_NORTHWEST -}; - enum COMMAND_TYPES { COMMAND_NULL = 0,