reimplement: OpenSHC::Random::RNG 100%

Author: sourcehold

src/OpenSHC/Random/RNG.func.hpp

@@ -7,16 +7,16 @@ namespace OpenSHC {
 namespace Random {
     namespace RNG_Func {
 
-        MACRO_FUNCTION_RESOLVER(void (RNG::*)(), false, Address::SHC_3BB0A8C1_0x0046A740, &RNG::setTimeBasedSeed)
+        MACRO_FUNCTION_RESOLVER(void (RNG::*)(), true, Address::SHC_3BB0A8C1_0x0046A740, &RNG::setTimeBasedSeed)
         setTimeBasedSeed;
 
-        MACRO_FUNCTION_RESOLVER(void (RNG::*)(), false, Address::SHC_3BB0A8C1_0x0046A760, &RNG::populateRNG1040)
+        MACRO_FUNCTION_RESOLVER(void (RNG::*)(), true, Address::SHC_3BB0A8C1_0x0046A760, &RNG::populateRNG1040)
         populateRNG1040;
 
-        MACRO_FUNCTION_RESOLVER(void (RNG::*)(), false, Address::SHC_3BB0A8C1_0x0046A7D0, &RNG::nextRandomNumber2)
+        MACRO_FUNCTION_RESOLVER(void (RNG::*)(), true, Address::SHC_3BB0A8C1_0x0046A7D0, &RNG::nextRandomNumber2)
         nextRandomNumber2;
 
-        MACRO_FUNCTION_RESOLVER(void (RNG::*)(), false, Address::SHC_3BB0A8C1_0x0046A800, &RNG::nextRandomNumber1)
+        MACRO_FUNCTION_RESOLVER(void (RNG::*)(), true, Address::SHC_3BB0A8C1_0x0046A800, &RNG::nextRandomNumber1)
         nextRandomNumber1;
 
     } // namespace RNG_Func

src/OpenSHC/Random/RNG/Constructor_RNG.cpp

@@ -0,0 +1,17 @@
+#include "OpenSHC/Random/RNG.func.hpp"
+#include "OpenSHC/Random/RNG.hpp"
+
+namespace OpenSHC {
+namespace Random {
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x00471810
+    RNG* RNG::Constructor_RNG()
+
+    {
+        MACRO_CALL_MEMBER(RNG_Func::setTimeBasedSeed, this)();
+        MACRO_CALL_MEMBER(RNG_Func::populateRNG1040, this)();
+        return this;
+    }
+
+}
+}

src/OpenSHC/Random/RNG/nextRandomNumber1.cpp

@@ -0,0 +1,19 @@
+
+#include "OpenSHC/Random/RNG.hpp"
+
+namespace OpenSHC {
+namespace Random {
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x0046a800
+    void RNG::nextRandomNumber1()
+    {
+        this->currentNumber1 = this->randomNumbers[this->index1];
+        this->index1 = this->index1 + 1;
+        if (20000 <= this->index1) {
+            this->index1 = 0;
+        }
+        return;
+    }
+}
+
+}

src/OpenSHC/Random/RNG/nextRandomNumber2.cpp

@@ -0,0 +1,19 @@
+
+#include "OpenSHC/Random/RNG.hpp"
+
+namespace OpenSHC {
+namespace Random {
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x0046a7d0
+    void RNG::nextRandomNumber2()
+    {
+        this->currentNumber2 = this->randomNumbers[this->index2];
+        this->index2 = this->index2 + 1;
+        if (20000 <= this->index2) {
+            this->index2 = 0;
+        }
+        return;
+    }
+}
+
+}

src/OpenSHC/Random/RNG/populateRNG1040.cpp

@@ -0,0 +1,39 @@
+#include "OpenSHC/Global.func.hpp"
+#include "OpenSHC/OS.func.hpp"
+#include "OpenSHC/Random/RNG.func.hpp"
+#include "OpenSHC/Random/RNG.hpp"
+
+namespace OpenSHC {
+namespace Random {
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x0046a760
+    void RNG::populateRNG1040()
+
+    {
+        int iVar1;
+        int iVar2;
+        short* _pRandomNumber;
+
+        MACRO_CALL(OpenSHC::Global_Func::SetRNGSeed)(this->seed);
+        this->index2 = 0;
+        this->index1 = 0;
+        _pRandomNumber = &this->randomNumbers[0];
+        iVar2 = 20000;
+        do {
+            iVar1 = MACRO_CALL(OpenSHC::OS_Func::_rand)();
+            *_pRandomNumber = (short)iVar1;
+            _pRandomNumber = _pRandomNumber + 1;
+            iVar2 = iVar2 + -1;
+        } while (iVar2 != 0);
+
+        this->currentNumber2 = this->randomNumbers[this->index2];
+        this->index2 = this->index2 + 1;
+
+        this->currentNumber1 = this->randomNumbers[this->index1];
+        this->index1 = this->index1 + 1;
+
+        return;
+    }
+
+}
+}

src/OpenSHC/Random/RNG/setTimeBasedSeed.cpp

@@ -0,0 +1,20 @@
+#include "OpenSHC/OS.func.hpp"
+#include "OpenSHC/Random/RNG.func.hpp"
+#include "OpenSHC/Random/RNG.hpp"
+#include <time.h>
+
+namespace OpenSHC {
+namespace Random {
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x0046a740
+    void RNG::setTimeBasedSeed()
+
+    {
+
+        __time64_t _Var1 = MACRO_CALL(OpenSHC::OS_Func::__time64)((__time64_t*)0x0);
+        this->seed = (int)_Var1;
+        return;
+    }
+
+}
+}

status/addresses-SHC-3BB0A8C1.txt

@@ -10168,10 +10168,10 @@ SHC_3BB0A8C1_0x0046A4C4 | 0.0% | Pending
 SHC_3BB0A8C1_0x0046A4C8 | 0.0% | Pending
 SHC_3BB0A8C1_0x0046A4D0 | 0.0% | Pending
 SHC_3BB0A8C1_0x0046A720 | 0.0% | Pending
-SHC_3BB0A8C1_0x0046A740 | 0.0% | Pending
-SHC_3BB0A8C1_0x0046A760 | 0.0% | Pending
-SHC_3BB0A8C1_0x0046A7D0 | 0.0% | Pending
-SHC_3BB0A8C1_0x0046A800 | 0.0% | Pending
+SHC_3BB0A8C1_0x0046A740 | 100.0% | Reimplemented
+SHC_3BB0A8C1_0x0046A760 | 100.0% | Reimplemented
+SHC_3BB0A8C1_0x0046A7D0 | 100.0% | Reimplemented
+SHC_3BB0A8C1_0x0046A800 | 100.0% | Reimplemented
 SHC_3BB0A8C1_0x0046A830 | 0.0% | Pending
 SHC_3BB0A8C1_0x0046A850 | 0.0% | Pending
 SHC_3BB0A8C1_0x0046A890 | 0.0% | Pending
@@ -10475,7 +10475,7 @@ SHC_3BB0A8C1_0x004717F8 | 0.0% | Pending
 SHC_3BB0A8C1_0x004717FC | 0.0% | Pending
 SHC_3BB0A8C1_0x00471800 | 0.0% | Pending
 SHC_3BB0A8C1_0x00471804 | 0.0% | Pending
-SHC_3BB0A8C1_0x00471810 | 0.0% | Pending
+SHC_3BB0A8C1_0x00471810 | 100.0% | Reimplemented
 SHC_3BB0A8C1_0x00471830 | 0.0% | Pending
 SHC_3BB0A8C1_0x00471860 | 0.0% | Pending
 SHC_3BB0A8C1_0x00471890 | 0.0% | Pending