From 62d86f1c84678e04e7015a8f2440f0c251887c21 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Thu, 26 Nov 2009 23:25:35 -0700 Subject: 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. --- src/gui/windowmenu.cpp | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src/gui/windowmenu.cpp') diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp index 4e0313b6..8c0043eb 100644 --- a/src/gui/windowmenu.cpp +++ b/src/gui/windowmenu.cpp @@ -43,10 +43,7 @@ extern Window *setupWindow; extern Window *skillDialog; extern Window *specialsWindow; extern Window *statusWindow; -#ifdef MANASERV_SUPPORT -extern Window *buddyWindow; extern Window *guildWindow; -#endif WindowMenu::WindowMenu(): mEmotePopup(0) @@ -60,10 +57,7 @@ WindowMenu::WindowMenu(): N_("Inventory"), N_("Skills"), N_("Specials"), -#ifdef MANASERV_SUPPORT N_("Guilds"), - N_("Buddies"), -#endif N_("Shortcut"), N_("Setup"), 0 @@ -133,16 +127,10 @@ void WindowMenu::action(const gcn::ActionEvent &event) { window = specialsWindow; } -#ifdef MANASERV_SUPPORT else if (event.getId() == "Guilds") { window = guildWindow; } - else if (event.getId() == "Buddies") - { - window = buddyWindow; - } -#endif else if (event.getId() == "Shortcut") { window = itemShortcutWindow; -- cgit v1.2.3-60-g2f50