Use long values for the time

Closes #152
LemonUIbyLemon · Dec 19, 2023 · cbdf910 · cbdf910
1 parent 9f12ff3
commit cbdf910
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 72 deletions.
diff --git a/LemonUI/Elements/ScaledAnim.cs b/LemonUI/Elements/ScaledAnim.cs
@@ -5,7 +5,7 @@
 #elif RAGEMP
 using RAGE.Game;
 #elif RPH
-using Rage.Native;
+using Rage;
 #elif SHVDN3 || SHVDNC
 using GTA;
 #endif
@@ -22,7 +22,7 @@ public class ScaledAnim : ScaledTexture
         #region Fields
 
         private float frameRate;
-        private int start = 0;
+        private long start = 0;
         private int duration;
 
         #endregion
@@ -107,16 +107,14 @@ public override void Draw()
             }
 
 #if ALTV
-            int time = Alt.Natives.GetGameTimer();
+            long time = Alt.Natives.GetGameTimer();
 #elif RAGEMP
-            int time = Misc.GetGameTimer();
-#elif RPH
-            int time = NativeFunction.CallByHash<int>(0x9CD27B0045628463);
-#elif FIVEM || SHVDN3 || SHVDNC
-            int time = Game.GameTime;
+            long time = Misc.GetGameTimer();
+#elif FIVEM || RPH || SHVDN3 || SHVDNC
+            long time = Game.GameTime;
 #endif
 
-            int end = start + Duration;
+            long end = start + Duration;
 
             if (start == 0 || end <= time)
             {

diff --git a/LemonUI/Menus/NativeMenu.cs b/LemonUI/Menus/NativeMenu.cs
@@ -1163,14 +1163,12 @@ private void ProcessControls()
                 return;
             }
 
-#if RAGEMP
-            int time = Misc.GetGameTimer();
-#elif ALTV
-            int time = Alt.Natives.GetGameTimer();
-#elif RPH
-            uint time = Game.GameTime;
-#else
-            int time = Game.GameTime;
+#if ALTV
+            long time = Alt.Natives.GetGameTimer();
+#elif RAGEMP
+            long time = Misc.GetGameTimer();
+#elif FIVEM || RPH || SHVDN3 || SHVDNC
+            long time = Game.GameTime;
 #endif
 
             if (HeldTime > 0 && (upHeld || downHeld || leftHeld || rightHeld))

diff --git a/LemonUI/Scaleform/BigMessage.cs b/LemonUI/Scaleform/BigMessage.cs
@@ -28,7 +28,7 @@ public class BigMessage : BaseScaleform
 
         private MessageType type;
         private uint weaponHash;
-        private uint hideAfter;
+        private long hideAfter;
 
         #endregion
 
@@ -278,28 +278,24 @@ public void FadeOut(int time)
 
             CallFunction("SHARD_ANIM_OUT", 0, time);
 
-#if RAGEMP
-            uint currentTime = (uint)Misc.GetGameTimer();
-#elif ALTV
-            uint currentTime = (uint)Alt.Natives.GetGameTimer();
-#elif RPH
-            uint currentTime = Game.GameTime;
-#else
-            uint currentTime = (uint)Game.GameTime;
+#if ALTV
+            long currentTime = Alt.Natives.GetGameTimer();
+#elif RAGEMP
+            long currentTime = Misc.GetGameTimer();
+#elif FIVEM || RPH || SHVDN3 || SHVDNC
+            long currentTime = Game.GameTime;
 #endif
