diff options
| author | Socapex <philippe_groarke@yahoo.ca> | 2013-01-19 21:02:01 -0500 |
|---|---|---|
| committer | Socapex <philippe_groarke@yahoo.ca> | 2013-01-19 21:02:01 -0500 |
| commit | df606ace309acaf0c78f52e1f98eabed6c844ae2 (patch) | |
| tree | d9799b0e4a507d9eacbbafc1755eecea03f0b373 /src/net/eathena/generalhandler.cpp | |
| parent | d0169223b889a115b486e974e5b287c3ccb00d85 (diff) | |
| parent | 678d4e70999ade5a36862039875aa5564291d09d (diff) | |
| download | plus-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.gz plus-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.bz2 plus-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.xz plus-df606ace309acaf0c78f52e1f98eabed6c844ae2.zip | |
Merge remote-tracking branch 'upstream/master' into osx
Diffstat (limited to 'src/net/eathena/generalhandler.cpp')
| -rw-r--r-- | src/net/eathena/generalhandler.cpp | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index 91f567548..5ac27b5cc 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2012 The ManaPlus Developers + * Copyright (C) 2011-2013 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -255,31 +255,32 @@ void GeneralHandler::processEvent(Channels channel, // protection against double addition attributes. statusWindow->clearAttributes(); - statusWindow->addAttribute(STR, _("Strength"), true, ""); - statusWindow->addAttribute(AGI, _("Agility"), true, ""); - statusWindow->addAttribute(VIT, _("Vitality"), true, ""); - statusWindow->addAttribute(INT, _("Intelligence"), true, ""); - statusWindow->addAttribute(DEX, _("Dexterity"), true, ""); - statusWindow->addAttribute(LUK, _("Luck"), true, ""); - - statusWindow->addAttribute(ATK, _("Attack"), false, ""); - statusWindow->addAttribute(DEF, _("Defense"), false, ""); - statusWindow->addAttribute(MATK, _("M.Attack"), false, ""); - statusWindow->addAttribute(MDEF, _("M.Defense"), false, ""); + statusWindow->addAttribute(STR, _("Strength"), "str", true, ""); + statusWindow->addAttribute(AGI, _("Agility"), "agi", true, ""); + statusWindow->addAttribute(VIT, _("Vitality"), "vit", true, ""); + statusWindow->addAttribute(INT, _("Intelligence"), + "int", true, ""); + statusWindow->addAttribute(DEX, _("Dexterity"), "dex", true, ""); + statusWindow->addAttribute(LUK, _("Luck"), "luk", true, ""); + + statusWindow->addAttribute(ATK, _("Attack")); + statusWindow->addAttribute(DEF, _("Defense")); + statusWindow->addAttribute(MATK, _("M.Attack")); + statusWindow->addAttribute(MDEF, _("M.Defense")); // xgettext:no-c-format - statusWindow->addAttribute(HIT, _("% Accuracy"), false, ""); + statusWindow->addAttribute(HIT, _("% Accuracy")); // xgettext:no-c-format - statusWindow->addAttribute(FLEE, _("% Evade"), false, ""); + statusWindow->addAttribute(FLEE, _("% Evade")); // xgettext:no-c-format - statusWindow->addAttribute(CRIT, _("% Critical"), false, ""); + statusWindow->addAttribute(CRIT, _("% Critical")); statusWindow->addAttribute(PlayerInfo::ATTACK_DELAY, - _("Attack Delay"), false, ""); + _("Attack Delay")); statusWindow->addAttribute(PlayerInfo::WALK_SPEED, - _("Walk Delay"), false, ""); + _("Walk Delay")); statusWindow->addAttribute(PlayerInfo::ATTACK_RANGE, - _("Attack Range"), false, ""); + _("Attack Range")); statusWindow->addAttribute(PlayerInfo::ATTACK_SPEED, - _("Damage per sec."), false, ""); + _("Damage per sec.")); } else if (event.getName() == EVENT_GUIWINDOWSUNLOADING) { |