improve style

Author: sourcehold

src/OpenSHC/Random/RNG/Constructor_RNG.cpp

@@ -6,7 +6,6 @@ namespace Random {
 
     // FUNCTION: STRONGHOLDCRUSADER 0x00471810
     RNG* RNG::Constructor_RNG()
-
     {
         MACRO_CALL_MEMBER(RNG_Func::setTimeBasedSeed, this)();
         MACRO_CALL_MEMBER(RNG_Func::populateRNG1040, this)();

src/OpenSHC/Random/RNG/nextRandomNumber1.cpp

@@ -8,11 +8,10 @@ namespace Random {
     void RNG::nextRandomNumber1()
     {
         this->currentNumber1 = this->randomNumbers[this->index1];
-        this->index1 = this->index1 + 1;
-        if (20000 <= this->index1) {
+        this->index1 += 1;
+        if (sizeof(this->randomNumbers) / sizeof(this->randomNumbers[0]) <= this->index1) {
             this->index1 = 0;
         }
-        return;
     }
 }
 

src/OpenSHC/Random/RNG/nextRandomNumber2.cpp

@@ -9,7 +9,7 @@ namespace Random {
     {
         this->currentNumber2 = this->randomNumbers[this->index2];
         this->index2 = this->index2 + 1;
-        if (20000 <= this->index2) {
+        if (sizeof(this->randomNumbers) / sizeof(this->randomNumbers[0]) <= this->index2) {
             this->index2 = 0;
         }
         return;

src/OpenSHC/Random/RNG/populateRNG1040.cpp

@@ -14,14 +14,9 @@ namespace Random {
         MACRO_CALL(OpenSHC::Global_Func::SetRNGSeed)(this->seed);
         this->index2 = 0;
         this->index1 = 0;
-        short* _pRandomNumber = &this->randomNumbers[0];
-        int n = 20000;
-        do {
-            int random = MACRO_CALL(OpenSHC::OS_Func::_rand)();
-            *_pRandomNumber = (short)random;
-            _pRandomNumber += 1;
-            n -= 1;
-        } while (n != 0);
+        for (int i = 0; i < sizeof(this->randomNumbers) / sizeof(this->randomNumbers[0]); i++) {
+            this->randomNumbers[i] = MACRO_CALL(OpenSHC::OS_Func::_rand)();
+        }
 
         this->currentNumber2 = this->randomNumbers[this->index2];
         this->index2 += 1;