Make sure math functions are still inlined

A function call could be quite a large overhead on top of a fast square
root function.

6 files changed, 33 insertions, 69 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1e2fe6b3..f460455c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -306,7 +306,6 @@ SET(SRCS
     utils/base64.h
     utils/dtor.h
     utils/gettext.h
-    utils/mathutils.cpp
     utils/mathutils.h
     utils/sha256.cpp
     utils/sha256.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 45bab9fd..82f4b704 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -259,7 +259,6 @@ tmw_SOURCES = gui/widgets/avatar.cpp \
 	      utils/base64.h \
 	      utils/dtor.h \
 	      utils/gettext.h \
-	      utils/mathutils.cpp \
 	      utils/mathutils.h \
 	      utils/sha256.cpp \
 	      utils/sha256.h \
diff --git a/src/net/tmwserv/charserverhandler.cpp b/src/net/tmwserv/charserverhandler.cpp
index 27ac62fb..9739367b 100644
--- a/src/net/tmwserv/charserverhandler.cpp
+++ b/src/net/tmwserv/charserverhandler.cpp
@@ -254,11 +254,6 @@ void CharServerHandler::setCharCreateDialog(CharCreateDialog *window)
     mCharCreateDialog->setAttributes(attributes, 60, 1, 20);
 }
 
-void connect(LoginData *loginData)
-{
-    // Uneeded
-}
-
 void CharServerHandler::chooseCharacter(int slot, LocalPlayer* character)
 {
     Net::AccountServer::Account::selectCharacter(slot);
diff --git a/src/utils/mathutils.cpp b/src/utils/mathutils.cpp
deleted file mode 100644
index 7d50c68f..00000000
--- a/src/utils/mathutils.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  The Mana World
- *  Copyright (C) 2009  The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  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, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "utils/mathutils.h"
-
-/* A very fast function to calculate the approximate inverse square root of a
- * floating point value and a helper function that uses it for getting the
- * normal squareroot. For an explanation of the inverse squareroot function
- * read:
- * http://www.math.purdue.edu/~clomont/Math/Papers/2003/InvSqrt.pdf
- *
- * Unfortunately the original creator of this function seems to be unknown.
- */
-
-float fastInvSqrt(float x)
-{
-    union { int i; float x; } tmp;
-    float xhalf = 0.5f * x;
-    tmp.x = x;
-    tmp.i = 0x5f375a86 - (tmp.i >> 1);
-    x = tmp.x;
-    x = x * (1.5f - xhalf * x * x);
-    return x;
-}
-
-float fastSqrt(float x)
-{
-    return 1.0f / fastInvSqrt(x);
-}
-
-float weightedAverage(float n1, float n2, float w)
-{
-    if (w < 0.0f)
-        return n1;
-
-    if (w > 1.0f)
-        return n2;
-
-    return ((w * n2) + ((1.0f - w) * n1));
-}
diff --git a/src/utils/mathutils.h b/src/utils/mathutils.h
index 1b68f223..ac59ead2 100644
--- a/src/utils/mathutils.h
+++ b/src/utils/mathutils.h
@@ -22,10 +22,40 @@
 #ifndef UTILS_MATHUTILS_H
 #define UTILS_MATHUTILS_H
 
-float fastInvSqrt(float x);
+/* A very fast function to calculate the approximate inverse square root of a
+ * floating point value and a helper function that uses it for getting the
+ * normal squareroot. For an explanation of the inverse squareroot function
+ * read:
+ * http://www.math.purdue.edu/~clomont/Math/Papers/2003/InvSqrt.pdf
+ *
+ * Unfortunately the original creator of this function seems to be unknown.
+ */
+
+inline float fastInvSqrt(float x)
+{
+    union { int i; float x; } tmp;
+    float xhalf = 0.5f * x;
+    tmp.x = x;
+    tmp.i = 0x5f375a86 - (tmp.i >> 1);
+    x = tmp.x;
+    x = x * (1.5f - xhalf * x * x);
+    return x;
+}
+
+inline float fastSqrt(float x)
+{
+    return 1.0f / fastInvSqrt(x);
+}
+
+inline float weightedAverage(float n1, float n2, float w)
+{
+    if (w < 0.0f)
+        return n1;
 
-float fastSqrt(float x);
+    if (w > 1.0f)
+        return n2;
 
-float weightedAverage(float n1, float n2, float w);
+    return w * n2 + (1.0f - w) * n1;
+}
 
 #endif // UTILS_MATHUTILS_H
diff --git a/tmw.cbp b/tmw.cbp
index 9150e080..7a800b42 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -1033,7 +1033,6 @@
 		<Unit filename="src\utils\base64.h" />
 		<Unit filename="src\utils\dtor.h" />
 		<Unit filename="src\utils\gettext.h" />
-		<Unit filename="src\utils\mathutils.cpp" />
 		<Unit filename="src\utils\mathutils.h" />
 		<Unit filename="src\utils\mutex.h" />
 		<Unit filename="src\utils\sha256.cpp">