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/gui/windowmenu.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/gui/windowmenu.cpp')
| -rw-r--r-- | src/gui/windowmenu.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp index 96776617..b73558c0 100644 --- a/src/gui/windowmenu.cpp +++ b/src/gui/windowmenu.cpp @@ -41,11 +41,11 @@ extern Window *inventoryWindow; extern Window *itemShortcutWindow; extern Window *setupWindow; extern Window *skillDialog; +extern Window *specialsWindow; extern Window *statusWindow; #ifdef TMWSERV_SUPPORT extern Window *buddyWindow; extern Window *guildWindow; -extern Window *magicDialog; #endif WindowMenu::WindowMenu(): @@ -59,8 +59,8 @@ WindowMenu::WindowMenu(): N_("Equipment"), N_("Inventory"), N_("Skills"), + N_("Specials"), #ifdef TMWSERV_SUPPORT - N_("Magic"), N_("Guilds"), N_("Buddies"), #endif @@ -129,11 +129,11 @@ void WindowMenu::action(const gcn::ActionEvent &event) { window = skillDialog; } -#ifdef TMWSERV_SUPPORT - else if (event.getId() == "Magic") + else if (event.getId() == "Specials") { - window = magicDialog; + window = specialsWindow; } +#ifdef TMWSERV_SUPPORT else if (event.getId() == "Guilds") { window = guildWindow; |