X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FWinDefs.cpp;h=f30e129cc94297fc7a07f14052efaf29e62b28f0;hb=b9a46d8e2b7e7e22c706e7dd3734f31015db4408;hp=55a71900291a25e023f2347b47f5771d06ee88ce;hpb=9e1a507cf6f084fa2118905cc8cdc854c64ae64b;p=lugaru.git

diff --git a/Source/WinDefs.cpp b/Source/WinDefs.cpp
index 55a7190..f30e129 100644
--- a/Source/WinDefs.cpp
+++ b/Source/WinDefs.cpp
@@ -1,134 +1,87 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
-Lugaru 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 (at your option) any later version.
+Lugaru 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
+(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
+Lugaru 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.
+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.
+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()
-	{
-		counterRate = 1;
-		baseCounter = 0;
-		QueryPerformanceFrequency( (LARGE_INTEGER*)&counterRate);
-		QueryPerformanceCounter( (LARGE_INTEGER*)&baseCounter);
-	}
-	__int64 counterRate;		// LARGE_INTEGER type has no math functions so use int64
-	__int64 baseCounter;
+  public:
+    AppTime()
+    {
+        counterRate = 1;
+        baseCounter = 0;
+        QueryPerformanceFrequency((LARGE_INTEGER*)&counterRate);
+        QueryPerformanceCounter((LARGE_INTEGER*)&baseCounter);
+    }
+    __int64 counterRate; // LARGE_INTEGER type has no math functions so use int64
+    __int64 baseCounter;
 };
 static AppTime g_appTime;
 
-
-
-void CopyCStringToPascal( const char* src, unsigned char dst[256])
-{
-	int len = strlen( src);
-	dst[ 0] = len;
-	memcpy( dst + 1, src, len);
-}
-
-
-void CopyPascalStringToC( const unsigned char* src, char* dst)
-{
-	int len = src[ 0];
-	memcpy( dst, src + 1, len);
-	dst[ len] = 0;
-}
-
-
 AbsoluteTime UpTime()
 {
-	__int64 counter;
-	QueryPerformanceCounter( (LARGE_INTEGER*)&counter);
-
-	counter -= g_appTime.baseCounter;
-
-	AbsoluteTime time;
-	time.lo = (unsigned long)counter;
-	time.hi = (unsigned long)(counter >> 32);
-	return time;
-}
-
-
-Duration AbsoluteDeltaToDuration( AbsoluteTime& a, AbsoluteTime& b)
-{
-	__int64 value = a.hi;
-	value <<= 32;
-	value |= a.lo;
-	__int64 value2 = b.hi;
-	value2 <<= 32;
-	value2 |= b.lo;
-	value -= value2;
-
-	if (value <= 0)
-		return durationImmediate;
-
-	__int64 frac = value % g_appTime.counterRate;
-	value /= g_appTime.counterRate;
-
-	Duration time;
-
-	if (value == 0)
-	{
-		frac *= -1000000;
-		frac /= g_appTime.counterRate;
-		time = (Duration)frac;
-	}
-	else
-	{
-		frac *= 1000;
-		frac /= g_appTime.counterRate;
-		value *= 1000;
-		value += frac;
-		time = (Duration)value;
-	}
-
-	return time;
-}
+    __int64 counter;
+    QueryPerformanceCounter((LARGE_INTEGER*)&counter);
 
+    counter -= g_appTime.baseCounter;
 
-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;
+    AbsoluteTime time;
+    time.lo = (unsigned long)counter;
+    time.hi = (unsigned long)(counter >> 32);
+    return time;
 }
 
-char* ConvertFileName( const char* orgfilename, const char* junk)
+Duration AbsoluteDeltaToDuration(AbsoluteTime& a, AbsoluteTime& b)
 {
-	return ConvertFileName(orgfilename);
+    __int64 value = a.hi;
+    value <<= 32;
+    value |= a.lo;
+    __int64 value2 = b.hi;
+    value2 <<= 32;
+    value2 |= b.lo;
+    value -= value2;
+
+    if (value <= 0)
+        return durationImmediate;
+
+    __int64 frac = value % g_appTime.counterRate;
+    value /= g_appTime.counterRate;
+
+    Duration time;
+
+    if (value == 0) {
+        frac *= -1000000;
+        frac /= g_appTime.counterRate;
+        time = (Duration)frac;
+    } else {
+        frac *= 1000;
+        frac /= g_appTime.counterRate;
+        value *= 1000;
+        value += frac;
+        time = (Duration)value;
+    }
+
+    return time;
 }