summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-11-26 23:25:35 -0700
committerJared Adams <jaxad0127@gmail.com>2009-11-26 23:25:35 -0700
commit62d86f1c84678e04e7015a8f2440f0c251887c21 (patch)
tree5f79a8c7c733241dbfe0b325923629ddcd2026d1 /src/game.cpp
parentedf478e1eb7987e35d56df2777fbeb389dc915ec (diff)
downloadmana-client-62d86f1c84678e04e7015a8f2440f0c251887c21.tar.gz
mana-client-62d86f1c84678e04e7015a8f2440f0c251887c21.tar.bz2
mana-client-62d86f1c84678e04e7015a8f2440f0c251887c21.tar.xz
mana-client-62d86f1c84678e04e7015a8f2440f0c251887c21.zip
Merge a little more and remove the BuddyWindow
The BuddyWindow was only half implemented and would have been made redundant with the planned social window.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp20
1 files changed, 0 insertions, 20 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 33833772..49c0b34c 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -68,10 +68,7 @@
#include "gui/viewport.h"
#include "gui/windowmenu.h"
#include "gui/partywindow.h"
-#ifdef MANASERV_SUPPORT
-#include "gui/buddywindow.h"
#include "gui/guildwindow.h"
-#endif
#include "gui/npcpostdialog.h"
#include "gui/quitdialog.h"
#include "gui/specialswindow.h"
@@ -110,16 +107,11 @@ StatusWindow *statusWindow;
MiniStatusWindow *miniStatusWindow;
BuyDialog *buyDialog;
SellDialog *sellDialog;
-#ifdef EATHENA_SUPPORT
BuySellDialog *buySellDialog;
-#endif
InventoryWindow *inventoryWindow;
SkillDialog *skillDialog;
PartyWindow *partyWindow;
-#ifdef MANASERV_SUPPORT
-BuddyWindow *buddyWindow;
GuildWindow *guildWindow;
-#endif
NpcDialog *npcDialog;
NpcPostDialog *npcPostDialog;
StorageWindow *storageWindow;
@@ -236,12 +228,8 @@ static void createGuiWindows()
sellDialog = new SellDialog;
tradeWindow = new TradeWindow;
partyWindow = new PartyWindow;
-#ifdef MANASERV_SUPPORT
- buddyWindow = new BuddyWindow;
guildWindow = new GuildWindow;
-#else
buySellDialog = new BuySellDialog;
-#endif
equipmentWindow = new EquipmentWindow(player_node->mEquipment.get());
npcDialog = new NpcDialog;
npcPostDialog = new NpcPostDialog;
@@ -285,17 +273,12 @@ static void destroyGuiWindows()
del_0(miniStatusWindow);
del_0(buyDialog);
del_0(sellDialog);
-#ifdef EATHENA_SUPPORT
del_0(buySellDialog);
-#endif
del_0(inventoryWindow);
del_0(partyWindow);
del_0(npcDialog);
del_0(npcPostDialog);
-#ifdef MANASERV_SUPPORT
- del_0(buddyWindow);
del_0(guildWindow);
-#endif
del_0(skillDialog);
del_0(minimap);
del_0(equipmentWindow);
@@ -823,10 +806,7 @@ void Game::handleInput()
equipmentWindow->setVisible(false);
helpWindow->setVisible(false);
debugWindow->setVisible(false);
-#ifdef MANASERV_SUPPORT
guildWindow->setVisible(false);
- buddyWindow->setVisible(false);
-#endif
}
break;
case KeyboardConfig::KEY_WINDOW_STATUS: