3 files changed, 81 insertions, 0 deletions
diff --git a/src/utils/logger.cpp b/src/utils/logger.cpp
index a8d7241..71f92a8 100644
--- a/src/utils/logger.cpp
+++ b/src/utils/logger.cpp
@@ -107,9 +107,15 @@ void Logger::output(const std::string &msg, Level atVerbosity)
 {
     static const char *prefixes[] =
     {
+#ifdef T_COL_LOG
+        "[\033[45mFTL\033[0m]",
+        "[\033[41mERR\033[0m]",
+        "[\033[43mWRN\033[0m]",
+#else
         "[FTL]",
         "[ERR]",
         "[WRN]",
+#endif
         "[INF]",
         "[DBG]"
     };
diff --git a/src/utils/speedconv.cpp b/src/utils/speedconv.cpp
new file mode 100644
index 0000000..14d328f
--- /dev/null
+++ b/src/utils/speedconv.cpp
@@ -0,0 +1,31 @@
+/*
+ *  The Mana Server
+ *  Copyright (C) 2004-2010  The Mana World Development Team
+ *
+ *  This file is part of The Mana Server.
+ *
+ *  The Mana Server 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 Server 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 Server.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "utils/speedconv.hpp"
+
+double utils::tpsToSpeed(double tps)
+{
+    return (32000 / (tps   * DEFAULT_TILE_LENGTH));
+}
+
+double utils::speedToTps(double speed)
+{
+    return (32000 / (speed * DEFAULT_TILE_LENGTH));
+}
diff --git a/src/utils/speedconv.hpp b/src/utils/speedconv.hpp
new file mode 100644
index 0000000..6a29d0f
--- /dev/null
+++ b/src/utils/speedconv.hpp
@@ -0,0 +1,44 @@
+/*
+ *  The Mana Server
+ *  Copyright (C) 2004-2010  The Mana World Development Team
+ *
+ *  This file is part of The Mana Server.
+ *
+ *  The Mana Server 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 Server 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 Server.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SPEEDCONV_HPP
+#define SPEEDCONV_HPP
+
+// Simple helper functions for converting between tiles per
+// second and the internal speed representation
+
+#include "defines.h"
+
+namespace utils {
+    /**
+     * tpsToSpeed()
+     * @param tps The speed value in tiles per second
+     * @returns The speed value in the internal representation
+     */
+    double tpsToSpeed(double);
+    /**
+     * speedToTps()
+     * @param speed The speed value in the internal representation
+     * @returns The speed value in tiles per second
+     */
+    double speedToTps(double);
+}
+
+#endif // SPEEDCONV_HPP