Merge branch 'main' of https://github.com/x64-dev/GeneralsGameCode_GeneralsOnline

Author: x64-dev

GeneralsMD/Code/GameEngine/Include/Common/GameLOD.h

@@ -235,7 +235,7 @@ class GameLODManager
 	bool m_userShadowDecalsEnabled;
 	bool m_userHeatEffectsEnabled;
 	bool m_isQualityReduced;
-	int  m_sustainedGoodFrames;
+	int  m_stableFPSDuration;
 	DynamicGameLODLevel m_userDynamicLOD;
 #endif
 };

GeneralsMD/Code/GameEngine/Source/Common/GameLOD.cpp

@@ -236,7 +236,7 @@ GameLODManager::GameLODManager(void)
 	m_userShadowDecalsEnabled = true;
 	m_userHeatEffectsEnabled = true;
 	m_isQualityReduced = false;
-	m_sustainedGoodFrames = 0;
+	m_stableFPSDuration = 0;
 	m_userDynamicLOD = DYNAMIC_GAME_LOD_VERY_HIGH;
 #endif
 
@@ -802,7 +802,7 @@ void GameLODManager::updateGraphicsQualityState(float averageFPS)
 		if (TheGameClient)
 			TheGameClient->allocateShadows();
 		m_isQualityReduced = false;
-		m_sustainedGoodFrames = 0;
+		m_stableFPSDuration = 0;
 	}
 
 	if (!m_isQualityReduced)
@@ -813,7 +813,7 @@ void GameLODManager::updateGraphicsQualityState(float averageFPS)
 		m_userDynamicLOD = m_currentDynamicLOD;
 	}
 
-	m_sustainedGoodFrames = (averageFPS >= 58.0f) ? (m_sustainedGoodFrames + 1) : 0; // Track a duration of sustained good performance
+	m_stableFPSDuration = (averageFPS >= 58.0f) ? (m_stableFPSDuration + 1) : 0; // Track a duration of sustained good performance
 
 	bool shouldReduceQuality = (averageFPS < 56.0f && TheGameClient && TheGameClient->getFrame() > LOGICFRAMES_PER_SECOND * 10);
 	if (shouldReduceQuality && !m_isQualityReduced)
@@ -829,7 +829,7 @@ void GameLODManager::updateGraphicsQualityState(float averageFPS)
 	// Restore to user preferences after sustained good performance
 	else if (!shouldReduceQuality && m_isQualityReduced)
 	{
-		if (m_sustainedGoodFrames > 300)
+		if (m_stableFPSDuration > 20)
 		{
 			TheWritableGlobalData->m_useShadowVolumes = m_userShadowVolumesEnabled;
 			TheWritableGlobalData->m_useShadowDecals = m_userShadowDecalsEnabled;
@@ -842,7 +842,7 @@ void GameLODManager::updateGraphicsQualityState(float averageFPS)
 			TheGameLODManager->setDynamicLODLevel(lod);
 
 			m_isQualityReduced = false;
-			m_sustainedGoodFrames = 0;
+			m_stableFPSDuration = 0;
 		}
 	}
 }

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp

@@ -1337,6 +1337,20 @@ void WOLDisplaySlotList( void )
 		NGMPGameSlot *slot = game->getGameSpySlot(i);
 		if (slot && slot->isHuman())
 		{
+            // Determine friends and highlight in cyan
+			Color nameColor = GameSpyColor[GSCOLOR_PLAYER_NORMAL];
+			NGMP_OnlineServices_SocialInterface* pSocialInterface = NGMP_OnlineServicesManager::GetInterface<NGMP_OnlineServices_SocialInterface>();
+
+			if (pSocialInterface != nullptr && pSocialInterface->IsUserFriend(slot->m_userID))
+			{
+				nameColor = GameMakeColor(7, 183, 247, 255);
+			}
+
+			if (comboBoxPlayer[i])
+			{
+				GadgetTextEntrySetTextColor(GadgetComboBoxGetEditBox(comboBoxPlayer[i]), nameColor);
+			}
+            
 			bool bIsConnected = false;
 			int latency = -1;
 			std::string strConnectionType = "";

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp

@@ -1687,7 +1687,8 @@ void W3DDisplay::draw( void )
 
 	updateAverageFPS();
 #if defined(GENERALS_ONLINE_HIGH_FPS_SERVER)
-	TheGameLODManager->updateGraphicsQualityState(m_averageFPS);
+	if (TheGameLogic && (TheGameLogic->getFrame() % LOGICFRAMES_PER_SECOND) == 0)
+		TheGameLODManager->updateGraphicsQualityState(m_averageFPS);
 #else
 	if (TheGlobalData->m_enableDynamicLOD && TheGameLogic->getShowDynamicLOD())
 	{