diff options
author | Philipp Sehmisch <tmw@crushnet.org> | 2008-09-27 03:55:19 +0000 |
---|---|---|
committer | Philipp Sehmisch <tmw@crushnet.org> | 2008-09-27 03:55:19 +0000 |
commit | 29ae6d3f42ac55e7bc8c5ad0b044c7b0e662d358 (patch) | |
tree | 41ca7bb0f8b557e096a2b783f6c94ea4d3e5006a /src/game-server/monster.cpp | |
parent | c27d73abc52bdc463a029a5f6a95e1db5df5abf6 (diff) | |
download | manaserv-29ae6d3f42ac55e7bc8c5ad0b044c7b0e662d358.tar.gz manaserv-29ae6d3f42ac55e7bc8c5ad0b044c7b0e662d358.tar.bz2 manaserv-29ae6d3f42ac55e7bc8c5ad0b044c7b0e662d358.tar.xz manaserv-29ae6d3f42ac55e7bc8c5ad0b044c7b0e662d358.zip |
Implemented getting the attack zone of weapons from the item database and implemented single target attacks useful for projectile weapons like bows.
Diffstat (limited to 'src/game-server/monster.cpp')
-rw-r--r-- | src/game-server/monster.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game-server/monster.cpp b/src/game-server/monster.cpp index d782eae0..f9cb1794 100644 --- a/src/game-server/monster.cpp +++ b/src/game-server/monster.cpp @@ -125,7 +125,7 @@ void Monster::perform() damage.element = mCurrentAttack->element; damage.type = mCurrentAttack->type; damage.usedSkill = 0; - performAttack(damage, mCurrentAttack->range, mCurrentAttack->angle); + performAttack(damage, &mCurrentAttack->attackZone); } if (!mAttackTime) { @@ -240,7 +240,7 @@ void Monster::update() } if (Collision::diskWithCircleSector( bestAttackTarget->getPosition(), bestAttackTarget->getSize(), - getPosition(), (*i)->range, (*i)->angle, attackAngle)) + getPosition(), (*i)->attackZone.range, (*i)->attackZone.angle, attackAngle)) { prioritySum += (*i)->priority; workingAttacks[prioritySum] = (*i); |