-            hideAfter = currentTime + (uint)time;
+            hideAfter = currentTime + time;
         }
         /// <inheritdoc/>
         public override void DrawFullScreen()
         {
-#if RAGEMP
-            uint time = (uint)Misc.GetGameTimer();
-#elif ALTV
-            uint time = (uint)Alt.Natives.GetGameTimer();
-#elif RPH
-            uint time = Game.GameTime;
-#else
-            uint time = (uint)Game.GameTime;
+#if ALTV
+            long time = Alt.Natives.GetGameTimer();
+#elif RAGEMP
+            long time = Misc.GetGameTimer();
+#elif FIVEM || RPH || SHVDN3 || SHVDNC
+            long time = Game.GameTime;
 #endif
 
             if (hideAfter > 0 && time > hideAfter)

diff --git a/LemonUI/Scaleform/BruteForce.cs b/LemonUI/Scaleform/BruteForce.cs
@@ -196,14 +196,12 @@ public void Reset()
             Word = word;
             ShowLives = showLives;
 
-#if RAGEMP
-            int time = Misc.GetGameTimer();
-#elif ALTV
-            int time = Alt.Natives.GetGameTimer();
-#elif RPH
-            uint time = Game.GameTime;
-#else
-            int time = Game.GameTime;
+#if ALTV
+            long time = Alt.Natives.GetGameTimer();
+#elif RAGEMP
+            long time = Misc.GetGameTimer();
+#elif FIVEM || RPH || SHVDN3 || SHVDNC
+            long time = Game.GameTime;
 #endif
 
             end = TimeSpan.FromMilliseconds(time) + countdown;
@@ -234,14 +232,12 @@ public void RunProgram(int program)
         /// </summary>
         public override void Update()
         {
-#if RAGEMP
-            int time = Misc.GetGameTimer();
-#elif ALTV
-            int time = Alt.Natives.GetGameTimer();
-#elif RPH
-            uint time = Game.GameTime;
-#else
-            int time = Game.GameTime;
+#if ALTV
+            long time = Alt.Natives.GetGameTimer();
+#elif RAGEMP
+            long time = Misc.GetGameTimer();
+#elif FIVEM || RPH || SHVDN3 || SHVDNC
+            long time = Game.GameTime;
 #endif
 
             // If there is a time set to hide the Hack window

diff --git a/LemonUI/Scaleform/Celebration.cs b/LemonUI/Scaleform/Celebration.cs
@@ -132,13 +132,11 @@ public void Show()
             // 333ms going in
             // 333ms going out
 #if ALTV
-            int time = Alt.Natives.GetGameTimer();
+            long time = Alt.Natives.GetGameTimer();
 #elif RAGEMP
-            int time = Misc.GetGameTimer();
-#elif RPH
-            uint time = Game.GameTime;
-#elif FIVEM || SHVDN3 || SHVDNC
-            int time = Game.GameTime;
+            long time = Misc.GetGameTimer();
+#elif FIVEM || RPH || SHVDN3 || SHVDNC
+            long time = Game.GameTime;
 #endif
             showUntil = time + 333 + 333 + (Duration * 1000);
         }
@@ -170,13 +168,11 @@ public override void Process()
             DrawFullScreen();
 
 #if ALTV
-            int time = Alt.Natives.GetGameTimer();
+            long time = Alt.Natives.GetGameTimer();
 #elif RAGEMP
-            int time = Misc.GetGameTimer();
-#elif RPH
-            uint time = Game.GameTime;
-#elif FIVEM || SHVDN3 || SHVDNC
-            int time = Game.GameTime;
+            long time = Misc.GetGameTimer();
+#elif FIVEM || RPH || SHVDN3 || SHVDNC
+            long time = Game.GameTime;
 #endif
 
             if (showUntil < time)

diff --git a/LemonUI/Scaleform/Countdown.cs b/LemonUI/Scaleform/Countdown.cs
@@ -132,9 +132,7 @@ public void Start()
             lastStepTime = Alt.Natives.GetGameTimer();
 #elif RAGEMP
             lastStepTime = Misc.GetGameTimer();
-#elif RPH
-            lastStepTime = Game.GameTime;
-#elif FIVEM || SHVDN3 || SHVDNC
+#elif FIVEM || RPH || SHVDN3 || SHVDNC
             lastStepTime = Game.GameTime;
 #endif
 
@@ -153,13 +151,11 @@ public override void Process()
             if (lastStepTime > 0)
             {
 #if ALTV
-                int currentTime = Alt.Natives.GetGameTimer();
+                long currentTime = Alt.Natives.GetGameTimer();
 #elif RAGEMP
-                int currentTime = Misc.GetGameTimer();
-#elif RPH
-                uint currentTime = Game.GameTime;
-#elif FIVEM || SHVDN3 || SHVDNC
-                int currentTime = Game.GameTime;
+                long currentTime = Misc.GetGameTimer();
+#elif FIVEM || RPH || SHVDN3 || SHVDNC
+                long currentTime = Game.GameTime;
 #endif
 
                 if (currentTime - lastStepTime >= 1000)