More merges and conflict resolves

1 files changed, 70 insertions, 0 deletions

diff --git a/src/gui/specialswindow.h b/src/gui/specialswindow.h
new file mode 100644
index 00000000..cd92c065
--- /dev/null
+++ b/src/gui/specialswindow.h
@@ -0,0 +1,70 @@
+/*
+ *  The Mana World
+ *  Copyright (C) 2009  The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SPECIALSWINDOW_H
+#define SPECIALSWINDOW_H
+
+#include <vector>
+
+#include "gui/widgets/window.h"
+
+#include "guichanfwd.h"
+
+#include <guichan/actionlistener.hpp>
+
+
+#include <map>
+
+class Label;
+class ScrollArea;
+class Tab;
+class TabbedArea;
+
+struct SpecialInfo;
+
+class SpecialsWindow : public Window, public gcn::ActionListener {
+    public:
+        SpecialsWindow();
+
+        ~SpecialsWindow();
+
+        /**
+         * Called when receiving actions from widget.
+         */
+        void action(const gcn::ActionEvent &actionEvent);
+
+        /**
+         * Update the given special's display
+         */
+        std::string update(int id);
+
+        void loadSpecials(const std::string &file);
+
+    private:
+        std::vector<gcn::Button *> mSpellButtons;
+        typedef std::map<int, SpecialInfo*> SpecialMap;
+        SpecialMap mSpecials;
+        TabbedArea *mTabs;
+};
+
+extern SpecialsWindow *specialsWindow;
+
+#endif // SPECIALSWINDOW_H