From 383e7d2c9fa37a6468a937362c4507659a15233f Mon Sep 17 00:00:00 2001
From: Joel Leclerc <lkjoel@ubuntu.com>
Date: Sun, 29 Apr 2012 16:03:54 -0600
Subject: [PATCH] Fixed bugs

---
 src/gettime.cpp | 17 +----------------
 src/gettime.h   | 12 +-----------
 src/main.cpp    | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/src/gettime.cpp b/src/gettime.cpp
index 3c73064..0b66cae 100644
--- a/src/gettime.cpp
+++ b/src/gettime.cpp
@@ -31,15 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	gettime.h implementation
 */
 
-#ifdef SERVER
-
-u32 getTimeMs()
-{
-	/* Use imprecise system calls directly (from porting.h) */
-	return porting::getTimeMs();
-}
-
-#else
+#ifndef SERVER
 
 // A precise irrlicht one
 u32 IrrlichtTimeGetter::getTime()
@@ -57,11 +49,4 @@ u32 SimpleTimeGetter::getTime()
 	return porting::getTimeMs();
 }
 
-u32 getTimeMs()
-{
-	if(g_timegetter == NULL)
-		return 0;
-	return g_timegetter->getTime();
-}
-
 #endif
diff --git a/src/gettime.h b/src/gettime.h
index 69dfdee..cb86cfa 100644
--- a/src/gettime.h
+++ b/src/gettime.h
@@ -51,11 +51,7 @@ inline std::string getTimestamp()
 	return cs;
 }
 
-#ifdef SERVER
-
-u32 getTimeMs();
-
-#else
+#ifndef SERVER
 
 // A small helper class
 class TimeGetter
@@ -82,12 +78,6 @@ public:
 	u32 getTime();
 };
 
-// A pointer to a global instance of the time getter
-// TODO: why?
-TimeGetter *g_timegetter = NULL;
-
-u32 getTimeMs();
-
 #endif
 
 
diff --git a/src/main.cpp b/src/main.cpp
index 21e8da9..0a7e5c5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -117,6 +117,23 @@ bool noMenuActive()
 
 // Passed to menus to allow disconnecting and exiting
 MainGameCallback *g_gamecallback = NULL;
+
+// A pointer to a global instance of the time getter
+// TODO: why?
+TimeGetter *g_timegetter = NULL;
+
+u32 getTimeMs()
+{
+	if(g_timegetter == NULL)
+		return 0;
+	return g_timegetter->getTime();
+}
+#else
+u32 getTimeMs()
+{
+	/* Use imprecise system calls directly (from porting.h) */
+	return porting::getTimeMs();
+}
 #endif
 
 class StderrLogOutput: public ILogOutput