Merge pull request #987 from openmultiplayer/hual/GetTickCount_windows

GetTickCount on Windows to return tick count of server instead of system
openmultiplayer · Sep 23, 2024 · b4d411c · b4d411c
2 parents 14c7971 + 0c10a13
commit b4d411c
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Server/Source/util.hpp b/Server/Source/util.hpp
@@ -22,6 +22,7 @@ struct IUnknown;
 #define LIBRARY_OPEN(path) LoadLibrary(path)
 #define LIBRARY_GET_ADDR GetProcAddress
 #define LIBRARY_FREE FreeLibrary
+static LARGE_INTEGER initialTime;
 static LARGE_INTEGER yo;
 #define BUILD_WINDOWS
 #else
@@ -118,6 +119,7 @@ unsigned GetTickCount()
 	{
 #ifdef BUILD_WINDOWS
 		QueryPerformanceFrequency(&yo);
+		QueryPerformanceCounter(&initialTime);
 #else
 		gettimeofday(&initialTime, 0);
 #endif
@@ -129,7 +131,7 @@ unsigned GetTickCount()
 
 	QueryPerformanceCounter(&PerfVal);
 
-	return (unsigned)(PerfVal.QuadPart * 1000 / yo.QuadPart);
+	return (unsigned)((PerfVal.QuadPart - initialTime.QuadPart) * 1000 / yo.QuadPart);
 #else
 	struct timeval tp;
 	gettimeofday(&tp, 0);