X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FWinDefs.cpp;h=f30e129cc94297fc7a07f14052efaf29e62b28f0;hb=8b6e8f3ad7390309795eb35c0959264cb7924402;hp=fd49c106d4c7c40f3c3285d7d22e8be16b57c6ba;hpb=34ce0cdd42f673a04aa29ae148d2206420dfd813;p=lugaru.git

diff --git a/Source/WinDefs.cpp b/Source/WinDefs.cpp
index fd49c10..f30e129 100644
--- a/Source/WinDefs.cpp
+++ b/Source/WinDefs.cpp
@@ -1,5 +1,6 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
@@ -17,22 +18,22 @@ You should have received a copy of the GNU General Public License
 along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/**> HEADER FILES <**/
-#include "WinDefs.h"
-#include <windows.h>
+#include "WinDefs.hpp"
+
 #include <errno.h>
-#include <time.h>
 #include <stdio.h>
-
+#include <time.h>
+#include <windows.h>
 
 class AppTime
 {
-public:
-    AppTime() {
+  public:
+    AppTime()
+    {
         counterRate = 1;
         baseCounter = 0;
-        QueryPerformanceFrequency( (LARGE_INTEGER*)&counterRate);
-        QueryPerformanceCounter( (LARGE_INTEGER*)&baseCounter);
+        QueryPerformanceFrequency((LARGE_INTEGER*)&counterRate);
+        QueryPerformanceCounter((LARGE_INTEGER*)&baseCounter);
     }
     __int64 counterRate; // LARGE_INTEGER type has no math functions so use int64
     __int64 baseCounter;
@@ -42,7 +43,7 @@ static AppTime g_appTime;
 AbsoluteTime UpTime()
 {
     __int64 counter;
-    QueryPerformanceCounter( (LARGE_INTEGER*)&counter);
+    QueryPerformanceCounter((LARGE_INTEGER*)&counter);
 
     counter -= g_appTime.baseCounter;
 
@@ -52,8 +53,7 @@ AbsoluteTime UpTime()
     return time;
 }
 
-
-Duration AbsoluteDeltaToDuration( AbsoluteTime& a, AbsoluteTime& b)
+Duration AbsoluteDeltaToDuration(AbsoluteTime& a, AbsoluteTime& b)
 {
     __int64 value = a.hi;
     value <<= 32;
@@ -85,25 +85,3 @@ Duration AbsoluteDeltaToDuration( AbsoluteTime& a, AbsoluteTime& b)
 
     return time;
 }
-
-
-static char g_filename[ 256];
-char* ConvertFileName( const char* orgfilename)
-{
-    // translate filename into proper path name
-    if (orgfilename[ 0] == ':')
-        orgfilename++;
-    strcpy( g_filename, orgfilename);
-
-    for (int n = 0; g_filename[ n]; n++) {
-        if (g_filename[ n] == ':')
-            g_filename[ n] = '/';
-    }
-
-    return g_filename;
-}
-
-char* ConvertFileName( const char* orgfilename, const char* junk)
-{
-    return ConvertFileName(orgfilename);
-}