diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-06-30 15:08:36 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-06-30 15:08:36 +0300 |
| commit | 98db053ae7fa09a8b209dca95e4e65d00320cc0b (patch) | |
| tree | b57a5aaa669a20f0e43f4be698ef3204ed56c0fb /src/net | |
| parent | 3589bb9fa0800650accc124ea6820d5834c27e43 (diff) | |
| download | plus-98db053ae7fa09a8b209dca95e4e65d00320cc0b.tar.gz plus-98db053ae7fa09a8b209dca95e4e65d00320cc0b.tar.bz2 plus-98db053ae7fa09a8b209dca95e4e65d00320cc0b.tar.xz plus-98db053ae7fa09a8b209dca95e4e65d00320cc0b.zip | |
Move extended stats from status window into stats.xml too.s20160630
Also add reports about failed stats loading.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/eathena/generalhandler.cpp | 35 | ||||
| -rw-r--r-- | src/net/tmwa/generalhandler.cpp | 31 |
2 files changed, 2 insertions, 64 deletions
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index 029b7123a..1a0353dfa 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -197,40 +197,7 @@ void GeneralHandler::gameStarted() const if (!statusWindow) return; - // protection against double addition attributes. - statusWindow->clearAttributes(); - - statusWindow->addBasicAttributes(); - - // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::ATK, _("Attack")); - // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::DEF, _("Defense")); - // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::MATK, _("M.Attack")); - // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::MDEF, _("M.Defense")); - // TRANSLATORS: player stat - // xgettext:no-c-format - statusWindow->addAttribute(Attributes::HIT, _("% Accuracy")); - // TRANSLATORS: player stat - // xgettext:no-c-format - statusWindow->addAttribute(Attributes::FLEE, _("% Evade")); - // TRANSLATORS: player stat - // xgettext:no-c-format - statusWindow->addAttribute(Attributes::CRIT, _("% Critical")); - // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::ATTACK_DELAY, _("Attack Delay")); - // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::WALK_SPEED, _("Walk Delay")); - // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::ATTACK_RANGE, _("Attack Range")); - // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::ATTACK_SPEED, _("Damage per sec.")); - // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::KARMA, _("Karma")); - // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::MANNER, _("Manner")); + statusWindow->addAttributes(); } void GeneralHandler::gameEnded() const diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index f7515de02..a48f05cec 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -208,36 +208,7 @@ void GeneralHandler::gameStarted() const if (!statusWindow) return; - // protection against double addition attributes. - statusWindow->clearAttributes(); - - statusWindow->addBasicAttributes(); - - // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::ATK, _("Attack")); - // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::DEF, _("Defense")); - // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::MATK, _("M.Attack")); - // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::MDEF, _("M.Defense")); - // TRANSLATORS: player stat - // xgettext:no-c-format - statusWindow->addAttribute(Attributes::HIT, _("% Accuracy")); - // TRANSLATORS: player stat - // xgettext:no-c-format - statusWindow->addAttribute(Attributes::FLEE, _("% Evade")); - // TRANSLATORS: player stat - // xgettext:no-c-format - statusWindow->addAttribute(Attributes::CRIT, _("% Critical")); - // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::ATTACK_DELAY, _("Attack Delay")); - // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::WALK_SPEED, _("Walk Delay")); - // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::ATTACK_RANGE, _("Attack Range")); - // TRANSLATORS: player stat - statusWindow->addAttribute(Attributes::ATTACK_SPEED, _("Damage per sec.")); + statusWindow->addAttributes(); } void GeneralHandler::gameEnded() const |