summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-07-15 02:45:23 +0200
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-08-11 02:39:49 +0200
commitda2fcf682e180c69c9e36a5f581a372c9d9abc43 (patch)
treedc8e225ee79088e9d7594e56cc599dbec77afaac
parentbe1300b05a4c6e50fe8f13efa8c66dda00a21016 (diff)
downloadmana-da2fcf682e180c69c9e36a5f581a372c9d9abc43.tar.gz
mana-da2fcf682e180c69c9e36a5f581a372c9d9abc43.tar.bz2
mana-da2fcf682e180c69c9e36a5f581a372c9d9abc43.tar.xz
mana-da2fcf682e180c69c9e36a5f581a372c9d9abc43.zip
Fixed back the special window display in a basic but working way.
This to avoid cluttering the gui until Crush has the time to fulfill his issue about those.
-rw-r--r--src/gui/specialswindow.h3
-rw-r--r--src/gui/windowmenu.cpp2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/specialswindow.h b/src/gui/specialswindow.h
index dedeeffc..b440ce13 100644
--- a/src/gui/specialswindow.h
+++ b/src/gui/specialswindow.h
@@ -51,6 +51,9 @@ class SpecialsWindow : public Window, public gcn::ActionListener {
void draw(gcn::Graphics *graphics);
+ bool hasSpecials()
+ { return !mEntries.empty(); }
+
private:
// (re)constructs the list of specials
void rebuild(const std::map<int, Special> &specialData);
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index b40a171b..a618ae8e 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -62,7 +62,7 @@ WindowMenu::WindowMenu():
addButton(N_("Skills"), x, h, "button-icon-skills.png",
KeyboardConfig::KEY_WINDOW_SKILL);
- // if (specialsWindow->hasSpecials())
+ if (specialsWindow->hasSpecials())
addButton(N_("Specials"), x, h, "button-icon-specials.png");
addButton(N_("Social"), x, h, "button-icon-social.png",