diff options
| author | Philipp Sehmisch <tmw@crushnet.org> | 2007-02-27 17:49:36 +0000 |
|---|---|---|
| committer | Philipp Sehmisch <tmw@crushnet.org> | 2007-02-27 17:49:36 +0000 |
| commit | 3ce08687bb879054f5fa93f456677246cb51afdd (patch) | |
| tree | 9bac987bf0bb41bbf6278ef940d583b063015887 | |
| parent | 7a6e4d3c87ca4d7cc851af47fd9ebb616168f4c9 (diff) | |
| download | mana-client-3ce08687bb879054f5fa93f456677246cb51afdd.tar.gz mana-client-3ce08687bb879054f5fa93f456677246cb51afdd.tar.bz2 mana-client-3ce08687bb879054f5fa93f456677246cb51afdd.tar.xz mana-client-3ce08687bb879054f5fa93f456677246cb51afdd.zip | |
forgot some files in last commit
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/channel.cpp | 60 | ||||
| -rw-r--r-- | src/channel.h | 41 | ||||
| -rw-r--r-- | src/channelmanager.cpp | 86 | ||||
| -rw-r--r-- | src/channelmanager.h | 44 |
5 files changed, 235 insertions, 1 deletions
@@ -1,11 +1,14 @@ 2007-02-27 Philipp Sehmisch <tmw@crushnet.org> + * gui/button.cpp, src/guibutton.h, src/gui/tabbedcontainer.cpp, src/gui/tabbedcontainer.h:: Tabbed containers now display the button of the active tab pressed all the time. * src/game.cpp, src/gui/chat.cpp, src/gui/chat.h, src/chathandler.cpp, src/net/chatserver/chatserver.cpp, src/net/chatserver/chatserver.h, - src/net/protocol.h: Implementation of chat channels by Trapdoor. + src/channel.cpp, src/channel.h, src/channelmanager.cpp, + src/channelmanager.h src/net/protocol.h: Implementation of chat + channels by Trapdoor. * src/graphics.h: MSVC Compilation fix by Trapdoor. 2007-02-25 Bjørn Lindeijer <bjorn@lindeijer.nl> diff --git a/src/channel.cpp b/src/channel.cpp new file mode 100644 index 00000000..c9849aba --- /dev/null +++ b/src/channel.cpp @@ -0,0 +1,60 @@ +/*
+ * The Mana World
+ * Copyright 2004 The Mana World Development Team
+ *
+ * This file is part of The Mana World.
+ *
+ * The Mana World 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.
+ *
+ * The Mana World 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 The Mana World; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ *
+ */
+
+
+#include "channel.h"
+
+Channel::Channel(short id) :
+mID(id)
+{
+
+}
+
+std::string Channel::getName() const
+{
+ return mName;
+}
+
+void Channel::setName(const std::string &channelName)
+{
+ mName = channelName;
+}
+
+const short Channel::getId() const
+{
+ return mID;
+}
+
+const int Channel::getUserListSize() const
+{
+ return userList.size();
+}
+
+std::string Channel::getUser(unsigned int id) const
+{
+ if(id <= userList.size())
+ {
+ return userList[id];
+ }
+ return "";
+}
diff --git a/src/channel.h b/src/channel.h new file mode 100644 index 00000000..9bf69c78 --- /dev/null +++ b/src/channel.h @@ -0,0 +1,41 @@ +/*
+ * The Mana World
+ * Copyright 2004 The Mana World Development Team
+ *
+ * This file is part of The Mana World.
+ *
+ * The Mana World 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.
+ *
+ * The Mana World 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 The Mana World; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ *
+ */
+
+#include <string>
+#include <vector>
+
+class Channel
+{
+ public:
+ Channel(short id);
+ std::string getName() const;
+ void setName(const std::string &channelName);
+ const short getId() const;
+ const int getUserListSize() const;
+ std::string getUser(unsigned int i) const;
+ private:
+ typedef std::vector<std::string> Users;
+ std::string mName;
+ short mID;
+ Users userList;
+};
diff --git a/src/channelmanager.cpp b/src/channelmanager.cpp new file mode 100644 index 00000000..b2010465 --- /dev/null +++ b/src/channelmanager.cpp @@ -0,0 +1,86 @@ +/*
+ * The Mana World
+ * Copyright 2004 The Mana World Development Team
+ *
+ * This file is part of The Mana World.
+ *
+ * The Mana World 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.
+ *
+ * The Mana World 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 The Mana World; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ *
+ */
+
+#include <list>
+
+#include "channelmanager.h"
+#include "channel.h"
+
+#include "utils/dtor.h"
+
+ChannelManager::ChannelManager()
+{
+
+}
+
+ChannelManager::~ChannelManager()
+{
+ for_each(mChannels.begin(), mChannels.end(), make_dtor(mChannels));
+ mChannels.clear();
+}
+
+Channel* ChannelManager::findById(int id)
+{
+ Channel* channel;
+ for(std::list<Channel*>::iterator itr = mChannels.begin();
+ itr != mChannels.end();
+ itr++)
+ {
+ channel = (*itr);
+ if(channel->getId() == id)
+ {
+ return channel;
+ }
+ }
+ return NULL;
+}
+
+Channel* ChannelManager::findByName(std::string name)
+{
+ Channel* channel;
+ if(name != "")
+ {
+ for(std::list<Channel*>::iterator itr = mChannels.begin();
+ itr != mChannels.end();
+ itr++)
+ {
+ channel = (*itr);
+ if(channel->getName() == name)
+ {
+ return channel;
+ }
+ }
+ }
+ return NULL;
+}
+
+void ChannelManager::addChannel(Channel *channel)
+{
+ mChannels.push_back(channel);
+}
+
+void ChannelManager::removeChannel(Channel *channel)
+{
+ mChannels.remove(channel);
+ delete channel;
+}
diff --git a/src/channelmanager.h b/src/channelmanager.h new file mode 100644 index 00000000..7053a143 --- /dev/null +++ b/src/channelmanager.h @@ -0,0 +1,44 @@ +/*
+ * The Mana World
+ * Copyright 2004 The Mana World Development Team
+ *
+ * This file is part of The Mana World.
+ *
+ * The Mana World 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.
+ *
+ * The Mana World 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 The Mana World; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ *
+ */
+
+#ifndef _TMW_CHANNELMANAGER_H
+#define _TMW_CHANNELMANAGER_H
+
+class Channel;
+
+class ChannelManager
+{
+public:
+ ChannelManager();
+ ~ChannelManager();
+ Channel* findById(int id);
+ Channel* findByName(std::string name);
+ void addChannel(Channel *channel);
+ void removeChannel(Channel *channel);
+private:
+ std::list<Channel*> mChannels;
+};
+
+extern ChannelManager *channelManager;
+
+#endif
|