Implemented an alternate collision-detection function, added namespace utils::math.

1 files changed, 23 insertions, 4 deletions

diff --git a/src/game-server/collisiondetection.hpp b/src/game-server/collisiondetection.hpp
index 9f5c0fa4..88631031 100644
--- a/src/game-server/collisiondetection.hpp
+++ b/src/game-server/collisiondetection.hpp
@@ -17,18 +17,37 @@
  *  with The Mana  World; if not, write to the  Free Software Foundation, Inc.,

  *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

  *

- *  $Id: object.hpp 3098 2007-02-01 20:12:27Z b_lindeijer $

+ *  $Id: $

  */

 

+#ifndef _TMW_COLLISIONDETECTION_H

+#define _TMW_COLLISIONDETECTION_H

+

 class Point;

 

 /**

- * This namespace collects all collision detection functions we need

+ * This namespace collects all needed collision detection functions

  */

 namespace Collision

 {

 

     bool

-    circleWithCirclesector( const Point &circlePos, int circleRadius,

-                            const Point &secPos, int secRadius, float secAngle, float secSize);

+    circleWithCirclesector(const Point &circlePos, int circleRadius,

+                           const Point &secPos, int secRadius,

+                           float secAngle, float secSize);

+    /**

+     * Checks if a disk and a circle-sector collide

+     *

+     * @param halfTopAngle

+     *        The half-top-angle of the circle sector in degrees (0,359).

+     * @param placeAngle

+     *        The placement-angle of the circle sector in degrees (0,359).

+     */

+    bool

+    diskWithCircleSector(const Point &diskCenter, int diskRadius,

+                         const Point &sectorCenter, int sectorRadius,

+                         int halfTopAngle, int placeAngle);

+

 };

+

+#endif