summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-07-21 20:19:25 -0600
committerJared Adams <jaxad0127@gmail.com>2009-07-21 20:21:55 -0600
commit4cc7305cfa08598398123641987cf1fdf2bd7616 (patch)
treecdf406f0c943201e98a9787fbe1a1f760bb0e22f /src/game.cpp
parentce3d5a56de1309298603c9ce3b95659829f870ef (diff)
downloadmana-4cc7305cfa08598398123641987cf1fdf2bd7616.tar.gz
mana-4cc7305cfa08598398123641987cf1fdf2bd7616.tar.bz2
mana-4cc7305cfa08598398123641987cf1fdf2bd7616.tar.xz
mana-4cc7305cfa08598398123641987cf1fdf2bd7616.zip
Merge equipment handling and fix some bugs
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp
index c7a1d4e7..e712bbb8 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -214,13 +214,12 @@ static void createGuiWindows()
partyWindow = new PartyWindow;
#ifdef TMWSERV_SUPPORT
magicDialog = new MagicDialog;
- equipmentWindow = new EquipmentWindow(player_node->mEquipment.get());
buddyWindow = new BuddyWindow;
guildWindow = new GuildWindow;
#else
buySellDialog = new BuySellDialog;
- equipmentWindow = new EquipmentWindow;
#endif
+ equipmentWindow = new EquipmentWindow(player_node->mEquipment.get());
npcDialog = new NpcDialog;
npcPostDialog = new NpcPostDialog;
storageWindow = new StorageWindow;