diff options
author | David Athay <ko2fan@gmail.com> | 2011-11-16 17:21:58 -0600 |
---|---|---|
committer | David Athay <ko2fan@gmail.com> | 2011-11-16 17:21:58 -0600 |
commit | b72dd300ab1a315f893facf8a302fa7c9dd00720 (patch) | |
tree | bd736d314375d7d3e0852f3ca2d2e8a5e8114aec /src/net/manaserv/generalhandler.cpp | |
parent | 701a8d8bf4fe2d286c2ffa39efa8b80e6c85ff01 (diff) | |
parent | b9bf0acfe46222508c9910c2a2b750feafb5a0d2 (diff) | |
download | mana-b72dd300ab1a315f893facf8a302fa7c9dd00720.tar.gz mana-b72dd300ab1a315f893facf8a302fa7c9dd00720.tar.bz2 mana-b72dd300ab1a315f893facf8a302fa7c9dd00720.tar.xz mana-b72dd300ab1a315f893facf8a302fa7c9dd00720.zip |
Merge branch '0.5' of git://gitorious.org/mana/mana into 0.5
Diffstat (limited to 'src/net/manaserv/generalhandler.cpp')
-rw-r--r-- | src/net/manaserv/generalhandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp index 0d3073f1..4f6ade4e 100644 --- a/src/net/manaserv/generalhandler.cpp +++ b/src/net/manaserv/generalhandler.cpp @@ -166,7 +166,7 @@ void GeneralHandler::flushNetwork() void GeneralHandler::guiWindowsLoaded() { inventoryWindow->setSplitAllowed(true); - skillDialog->loadSkills("mana-skills.xml"); + skillDialog->loadSkills(); specialsWindow->loadSpecials("specials.xml"); player_node->setExpNeeded(100); |