refactor(random): Reorder RandomValue function definitions (2) (TheSuperHackers#2405)

Author: Caball009

Core/GameEngine/Source/Common/RandomValue.cpp

@@ -65,50 +65,16 @@ static UnsignedInt theGameLogicSeed[6] =
     0xf22d0e56L, 0x883126e9L, 0xc624dd2fL, 0x702c49cL, 0x9e353f7dL, 0x6fdf3b64L
 };
 
-// Add with carry. SUM is replaced with A + B + C, C is replaced with 1  if there was a carry, 0 if there wasn't. A carry occurred if the sum is  less than one of the inputs. This is addition, so carry can never be  more than one.
-#define ADC(SUM, A, B, C)   SUM = (A) + (B) + (C); C = ((SUM < (A)) || (SUM < (B)))
-
-static UnsignedInt randomValue(UnsignedInt *seed)
+UnsignedInt GetGameLogicRandomSeed()
 {
-	UnsignedInt ax;
-	UnsignedInt c = 0;
-
-
-	ADC(ax, seed[5], seed[4], c);   /*  mov     ax,seed+20  */
-	/*  add     ax,seed+16  */
-	seed[4] = ax;                   /*  mov     seed+8,ax   */
-
-	ADC(ax, ax, seed[3], c);        /*  adc     ax,seed+12  */
-	seed[3] = ax;                   /*  mov     seed+12,ax  */
-
-	ADC(ax, ax, seed[2], c);        /*  adc     ax,seed+8   */
-	seed[2] = ax;                   /*  mov     seed+8,ax   */
-
-	ADC(ax, ax, seed[1], c);        /*  adc     ax,seed+4   */
-	seed[1] = ax;                   /*  mov     seed+4,ax   */
-
-	ADC(ax, ax, seed[0], c);        /*  adc     ax,seed+0   */
-	seed[0] = ax;                   /*  mov     seed+0,ax   */
+	return theGameLogicBaseSeed;
+}
 
-	/* Increment seed array, bubbling up the carries. */
-	if (!++seed[5])
-	{
-		if (!++seed[4])
-		{
-			if (!++seed[3])
-			{
-				if (!++seed[2])
-				{
-					if (!++seed[1])
-					{
-						++seed[0];
-						++ax;
-					}
-				}
-			}
-		}
-	}
-	return(ax);
+UnsignedInt GetGameLogicRandomSeedCRC()
+{
+	CRC c;
+	c.computeCRC(theGameLogicSeed, 6*sizeof(UnsignedInt));
+	return c.get();
 }
 
 static void seedRandom(UnsignedInt SEED, UnsignedInt *seed)
@@ -130,24 +96,6 @@ static void seedRandom(UnsignedInt SEED, UnsignedInt *seed)
 	seed[5] = ax;                   /* mov     seed+20,eax                  */
 }
 
-//
-// It is necessary to separate the GameClient and GameLogic usage of random
-// values to ensure that the GameLogic remains deterministic, regardless
-// of the effects displayed on the GameClient.
-//
-
-UnsignedInt GetGameLogicRandomSeed()
-{
-	return theGameLogicBaseSeed;
-}
-
-UnsignedInt GetGameLogicRandomSeedCRC()
-{
-	CRC c;
-	c.computeCRC(theGameLogicSeed, 6*sizeof(UnsignedInt));
-	return c.get();
-}
-
 void InitRandom()
 {
 #ifdef DETERMINISTIC
@@ -177,6 +125,58 @@ DEBUG_LOG(( "InitRandom %08lx",seed));
 #endif
 }
 
+// Add with carry. SUM is replaced with A + B + C, C is replaced with 1  if there was a carry, 0 if there wasn't. A carry occurred if the sum is  less than one of the inputs. This is addition, so carry can never be  more than one.
+#define ADC(SUM, A, B, C)   SUM = (A) + (B) + (C); C = ((SUM < (A)) || (SUM < (B)))
+
+static UnsignedInt randomValue(UnsignedInt *seed)
+{
+	UnsignedInt ax;
+	UnsignedInt c = 0;
+
+
+	ADC(ax, seed[5], seed[4], c);   /*  mov     ax,seed+20  */
+	/*  add     ax,seed+16  */
+	seed[4] = ax;                   /*  mov     seed+8,ax   */
+
+	ADC(ax, ax, seed[3], c);        /*  adc     ax,seed+12  */
+	seed[3] = ax;                   /*  mov     seed+12,ax  */
+
+	ADC(ax, ax, seed[2], c);        /*  adc     ax,seed+8   */
+	seed[2] = ax;                   /*  mov     seed+8,ax   */
+
+	ADC(ax, ax, seed[1], c);        /*  adc     ax,seed+4   */
+	seed[1] = ax;                   /*  mov     seed+4,ax   */
+
+	ADC(ax, ax, seed[0], c);        /*  adc     ax,seed+0   */
+	seed[0] = ax;                   /*  mov     seed+0,ax   */
+
+	/* Increment seed array, bubbling up the carries. */
+	if (!++seed[5])
+	{
+		if (!++seed[4])
+		{
+			if (!++seed[3])
+			{
+				if (!++seed[2])
+				{
+					if (!++seed[1])
+					{
+						++seed[0];
+						++ax;
+					}
+				}
+			}
+		}
+	}
+	return(ax);
+}
+
+//
+// It is necessary to separate the GameClient and GameLogic usage of random
+// values to ensure that the GameLogic remains deterministic, regardless
+// of the effects displayed on the GameClient.
+//
+
 //
 // Integer random value
 //