summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-08-19 02:41:30 +0200
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-08-19 02:41:30 +0200
commit011135415f7f9c5cfeb220540621dfd1c46e6db9 (patch)
tree55dd2943dca362045e7ed96ef72924728343351e /src/game.cpp
parentc392eab58774154177a0e790a414c2c52c8ce83b (diff)
parent27114fa2694318f2a1c56cb828a3b79731efcb74 (diff)
downloadmana-011135415f7f9c5cfeb220540621dfd1c46e6db9.tar.gz
mana-011135415f7f9c5cfeb220540621dfd1c46e6db9.tar.bz2
mana-011135415f7f9c5cfeb220540621dfd1c46e6db9.tar.xz
mana-011135415f7f9c5cfeb220540621dfd1c46e6db9.zip
Merge git://gitorious.org/~bertram/mana/mana-equipment-fix into equipment-fix
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 1e4c4076..813253ce 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -153,15 +153,7 @@ static void createGuiWindows()
minimap = new Minimap;
chatWindow = new ChatWindow;
tradeWindow = new TradeWindow;
- switch (Net::getNetworkType())
- {
- case ServerInfo::TMWATHENA:
- case ServerInfo::MANASERV:
- default:
- equipmentWindow =
- new TmwAthena::TaEquipmentWindow(PlayerInfo::getEquipment());
- break;
- }
+ equipmentWindow = new EquipmentWindow(PlayerInfo::getEquipment());
statusWindow = new StatusWindow;
inventoryWindow = new InventoryWindow(PlayerInfo::getInventory());
skillDialog = new SkillDialog;