port Random_GetDraw

LostArtefacts · Nov 16, 2023 · 9f11231 · 9f11231
1 parent 45f78c9
commit 9f11231
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 13 deletions.
diff --git a/docs/progress.svg b/docs/progress.svg
diff --git a/docs/progress.txt b/docs/progress.txt
@@ -2710,7 +2710,7 @@ typedef enum GAME_OBJECT_ID {
 0044C850    00000113    -R      int32_t __cdecl GameStats(int32_t levelID);
 0044C970    0000001E    +       int32_t __cdecl Random_GetControl(void);
 0044C990    0000000A    +       void __cdecl Random_SeedControl(int32_t seed);
-0044C9A0    0000001E    -       int32_t __cdecl Random_GetDraw(void);
+0044C9A0    0000001E    +       int32_t __cdecl Random_GetDraw(void);
 0044C9C0    0000000A    +       void __cdecl Random_SeedDraw(int32_t seed);
 0044C9D0    00000044    -R      void __cdecl GetValidLevelsList(REQUEST_INFO *req);
 0044CA20    0000004C    -R      void __cdecl GetSavedGamesList(REQUEST_INFO *req);
@@ -2953,7 +2953,7 @@ typedef enum GAME_OBJECT_ID {
 00466480    -       double g_GameSizer = 1.0;
 00466488    -       double g_GameSizerCopy = 1.0;
 00466BB0    +       int32_t g_RandControl;
-00466BB4    -       int32_t g_RandDraw;
+00466BB4    +       int32_t g_RandDraw;
 00466F70    -       struct CONTROL_LAYOUT g_Layout[2];
 00467DD0    +       const int32_t g_AtanBaseTable[8];
 00467DF0    +       const int16_t g_AtanAngleTable[0x800];

diff --git a/src/game/random.c b/src/game/random.c
@@ -6,6 +6,7 @@
 #include <time.h>
 
 static int32_t m_RandControl = 0xD371F947;
+static int32_t m_RandDraw = 0xD371F947;
 
 void __cdecl Random_SeedControl(const int32_t seed)
 {
@@ -14,7 +15,7 @@ void __cdecl Random_SeedControl(const int32_t seed)
 
 void __cdecl Random_SeedDraw(const int32_t seed)
 {
-    g_RandDraw = seed;
+    m_RandDraw = seed;
 }
 
 int32_t __cdecl Random_GetControl(void)
@@ -23,6 +24,12 @@ int32_t __cdecl Random_GetControl(void)
     return (m_RandControl >> 10) & 0x7FFF;
 }
 
+int32_t __cdecl Random_GetDraw(void)
+{
+    m_RandDraw = 0x41C64E6D * m_RandDraw + 12345;
+    return (m_RandDraw >> 10) & 0x7FFF;
+}
+
 void __cdecl Random_Seed(void)
 {
     time_t lt = time(0);

diff --git a/src/game/random.h b/src/game/random.h
@@ -5,4 +5,5 @@
 void __cdecl Random_SeedControl(int32_t seed);
 void __cdecl Random_SeedDraw(int32_t seed);
 int32_t __cdecl Random_GetControl(void);
+int32_t __cdecl Random_GetDraw(void);
 void __cdecl Random_Seed(void);
diff --git a/src/global/funcs.h b/src/global/funcs.h
@@ -662,7 +662,6 @@
 #define LevelCompleteSequence ((int32_t __cdecl (*)(void))0x0044C670)
 #define LevelStats ((int32_t __cdecl (*)(int32_t levelID))0x0044C680)
 #define GameStats ((int32_t __cdecl (*)(int32_t levelID))0x0044C850)
-#define Random_GetDraw ((int32_t __cdecl (*)(void))0x0044C9A0)
 #define GetValidLevelsList ((void __cdecl (*)(REQUEST_INFO *req))0x0044C9D0)
 #define GetSavedGamesList ((void __cdecl (*)(REQUEST_INFO *req))0x0044CA20)
 #define DisplayCredits ((void __cdecl (*)(void))0x0044CA70)

diff --git a/src/global/vars.h b/src/global/vars.h
@@ -22,7 +22,6 @@
 #define g_TextASCIIMap (*(int8_t(*)[])0x004662E0)
 #define g_GameSizer (*(double*)0x00466480) // = 1.0
 #define g_GameSizerCopy (*(double*)0x00466488) // = 1.0
-#define g_RandDraw (*(int32_t*)0x00466BB4)
 #define g_Layout (*(struct CONTROL_LAYOUT(*)[2])0x00466F70)
 #define g_MidSort (*(int32_t*)0x0046C300) // = 0
 #define g_ViewportAspectRatio (*(float*)0x0046C304) // = 0.0f

diff --git a/src/inject_exec.c b/src/inject_exec.c
@@ -233,6 +233,7 @@ static void Inject_Random(void)
 {
     INJECT(1, 0x0044C970, Random_GetControl);
     INJECT(1, 0x0044C990, Random_SeedControl);
+    INJECT(1, 0x0044C9A0, Random_GetDraw);
     INJECT(1, 0x0044C9C0, Random_SeedDraw);
     INJECT(1, 0x0044D870, Random_Seed);
 }