diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-07-19 22:05:41 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-07-19 22:30:18 -0600 |
| commit | 5141dc4a99b74358f2dd0f5f211c5069a630ce1b (patch) | |
| tree | 647cfb05d179d61759ef3679482eb204a7853d34 /src/net/ea/generalhandler.cpp | |
| parent | 2e8fca7d471b4e2bf20735a0669e96722c000669 (diff) | |
| download | mana-5141dc4a99b74358f2dd0f5f211c5069a630ce1b.tar.gz mana-5141dc4a99b74358f2dd0f5f211c5069a630ce1b.tar.bz2 mana-5141dc4a99b74358f2dd0f5f211c5069a630ce1b.tar.xz mana-5141dc4a99b74358f2dd0f5f211c5069a630ce1b.zip | |
Merge StatusWindows
Also some other small merges
Diffstat (limited to 'src/net/ea/generalhandler.cpp')
| -rw-r--r-- | src/net/ea/generalhandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/net/ea/generalhandler.cpp b/src/net/ea/generalhandler.cpp index bbadd44f..06481824 100644 --- a/src/net/ea/generalhandler.cpp +++ b/src/net/ea/generalhandler.cpp @@ -23,7 +23,7 @@ #include "gui/inventorywindow.h" #include "gui/skilldialog.h" -#include "gui/status.h" +#include "gui/statuswindow.h" #include "net/ea/network.h" #include "net/ea/protocol.h" @@ -205,7 +205,7 @@ void GeneralHandler::guiWindowsLoaded() inventoryWindow->setSplitAllowed(false); skillDialog->loadSkills("ea-skills.xml"); - /*statusWindow->addAttribute(STR, _("Strength"), true); + statusWindow->addAttribute(STR, _("Strength"), true); statusWindow->addAttribute(AGI, _("Agility"), true); statusWindow->addAttribute(VIT, _("Vitality"), true); statusWindow->addAttribute(INT, _("Intelligence"), true); @@ -217,7 +217,7 @@ void GeneralHandler::guiWindowsLoaded() statusWindow->addAttribute(MATK, _("M.Attack"), false); statusWindow->addAttribute(MDEF, _("M.Defense"), false); statusWindow->addAttribute(HIT, _("% Accuracy"), false); - statusWindow->addAttribute(FLEE, _("% Evade"), false);*/ + statusWindow->addAttribute(FLEE, _("% Evade"), false); } void GeneralHandler::guiWindowsUnloaded() |