summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/BoundingBox.cpp21
-rw-r--r--src/BoundingBox.h5
2 files changed, 3 insertions, 23 deletions
diff --git a/src/BoundingBox.cpp b/src/BoundingBox.cpp
index bc4926011..48ed42789 100644
--- a/src/BoundingBox.cpp
+++ b/src/BoundingBox.cpp
@@ -59,27 +59,6 @@ cBoundingBox::cBoundingBox(Vector3d a_Pos, double a_CubeLength) :
-cBoundingBox::cBoundingBox(const cBoundingBox & a_Orig) :
- m_Min(a_Orig.m_Min),
- m_Max(a_Orig.m_Max)
-{
-}
-
-
-
-
-
-cBoundingBox & cBoundingBox::operator=(const cBoundingBox & a_Other)
-{
- m_Min = a_Other.m_Min;
- m_Max = a_Other.m_Max;
- return *this;
-}
-
-
-
-
-
void cBoundingBox::Move(double a_OffX, double a_OffY, double a_OffZ)
{
m_Min.x += a_OffX;
diff --git a/src/BoundingBox.h b/src/BoundingBox.h
index c71c42d1a..e62711658 100644
--- a/src/BoundingBox.h
+++ b/src/BoundingBox.h
@@ -31,9 +31,10 @@ public:
For example: cBoundingBox([0, 0, 0], 6, 6, -3) would create a bounding cube from (-3, -3, -3) to (3, 3, 3). */
cBoundingBox(Vector3d a_Pos, double a_Radius, double a_Height, double a_VerticalOffset);
cBoundingBox(Vector3d a_Pos, double a_CubeLength);
- cBoundingBox(const cBoundingBox & a_Orig);
- cBoundingBox & operator=(const cBoundingBox & a_Other);
+ #ifdef TOLUA_EXPOSITION // tolua isn't aware of implicitly generated copy constructors
+ cBoundingBox(const cBoundingBox & a_Orig);
+ #endif
/** Moves the entire boundingbox by the specified offset */
void Move(double a_OffX, double a_OffY, double a_OffZ);