Merge branch 'master' into strippedstripped1.1.9.4

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf
	src/guichan/basiccontainer.cpp
	src/guichan/include/guichan/basiccontainer.hpp
	src/guichan/widgets/window.cpp

1 files changed, 94 insertions, 0 deletions

diff --git a/src/guildmanager.h b/src/guildmanager.h
new file mode 100644
index 000000000..80014e352
--- /dev/null
+++ b/src/guildmanager.h
@@ -0,0 +1,94 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUILDMANAGER_H
+#define GUILDMANAGER_H
+
+#include "utils/dtor.h"
+
+#include <map>
+#include <string>
+#include <vector>
+
+class Guild;
+class GuildChatTab;
+
+class GuildManager
+{
+    public:
+        GuildManager();
+
+        ~GuildManager();
+
+        static void init();
+
+        void chat(std::string msg);
+
+        void send(std::string msg);
+
+        bool processGuildMessage(std::string msg);
+
+        void getNames(std::vector<std::string> &names);
+
+        void requestGuildInfo();
+
+        void updateList();
+
+        static bool getEnableGuildBot()
+        { return mEnableGuildBot; }
+
+        void kick(std::string msg);
+
+        void invite(std::string msg);
+
+        void leave();
+
+        void notice(std::string msg);
+
+        void createTab(Guild *guild);
+
+        Guild *createGuild();
+
+        void clear();
+
+        void reload();
+
+        void inviteResponse(bool response);
+
+        bool afterRemove();
+
+        bool havePower()
+        { return mHavePower; }
+
+    private:
+        bool process(std::string msg);
+
+        static bool mEnableGuildBot;
+        bool mGotInfo;
+        bool mGotName;
+        bool mHavePower;
+        std::vector<std::string> mTempList;
+        GuildChatTab *mTab;
+        bool mRequest;
+};
+
+extern GuildManager *guildManager;
+
+#endif // GUILDMANAGER_H