summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-29 21:56:30 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-30 00:03:20 +0300
commitd0a72be7362cfad41187b6e9544ac44802a66ebd (patch)
tree76ca7130307a6f9b9b648ffd019fe0bba5cfda67 /src/net
parente2c1b87e38e5c921912b334ca971e92b7989f8a8 (diff)
downloadmanaplus-d0a72be7362cfad41187b6e9544ac44802a66ebd.tar.gz
manaplus-d0a72be7362cfad41187b6e9544ac44802a66ebd.tar.bz2
manaplus-d0a72be7362cfad41187b6e9544ac44802a66ebd.tar.xz
manaplus-d0a72be7362cfad41187b6e9544ac44802a66ebd.zip
Remove basic attributes usage from generalhandler and move to statuswindow and statdb.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/eathena/generalhandler.cpp19
-rw-r--r--src/net/tmwa/generalhandler.cpp20
2 files changed, 3 insertions, 36 deletions
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp
index fb78e800f..029b7123a 100644
--- a/src/net/eathena/generalhandler.cpp
+++ b/src/net/eathena/generalhandler.cpp
@@ -200,24 +200,7 @@ void GeneralHandler::gameStarted() const
// protection against double addition attributes.
statusWindow->clearAttributes();
- statusWindow->addAttribute(Attributes::STR,
- // TRANSLATORS: player stat
- _("Strength"), "str", Modifiable_true);
- statusWindow->addAttribute(Attributes::AGI,
- // TRANSLATORS: player stat
- _("Agility"), "agi", Modifiable_true);
- statusWindow->addAttribute(Attributes::VIT,
- // TRANSLATORS: player stat
- _("Vitality"), "vit", Modifiable_true);
- statusWindow->addAttribute(Attributes::INT,
- // TRANSLATORS: player stat
- _("Intelligence"), "int", Modifiable_true);
- statusWindow->addAttribute(Attributes::DEX,
- // TRANSLATORS: player stat
- _("Dexterity"), "dex", Modifiable_true);
- statusWindow->addAttribute(Attributes::LUK,
- // TRANSLATORS: player stat
- _("Luck"), "luk", Modifiable_true);
+ statusWindow->addBasicAttributes();
// TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::ATK, _("Attack"));
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 390c2d021..f7515de02 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -211,24 +211,8 @@ void GeneralHandler::gameStarted() const
// protection against double addition attributes.
statusWindow->clearAttributes();
- statusWindow->addAttribute(Attributes::STR,
- // TRANSLATORS: player stat
- _("Strength"), "str", Modifiable_true);
- statusWindow->addAttribute(Attributes::AGI,
- // TRANSLATORS: player stat
- _("Agility"), "agi", Modifiable_true);
- statusWindow->addAttribute(Attributes::VIT,
- // TRANSLATORS: player stat
- _("Vitality"), "vit", Modifiable_true);
- statusWindow->addAttribute(Attributes::INT,
- // TRANSLATORS: player stat
- _("Intelligence"), "int", Modifiable_true);
- statusWindow->addAttribute(Attributes::DEX,
- // TRANSLATORS: player stat
- _("Dexterity"), "dex", Modifiable_true);
- statusWindow->addAttribute(Attributes::LUK,
- // TRANSLATORS: player stat
- _("Luck"), "luk", Modifiable_true);
+ statusWindow->addBasicAttributes();
+
// TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::ATK, _("Attack"));
// TRANSLATORS: player stat