4 files changed, 135 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2dbae4a0d..86f665f28 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -786,6 +786,8 @@ SET(SRCS
     utils/gettexthelper.h
     utils/glxhelper.cpp
     utils/glxhelper.h
+    utils/gmfunctions.cpp
+    utils/gmfunctions.h
     utils/intmap.h
     utils/langs.cpp
     utils/langs.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 502ba1b3b..5173c45f7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1139,6 +1139,8 @@ manaplus_SOURCES += main.cpp \
 	      party.h \
 	      utils/chatutils.cpp \
 	      utils/chatutils.h \
+	      utils/gmfunctions.cpp \
+	      utils/gmfunctions.h \
 	      resources/db/avatardb.cpp \
 	      resources/db/avatardb.h \
 	      resources/db/badgesdb.cpp \
diff --git a/src/utils/gmfunctions.cpp b/src/utils/gmfunctions.cpp
new file mode 100644
index 000000000..35f68b133
--- /dev/null
+++ b/src/utils/gmfunctions.cpp
@@ -0,0 +1,93 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2016  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 "utils/gmfunctions.h"
+
+#include "settings.h"
+
+#include "being/localplayer.h"
+
+#include "const/gui/chat.h"
+
+#include "net/chathandler.h"
+
+#include "debug.h"
+
+namespace Gm
+{
+
+void runCommand(const std::string &command,
+                const std::string &params)
+{
+    if (params.empty())
+    {
+        chatHandler->talk(std::string(
+            settings.gmCommandSymbol).append(
+            command),
+            GENERAL_CHANNEL);
+    }
+    else
+    {
+        chatHandler->talk(std::string(
+            settings.gmCommandSymbol).append(
+            command).append(
+            " ").append(
+            params),
+            GENERAL_CHANNEL);
+    }
+}
+
+void runCharCommand(const std::string &command,
+                    const std::string &name,
+                    const std::string &params)
+{
+    if (localPlayer && name == localPlayer->getName())
+    {
+        if (params.empty())
+        {
+            chatHandler->talk(std::string(
+                settings.gmCommandSymbol).append(
+                command),
+                GENERAL_CHANNEL);
+        }
+        else
+        {
+            chatHandler->talk(std::string(
+                settings.gmCommandSymbol).append(
+                command).append(
+                " ").append(
+                params),
+                GENERAL_CHANNEL);
+        }
+    }
+    else
+    {
+        chatHandler->talk(std::string(
+            settings.gmCharCommandSymbol).append(
+            command).append(
+            " ").append(
+            name).append(
+            " ").append(
+            params),
+            GENERAL_CHANNEL);
+    }
+}
+
+}  // namespace Gm
diff --git a/src/utils/gmfunctions.h b/src/utils/gmfunctions.h
new file mode 100644
index 000000000..6ef32996e
--- /dev/null
+++ b/src/utils/gmfunctions.h
@@ -0,0 +1,38 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2016  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 UTILS_GMFUNCTIONS_H
+#define UTILS_GMFUNCTIONS_H
+
+#include <string>
+
+#include "localconsts.h"
+
+namespace Gm
+{
+    void runCommand(const std::string &command,
+                    const std::string &params);
+
+    void runCharCommand(const std::string &command,
+                        const std::string &name,
+                        const std::string &params);
+}  // namespace Gm
+
+#endif  // UTILS_GMFUNCTIONS_H