diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-02-08 14:40:04 -0700 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-02-08 14:43:51 -0700 |
| commit | 8a31e96d8534d402db9cd48183c0b15732f7d95e (patch) | |
| tree | 885d83febf301c1289c3bf7f83bf9dca89e0347c /src/net/manaserv/generalhandler.cpp | |
| parent | bc5c031e43eff506c925682349dd2a52b89d6565 (diff) | |
| download | mana-client-8a31e96d8534d402db9cd48183c0b15732f7d95e.tar.gz mana-client-8a31e96d8534d402db9cd48183c0b15732f7d95e.tar.bz2 mana-client-8a31e96d8534d402db9cd48183c0b15732f7d95e.tar.xz mana-client-8a31e96d8534d402db9cd48183c0b15732f7d95e.zip | |
Merge PartyWindow and GuildWindow into SocialWindow
Diffstat (limited to 'src/net/manaserv/generalhandler.cpp')
| -rw-r--r-- | src/net/manaserv/generalhandler.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp index de066aca..aa3b06f5 100644 --- a/src/net/manaserv/generalhandler.cpp +++ b/src/net/manaserv/generalhandler.cpp @@ -26,7 +26,6 @@ #include "gui/changeemaildialog.h" #include "gui/charselectdialog.h" #include "gui/inventorywindow.h" -#include "gui/partywindow.h" #include "gui/register.h" #include "gui/skilldialog.h" #include "gui/specialswindow.h" @@ -159,8 +158,7 @@ void GeneralHandler::flushNetwork() void GeneralHandler::guiWindowsLoaded() { inventoryWindow->setSplitAllowed(true); - partyWindow->clearPartyName(); - skillDialog->loadSkills("mana-skills.xml"); + skillDialog->loadSkills("tmw-skills.xml"); specialsWindow->loadSpecials("specials.xml"); player_node->setExpNeeded(100); |