diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-08-16 18:25:55 +0200 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-08-16 18:25:55 +0200 |
| commit | 4263962e947b4914de8d1750f21cc7cc82567b4d (patch) | |
| tree | 32340098913c302fdb33f88ffea65fb36920db75 /src/net/tmwserv/generalhandler.cpp | |
| parent | dd0844b6ac01293e7afd0dd85e695b8d77b8e4be (diff) | |
| parent | 7e2673a3b9460fdcd646e23c3bd9039de854565f (diff) | |
| download | mana-4263962e947b4914de8d1750f21cc7cc82567b4d.tar.gz mana-4263962e947b4914de8d1750f21cc7cc82567b4d.tar.bz2 mana-4263962e947b4914de8d1750f21cc7cc82567b4d.tar.xz mana-4263962e947b4914de8d1750f21cc7cc82567b4d.zip | |
More merges and conflict resolves
Diffstat (limited to 'src/net/tmwserv/generalhandler.cpp')
| -rw-r--r-- | src/net/tmwserv/generalhandler.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/net/tmwserv/generalhandler.cpp b/src/net/tmwserv/generalhandler.cpp index d643586b..011433fe 100644 --- a/src/net/tmwserv/generalhandler.cpp +++ b/src/net/tmwserv/generalhandler.cpp @@ -22,6 +22,7 @@ #include "gui/inventorywindow.h" #include "gui/partywindow.h" #include "gui/skilldialog.h" +#include "gui/specialswindow.h" #include "gui/statuswindow.h" #include "net/tmwserv/generalhandler.h" @@ -43,6 +44,7 @@ #include "net/tmwserv/npchandler.h" #include "net/tmwserv/partyhandler.h" #include "net/tmwserv/playerhandler.h" +#include "net/tmwserv/specialhandler.h" #include "net/tmwserv/tradehandler.h" #include "utils/gettext.h" @@ -72,7 +74,8 @@ GeneralHandler::GeneralHandler(): mNpcHandler(new NpcHandler), mPartyHandler(new PartyHandler), mPlayerHandler(new PlayerHandler), - mTradeHandler(new TradeHandler) + mTradeHandler(new TradeHandler), + mSpecialHandler(new SpecialHandler) { accountServerConnection = Net::getConnection(); gameServerConnection = Net::getConnection(); @@ -149,6 +152,7 @@ void GeneralHandler::guiWindowsLoaded() inventoryWindow->setSplitAllowed(true); partyWindow->clearPartyName(); skillDialog->loadSkills("tmw-skills.xml"); + specialsWindow->loadSpecials("specials.xml"); player_node->setExpNeeded(100); |