diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-05-02 23:13:47 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-05-02 23:13:47 +0300 |
| commit | 010fe80b3e44cee70422a1f19367f7630fd8a7ab (patch) | |
| tree | 20ce8607e8ce929a2491b928011d1989a760fd8a /src | |
| parent | 217859342d7ffdab90ca0f409bffb7e2511a2173 (diff) | |
| download | manaplus-010fe80b3e44cee70422a1f19367f7630fd8a7ab.tar.gz manaplus-010fe80b3e44cee70422a1f19367f7630fd8a7ab.tar.bz2 manaplus-010fe80b3e44cee70422a1f19367f7630fd8a7ab.tar.xz manaplus-010fe80b3e44cee70422a1f19367f7630fd8a7ab.zip | |
Fix reading attack delay.
Diffstat (limited to 'src')
| -rw-r--r-- | src/being.cpp | 1 | ||||
| -rw-r--r-- | src/gui/debugwindow.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/beinghandler.cpp | 14 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/being.cpp b/src/being.cpp index eae4ebd66..2ea399aae 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -206,6 +206,7 @@ Being::Being(int id, Type type, Uint16 subtype, Map *map): mErased(false), mEnemy(false), mIp(""), + mAttackDelay(0), mPvpRank(0) { mSpriteRemap = new int[20]; diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp index cf52950c3..e9c79a890 100644 --- a/src/gui/debugwindow.cpp +++ b/src/gui/debugwindow.cpp @@ -291,7 +291,7 @@ void TargetDebugTab::logic() const int delay = target->getAttackDelay(); if (delay) { - mAttackDelayLabel = new Label(strprintf("%s %d", + mAttackDelayLabel->setCaption(strprintf("%s %d", _("Attack delay:"), delay)); } else diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 7474eb66c..402a3e7eb 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -486,14 +486,14 @@ void BeingHandler::handleMessage(Net::MessageIn &msg) if (dstBeing) { // Perhaps a new skill attack type should be created and used? - if (dstSpeed) - dstBeing->setAttackDelay(dstSpeed); +// if (dstSpeed) +// dstBeing->setAttackDelay(dstSpeed); dstBeing->takeDamage(srcBeing, param1, Being::HIT); } if (srcBeing) { - if (srcSpeed) - srcBeing->setAttackDelay(srcSpeed); +// if (srcSpeed) +// srcBeing->setAttackDelay(srcSpeed); srcBeing->handleAttack(dstBeing, param1, Being::HIT); } break; @@ -520,14 +520,14 @@ void BeingHandler::handleMessage(Net::MessageIn &msg) case Being::FLEE: // Lucky Dodge if (dstBeing) { - if (dstSpeed) - dstBeing->setAttackDelay(dstSpeed); +// if (dstSpeed) +// dstBeing->setAttackDelay(dstSpeed); dstBeing->takeDamage(srcBeing, param1, static_cast<Being::AttackType>(type)); } if (srcBeing) { - if (srcSpeed) + if (srcSpeed && srcBeing->getType() == Being::PLAYER) srcBeing->setAttackDelay(srcSpeed); srcBeing->handleAttack(dstBeing, param1, static_cast<Being::AttackType>(type)); |