Renamed functions and macros again.

Author: Caball009

Core/GameEngine/Include/GameLogic/LogicRandomValue.h

@@ -33,15 +33,15 @@
 
 // do NOT use these functions directly, rather use the macros below
 extern Int GetGameLogicRandomValue( int lo, int hi, const char *file, int line );
-extern Int GetGameLogicCurrentRandomValue(int lo, int hi, const char* file, int line);
+extern Int GetGameLogicRandomValueUnchanged(int lo, int hi, const char* file, int line);
 extern Real GetGameLogicRandomValueReal( Real lo, Real hi, const char *file, int line );
-extern Real GetGameLogicCurrentRandomValueReal(Real lo, Real hi, const char* file, int line);
+extern Real GetGameLogicRandomValueRealUnchanged(Real lo, Real hi, const char* file, int line);
 
 // use these macros to access the random value functions
 #define GameLogicRandomValue( lo, hi ) GetGameLogicRandomValue( lo, hi, __FILE__, __LINE__ )
-#define GameLogicCurrentRandomValue( lo, hi ) GetGameLogicCurrentRandomValue( lo, hi, __FILE__, __LINE__ )
+#define GameLogicRandomValueUnchanged( lo, hi ) GetGameLogicRandomValueUnchanged( lo, hi, __FILE__, __LINE__ )
 #define GameLogicRandomValueReal( lo, hi ) GetGameLogicRandomValueReal( lo, hi, __FILE__, __LINE__ )
-#define GameLogicCurrentRandomValueReal( lo, hi ) GetGameLogicCurrentRandomValueReal( lo, hi, __FILE__, __LINE__ )
+#define GameLogicRandomValueRealUnchanged( lo, hi ) GetGameLogicRandomValueRealUnchanged( lo, hi, __FILE__, __LINE__ )
 
 //--------------------------------------------------------------------------------------------------------------
 class CColorAlphaDialog;

Core/GameEngine/Source/Common/Audio/AudioEventRTS.cpp

@@ -340,7 +340,7 @@ void AudioEventRTS::generateFilename( void )
 		{
 			if (m_isLogicalAudio)
 			{
-				which = GameLogicCurrentRandomValue(0, m_eventInfo->m_sounds.size() - 1);
+				which = GameLogicRandomValueUnchanged(0, m_eventInfo->m_sounds.size() - 1);
 			}
 			else
 			{
@@ -388,7 +388,7 @@ void AudioEventRTS::generatePlayInfo( void )
 		// needs to be logic because it needs to be the same on all systems.
 		Int attackToPlay;
 		if (m_isLogicalAudio) {
-			attackToPlay = GameLogicCurrentRandomValue(0, attackSize - 1);
+			attackToPlay = GameLogicRandomValueUnchanged(0, attackSize - 1);
 		} else {
 			attackToPlay = GameAudioRandomValue(0, attackSize - 1);
 		}
@@ -406,7 +406,7 @@ void AudioEventRTS::generatePlayInfo( void )
 		// needs to be logic because it needs to be the same on all systems.
 		Int decayToPlay;
 		if (m_isLogicalAudio) {
-			decayToPlay = GameLogicCurrentRandomValue(0, decaySize - 1);
+			decayToPlay = GameLogicRandomValueUnchanged(0, decaySize - 1);
 		} else {
 			decayToPlay = GameAudioRandomValue(0, decaySize - 1);
 		}

Core/GameEngine/Source/Common/RandomValue.cpp

@@ -234,7 +234,7 @@ DEBUG_LOG(( "%d: GetGameLogicRandomValue = %d (%d - %d), %s line %d",
 // The intended use case for this function are randomized values that are desirable to be synchronized across clients,
 // but should not result in a mismatch if they aren't; e.g. for scripted audio events.
 //
-Int GetGameLogicCurrentRandomValue( int lo, int hi, const char *file, int line )
+Int GetGameLogicRandomValueUnchanged( int lo, int hi, const char *file, int line )
 {
 #if RETAIL_COMPATIBLE_CRC
 	return GetGameLogicRandomValue(lo, hi, file, line);
@@ -252,7 +252,7 @@ Int GetGameLogicCurrentRandomValue( int lo, int hi, const char *file, int line )
 	DEBUG_ASSERTCRASH(rval >= lo && rval <= hi, ("Bad random val"));
 
 #ifdef DEBUG_RANDOM_LOGIC
-	DEBUG_LOG(( "%d: GetGameLogicCurrentRandomValue = %d (%d - %d), %s line %d",
+	DEBUG_LOG(( "%d: GetGameLogicRandomValueUnchanged = %d (%d - %d), %s line %d",
 		TheGameLogic->getFrame(), rval, lo, hi, file, line ));
 #endif
 
@@ -335,7 +335,7 @@ DEBUG_LOG(( "%d: GetGameLogicRandomValueReal = %f, %s line %d",
 // The intended use case for this function are randomized values that are desirable to be synchronized across clients,
 // but should not result in a mismatch if they aren't; e.g. for scripted audio events.
 //
-Real GetGameLogicCurrentRandomValueReal( Real lo, Real hi, const char *file, int line )
+Real GetGameLogicRandomValueRealUnchanged( Real lo, Real hi, const char *file, int line )
 {
 #if RETAIL_COMPATIBLE_CRC
 	return GetGameLogicRandomValueReal(lo, hi, file, line);
@@ -353,7 +353,7 @@ Real GetGameLogicCurrentRandomValueReal( Real lo, Real hi, const char *file, int
 	DEBUG_ASSERTCRASH(rval >= lo && rval <= hi, ("Bad random val"));
 
 #ifdef DEBUG_RANDOM_LOGIC
-	DEBUG_LOG(( "%d: GetGameLogicCurrentRandomValueReal = %f, %s line %d",
+	DEBUG_LOG(( "%d: GetGameLogicRandomValueRealUnchanged = %f, %s line %d",
 		TheGameLogic->getFrame(), rval, file, line ));
 #endif