diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-04 20:05:48 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-04 20:05:48 +0300 |
| commit | 62ec17f6e489ec50f17219444468aeb8969dc961 (patch) | |
| tree | 350d7edb5c26c282a4e1906544536d68831228ac /src/net/tmwa/generalhandler.cpp | |
| parent | 71d924d7dcdac067f02a317e9353ee067dbd0bde (diff) | |
| parent | fd484fc70fca32ff9065b91c175089b65aa3fd26 (diff) | |
| download | plus-stripped1.1.9.4.tar.gz plus-stripped1.1.9.4.tar.bz2 plus-stripped1.1.9.4.tar.xz plus-stripped1.1.9.4.zip | |
Merge branch 'master' into strippedstripped1.1.9.4
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/guichan/basiccontainer.cpp
src/guichan/include/guichan/basiccontainer.hpp
src/guichan/widgets/window.cpp
Diffstat (limited to 'src/net/tmwa/generalhandler.cpp')
| -rw-r--r-- | src/net/tmwa/generalhandler.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 746cb6620..e1b565399 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -67,7 +67,6 @@ #include "utils/gettext.h" -#include <assert.h> #include <list> #include "debug.h" @@ -273,12 +272,14 @@ void GeneralHandler::event(Mana::Channels channel, statusWindow->addAttribute(FLEE, _("% Evade"), false, ""); // xgettext:no-c-format statusWindow->addAttribute(CRIT, _("% Critical"), false, ""); - statusWindow->addAttribute(ATTACK_SPEED, _("Attack Delay"), + statusWindow->addAttribute(ATTACK_DELAY, _("Attack Delay"), false, ""); statusWindow->addAttribute(WALK_SPEED, _("Walk Delay"), false, ""); statusWindow->addAttribute(ATTACK_RANGE, _("Attack Range"), false, ""); + statusWindow->addAttribute(ATTACK_SPEED, _("Damage per sec."), + false, ""); } else if (event.getName() == Mana::EVENT_GUIWINDOWSUNLOADING) { |