summaryrefslogtreecommitdiff
path: root/src/game-server/being.cpp
diff options
context:
space:
mode:
authorRoderic Morris <roderic@ccs.neu.edu>2008-10-29 16:33:29 +0000
committerRoderic Morris <roderic@ccs.neu.edu>2008-10-29 16:33:29 +0000
commitdf8c5ed43b5513916eff1b3f25e0bba6a50c8826 (patch)
treec1731c3684781d305a6ae3b9711a4c77a27637b2 /src/game-server/being.cpp
parent3597666677ef714071da9d3ab663e9b8f7b6219e (diff)
downloadmanaserv-df8c5ed43b5513916eff1b3f25e0bba6a50c8826.tar.gz
manaserv-df8c5ed43b5513916eff1b3f25e0bba6a50c8826.tar.bz2
manaserv-df8c5ed43b5513916eff1b3f25e0bba6a50c8826.tar.xz
manaserv-df8c5ed43b5513916eff1b3f25e0bba6a50c8826.zip
replace collision detection function (by Chuck Miller)
Diffstat (limited to 'src/game-server/being.cpp')
-rw-r--r--src/game-server/being.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/game-server/being.cpp b/src/game-server/being.cpp
index 130f1a75..c9bec84c 100644
--- a/src/game-server/being.cpp
+++ b/src/game-server/being.cpp
@@ -144,10 +144,10 @@ void Being::performAttack(Damage const &damage, AttackZone const *attackZone)
attackAngle = 270;
break;
case DIRECTION_LEFT:
- attackAngle = 180;
+ attackAngle = 0;
break;
case DIRECTION_RIGHT:
- attackAngle = 0;
+ attackAngle = 180;
break;
default:
break;
@@ -161,7 +161,6 @@ void Being::performAttack(Damage const &damage, AttackZone const *attackZone)
MovingObject *o = *i;
Point opos = o->getPosition();
- Effects::show(Effects::FIRE_BURST,getMap(),opos);
if (o == this) continue;
int type = o->getType();
@@ -176,7 +175,7 @@ void Being::performAttack(Damage const &damage, AttackZone const *attackZone)
if (Collision::diskWithCircleSector(
opos, o->getSize(),
ppos, attackZone->range,
- attackZone->angle, attackAngle)
+ attackZone->angle / 2, attackAngle)
)
{
victims.push_back(static_cast< Being * >(o));