2 files changed, 80 insertions, 9 deletions
diff --git a/src/resources/chatobject.cpp b/src/resources/chatobject.cpp
new file mode 100644
index 000000000..fa2663614
--- /dev/null
+++ b/src/resources/chatobject.cpp
@@ -0,0 +1,68 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2012-2015  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/>.
+ */
+
+#include "resources/chatobject.h"
+
+std::map<std::string, ChatObject*> ChatObject::chatNameMap;
+std::map<int, ChatObject*> ChatObject::chatIdMap;
+
+ChatObject::ChatObject() :
+    ownerId(0),
+    chatId(0),
+    maxUsers(0),
+    currentUsers(0),
+    type(0),
+    title()
+{
+}
+
+ChatObject::~ChatObject()
+{
+    std::map<std::string, ChatObject*>::iterator it = chatNameMap.find(title);
+    if (it != chatNameMap.end())
+        chatNameMap.erase(it);
+    std::map<int, ChatObject*>::iterator it2 = chatIdMap.find(chatId);
+    if (it2 != chatIdMap.end())
+        chatIdMap.erase(it2);
+}
+
+void ChatObject::update()
+{
+    chatNameMap[title] = this;
+    chatIdMap[chatId] = this;
+}
+
+ChatObject *ChatObject::findByName(const std::string &name)
+{
+    std::map<std::string, ChatObject*>::iterator it = chatNameMap.find(name);
+    if (it == chatNameMap.end())
+        return nullptr;
+    else
+        return (*it).second;
+}
+
+ChatObject *ChatObject::findById(const int id)
+{
+    std::map<int, ChatObject*>::iterator it = chatIdMap.find(id);
+    if (it == chatIdMap.end())
+        return nullptr;
+    else
+        return (*it).second;
+}
diff --git a/src/resources/chatobject.h b/src/resources/chatobject.h
index b3945ec5f..431718e41 100644
--- a/src/resources/chatobject.h
+++ b/src/resources/chatobject.h
@@ -25,24 +25,27 @@
 
 struct ChatObject final
 {
-    ChatObject() :
-        ownerId(0),
-        chatId(0),
-        maxUsers(0),
-        currentUsers(0),
-        type(0),
-        title()
-    {
-    }
+    ChatObject();
+
+    ~ChatObject();
 
     A_DELETE_COPY(ChatObject)
 
+    void update();
+
+    static ChatObject *findByName(const std::string &name);
+
+    static ChatObject *findById(const int id);
+
     int ownerId;
     int chatId;
     uint16_t maxUsers;
     uint16_t currentUsers;
     uint8_t type;
     std::string title;
+
+    static std::map<std::string, ChatObject*> chatNameMap;
+    static std::map<int, ChatObject*> chatIdMap;
 };
 
 #endif  // RESOURCES_CHATOBJECT_H