X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FTickCountObject.c;h=c3c4443e5d535cd0ec21bda765527e5fa06e0d75;hb=9401cea7061b513534a3244edd8944e852a28c7b;hp=ed9c50efb15c70216226a7c821470f357073977f;hpb=5ba7f2d9a3f07f342afdf215a3307d5487cb6d43;p=rocksndiamonds.git

diff --git a/src/game_sp/TickCountObject.c b/src/game_sp/TickCountObject.c
index ed9c50ef..c3c4443e 100644
--- a/src/game_sp/TickCountObject.c
+++ b/src/game_sp/TickCountObject.c
@@ -20,19 +20,25 @@
 // static boolean VB_Exposed = False;
 // --- Option Explicit
 
-#define LongMin 			(-(double)2147483648) // the "#" sign is a bug of the VB environment AutoFormat function but causes no real problems; don't  worry 'bout it!
-#define LongMax 			(2147483647)
+#define LongMin 			(-(double)2147483648UL) // the "#" sign is a bug of the VB environment AutoFormat function but causes no real problems; don't  worry 'bout it!
+#define LongMax 			(2147483647UL)
 
-long GetTickCount();
+#if 0
+
+long MyGetTickCount();
 long QueryPerformanceCounter(currency lpPerformanceCount);
 long QueryPerformanceFrequency(currency lpFrequency);
 
+#endif
+
 boolean DelayLoopActive;
 
 boolean MPause, bHighPerf;
 currency PFreq; // LARGE_INTEGER
 double sFactor, msFactor, usFactor;
 
+#if 0
+
 boolean TickCountObject_Get_Active()
 {
   boolean Active;
@@ -60,14 +66,14 @@ void TickCountObject_DelayMS(long MSInterval, boolean DoEventsFlag) // in ms
 {
   currency Start;
 
-  Start = TickNow();
+  Start = TickCountObject_Get_TickNow();
   DelayLoopActive = True;
   do
   {
     if (DoEventsFlag)
       DoEvents();
 
-    if (MSInterval <= TickDiffMS(Start) && ! MPause)
+    if (MSInterval <= TickCountObject_TickDiffMS(Start) && ! MPause)
       break;
   }
   while (1);
@@ -99,7 +105,7 @@ currency TickCountObject_Get_TickNow()
   }
   else
   {
-    TickNow = GetTickCount();
+    TickNow = MyGetTickCount();
   }
 
   return TickNow;
@@ -119,7 +125,7 @@ long TickCountObject_TickDiffS(currency TickStart)
   }
   else
   {
-    NewTick = GetTickCount();
+    NewTick = MyGetTickCount();
     if (NewTick < TickStart)
     {
       // Overflow occured and needs to be handled
@@ -130,7 +136,7 @@ long TickCountObject_TickDiffS(currency TickStart)
       TickDiffS = NewTick - TickStart;
     }
 
-    TickDiffS = Int(TickDiffS / 1000);
+    TickDiffS = (int)(TickDiffS / 1000);
   }
 
   return TickDiffS;
@@ -150,7 +156,7 @@ long TickCountObject_TickDiffMS(currency TickStart)
   }
   else
   {
-    NewTick = GetTickCount();
+    NewTick = MyGetTickCount();
     if (NewTick < TickStart)
     {
       // Overflow occured and needs to be handled
@@ -179,7 +185,7 @@ currency TickCountObject_TickDiffUS(currency TickStart)
   }
   else
   {
-    NewTick = GetTickCount();
+    NewTick = MyGetTickCount();
     if (NewTick < TickStart)
     {
       // Overflow occured and needs to be handled
@@ -194,6 +200,8 @@ currency TickCountObject_TickDiffUS(currency TickStart)
   return TickDiffUS;
 }
 
+#endif
+
 #if 0
 
 static void Class_Initialize()