bugfix(radar): Refresh radar objects without delay when changing player

Author: xezon

Core/GameEngine/Source/Common/GameUtility.cpp

@@ -43,6 +43,7 @@ static void changePlayerCommon(Player* player)
 	ThePartitionManager->refreshShroudForLocalPlayer();
 	TheGhostObjectManager->setLocalPlayerIndex(player->getPlayerIndex());
 	TheGameClient->updateFakeDrawables();
+	TheRadar->refreshObjects();
 	TheInGameUI->deselectAllDrawables();
 }
 

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

@@ -215,6 +215,9 @@ class Radar : public Snapshot,
 	/// refresh the water values for the radar
 	virtual void refreshTerrain( TerrainLogic *terrain );
 
+	/// refresh the radar when the state of world objects changes drastically
+	virtual void refreshObjects() {};
+
 	/// queue a refresh of the terran at the next available time
 	virtual void queueTerrainRefresh( void );
 

GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h

@@ -278,7 +278,7 @@ enum TerrainDecalType CPP_11(: Int)
 
 //-----------------------------------------------------------------------------
 
-CONSTEXPR const UnsignedInt InvalidShroudClearFrame = ~0u;
+constexpr const UnsignedInt InvalidShroudClearFrame = ~0u;
 
 const Int DRAWABLE_FRAMES_PER_FLASH = LOGICFRAMES_PER_SECOND / 2;
 

GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h

@@ -72,6 +72,7 @@ class W3DRadar : public Radar
 	virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting);
 
 	virtual void refreshTerrain( TerrainLogic *terrain );
+	virtual void refreshObjects();
 
 protected:
 
@@ -85,6 +86,7 @@ class W3DRadar : public Radar
 	void drawViewBox( Int pixelX, Int pixelY, Int width, Int height );  ///< draw view box
 	void buildTerrainTexture( TerrainLogic *terrain );	 ///< create the terrain texture of the radar
 	void drawIcons( Int pixelX, Int pixelY, Int width, Int height );	///< draw all of the radar icons
+	void updateObjectTexture(TextureClass *texture);
 	void renderObjectList( const RadarObject *listHead, TextureClass *texture, Bool calcHero = FALSE );			 ///< render an object list to the texture
 	void interpolateColorForHeight( RGBColor *color,
 																	Real height,

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp

@@ -611,6 +611,20 @@ void W3DRadar::drawIcons( Int pixelX, Int pixelY, Int width, Int height )
 	}
 }
 
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void W3DRadar::updateObjectTexture(TextureClass *texture)
+{
+	// reset the overlay texture
+	SurfaceClass *surface = texture->Get_Surface_Level();
+	surface->Clear();
+	REF_PTR_RELEASE(surface);
+
+	// rebuild the object overlay
+	renderObjectList( getObjectList(), texture );
+	renderObjectList( getLocalObjectList(), texture, TRUE );
+}
+
 //-------------------------------------------------------------------------------------------------
 /** Render an object list into the texture passed in */
 //-------------------------------------------------------------------------------------------------
@@ -1431,16 +1445,7 @@ void W3DRadar::draw( Int pixelX, Int pixelY, Int width, Int height )
 	// refresh the overlay texture once every so many frames
 	if( TheGameClient->getFrame() % OVERLAY_REFRESH_RATE == 0 )
 	{
-
-		// reset the overlay texture
-		SurfaceClass *surface = m_overlayTexture->Get_Surface_Level();
-		surface->Clear();
-		REF_PTR_RELEASE(surface);
-
-		// rebuild the object overlay
-		renderObjectList( getObjectList(), m_overlayTexture );
-		renderObjectList( getLocalObjectList(), m_overlayTexture, TRUE );
-
+		updateObjectTexture(m_overlayTexture);
 	}
 
 	// draw the overlay image
@@ -1489,6 +1494,18 @@ void W3DRadar::refreshTerrain( TerrainLogic *terrain )
 
 }
 
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DRadar::refreshObjects()
+{
+	if constexpr (OVERLAY_REFRESH_RATE > 1)
+	{
+		if (m_overlayTexture != NULL)
+		{
+			updateObjectTexture(m_overlayTexture);
+		}
+	}
+}