diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game-server/being.cpp | 28 | ||||
| -rw-r--r-- | src/game-server/collisiondetection.cpp | 75 | ||||
| -rw-r--r-- | src/game-server/collisiondetection.hpp | 34 | ||||
| -rw-r--r-- | src/game-server/object.hpp | 16 |
4 files changed, 142 insertions, 11 deletions
diff --git a/src/game-server/being.cpp b/src/game-server/being.cpp index 516732aa..7f2ec2f4 100644 --- a/src/game-server/being.cpp +++ b/src/game-server/being.cpp @@ -21,9 +21,12 @@ */ #include "game-server/being.hpp" +#include "game-server/collisiondetection.hpp" #include "game-server/mapcomposite.hpp" #include "utils/logger.h" +#include <cmath> + void Being::damage(Damage damage) { int HPloss; @@ -38,6 +41,7 @@ void Being::damage(Damage damage) void Being::performAttack(MapComposite *map) { int SHORT_RANGE = 32; + float SMALL_ANGLE = M_PI_2; Point ppos = getPosition(); int dir = getDirection(); @@ -54,34 +58,40 @@ void Being::performAttack(MapComposite *map) } int type = o->getType(); - Point opos = o->getPosition(); - int dx = opos.x - ppos.x, dy = opos.y - ppos.y; - if ((type != OBJECT_PLAYER && type != OBJECT_MONSTER) || - (std::abs(dx) > SHORT_RANGE || std::abs(dy) > SHORT_RANGE)) + if (type != OBJECT_PLAYER && type != OBJECT_MONSTER) { continue; } + Point opos = o->getPosition(); + + float attackAngle = 0.0f; // basic triangle-shaped damage zone switch (dir) { case DIRECTION_UP: - if (!(dy <= dx && dx <= -dy)) continue; + attackAngle = M_PI_2; break; case DIRECTION_DOWN: - if (!(-dy <= dx && dx <= dy)) continue; + attackAngle = - M_PI_2; break; case DIRECTION_LEFT: - if (!(dx <= dy && dy <= -dx)) continue; + attackAngle = M_PI; break; case DIRECTION_RIGHT: - if (!(-dx <= dy && dy <= dx)) continue; + attackAngle = 0.0f; break; default: break; } - static_cast< Being * >(o)->damage(damage); + if (Collision::circleWithCirclesector( + opos, o->getSize(), + ppos, SHORT_RANGE, attackAngle, SMALL_ANGLE) + ) + { + static_cast< Being * >(o)->damage(damage); + } } } diff --git a/src/game-server/collisiondetection.cpp b/src/game-server/collisiondetection.cpp new file mode 100644 index 00000000..907129ad --- /dev/null +++ b/src/game-server/collisiondetection.cpp @@ -0,0 +1,75 @@ +/*
+ * The Mana World Server
+ * Copyright 2004 The Mana World Development Team
+ *
+ * This file is part of The Mana World.
+ *
+ * The Mana World is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or any later version.
+ *
+ * The Mana World is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with The Mana World; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id: being.cpp 3010 2007-01-05 20:12:51Z gmelquio $
+ */
+
+#include "collisiondetection.hpp"
+
+#include "point.h"
+
+#include <cmath>
+
+bool
+Collision::circleWithCirclesector( const Point& circlePos, int circleRadius,
+ const Point& secPos, int secRadius, float secAngle, float secSize)
+{
+ float targetAngle;
+
+ //calculate distance
+ int distX = circlePos.x - secPos.x;
+ int distY = circlePos.y - secPos.y;
+ float dist = sqrt(distX * distX + distY * distY);
+
+ //if out of range we can't hit it
+ if (dist > secRadius + circleRadius) {
+ return false;
+ }
+ //if we are standing in it we hit it in any case
+ if (dist < circleRadius) {
+ return true;
+ }
+
+ //calculate target angle
+ if (distX > 0)
+ {
+ targetAngle = asin(-distY / dist);
+ } else {
+ if (distY < 0)
+ {
+ targetAngle = M_PI - asin(-distY / dist);
+ } else {
+ targetAngle = -M_PI - asin(-distY / dist);
+ }
+
+ }
+
+ //calculate difference from segment angle
+ float targetDiff = fabs(targetAngle - secAngle);
+ if (targetDiff > M_PI)
+ {
+ targetDiff = fabs(targetDiff - M_PI * 2);
+ }
+
+
+ //Add hit circle
+ secSize += asin(circleRadius/dist) * 2;
+
+ return (targetDiff < secSize / 2.0f);
+}
diff --git a/src/game-server/collisiondetection.hpp b/src/game-server/collisiondetection.hpp new file mode 100644 index 00000000..9f5c0fa4 --- /dev/null +++ b/src/game-server/collisiondetection.hpp @@ -0,0 +1,34 @@ +/*
+ * The Mana World Server
+ * Copyright 2004 The Mana World Development Team
+ *
+ * This file is part of The Mana World.
+ *
+ * The Mana World is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or any later version.
+ *
+ * The Mana World is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * 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 $
+ */
+
+class Point;
+
+/**
+ * This namespace collects all collision detection functions we need
+ */
+namespace Collision
+{
+
+ bool
+ circleWithCirclesector( const Point &circlePos, int circleRadius,
+ const Point &secPos, int secRadius, float secAngle, float secSize);
+};
diff --git a/src/game-server/object.hpp b/src/game-server/object.hpp index 47d9a7d0..e0443f93 100644 --- a/src/game-server/object.hpp +++ b/src/game-server/object.hpp @@ -207,7 +207,7 @@ class MovingObject: public Object { return mOld; } /** - * Sete object direction + * Sets object direction */ void setDirection(int direction) { mDirection = direction; } @@ -215,7 +215,6 @@ class MovingObject: public Object /** * Gets object direction */ - unsigned char getDirection() const { return mDirection; } @@ -226,6 +225,18 @@ class MovingObject: public Object { mSpeed = s; } /** + * Sets object bounding circle radius + */ + void setSize(unsigned s) + { mSize = s; } + + /** + * Gets object bounding circle radius + */ + unsigned getSize() + { return mSize; } + + /** * Moves the object toward its destination. */ void move(); @@ -250,6 +261,7 @@ class MovingObject: public Object Point mDst; /**< target coordinates */ Point mOld; /**< old coordinates */ unsigned short mSpeed; /**< speed */ + unsigned mSize; /**< radius of bounding circle */ std::list<PATH_NODE> mPath; protected: |