unify(radar): Merge and move ObjectStatusTypes, Radar, W3DRadar to Core

Core/GameEngine/CMakeLists.txt

@@ -81,7 +81,7 @@ set(GAMEENGINE_SRC
 #    Include/Common/Money.h
 #    Include/Common/MultiplayerSettings.h
 #    Include/Common/NameKeyGenerator.h
-#    Include/Common/ObjectStatusTypes.h
+    Include/Common/ObjectStatusTypes.h
 #    Include/Common/OSDisplay.h
 #    Include/Common/Overridable.h
 #    Include/Common/Override.h
@@ -94,7 +94,7 @@ set(GAMEENGINE_SRC
 #    Include/Common/ProductionPrerequisite.h
 #    Include/Common/QuickmatchPreferences.h
 #    Include/Common/QuotedPrintable.h
-#    Include/Common/Radar.h
+    Include/Common/Radar.h
     Include/Common/RAMFile.h
     Include/Common/RandomValue.h
 #    Include/Common/Recorder.h
@@ -660,9 +660,9 @@ set(GAMEENGINE_SRC
 #    Source/Common/System/List.cpp
     Source/Common/System/LocalFile.cpp
     Source/Common/System/LocalFileSystem.cpp
-#    Source/Common/System/ObjectStatusTypes.cpp
+    Source/Common/System/ObjectStatusTypes.cpp
 #    Source/Common/System/QuotedPrintable.cpp
-#    Source/Common/System/Radar.cpp
+    Source/Common/System/Radar.cpp
     Source/Common/System/RAMFile.cpp
 #    Source/Common/System/registry.cpp
 #    Source/Common/System/SaveGame/GameState.cpp

GeneralsMD/Code/GameEngine/Include/Common/ObjectStatusTypes.h → Core/GameEngine/Include/Common/ObjectStatusTypes.h

@@ -70,6 +70,9 @@ enum ObjectStatusTypes CPP_11(: Int)
 	OBJECT_STATUS_NO_ATTACK_FROM_AI,		///< attacking this object may not be done from commandSource == CMD_FROM_AI
 	OBJECT_STATUS_IGNORING_STEALTH,			///< temporarily ignoring all stealth bits. (used only for some special-case mine clearing stuff.)
 	OBJECT_STATUS_IS_CARBOMB,						///< Object is now a carbomb.
+
+	// TheSuperHackers @info New statuses added in Zero Hour
+	// Note: Loading old save games that do not track these flags in objects will not recover them. Expect logic bugs.
 	OBJECT_STATUS_DECK_HEIGHT_OFFSET,		///< Object factors deck height on top of ground altitude.
 	OBJECT_STATUS_RIDER1,
 	OBJECT_STATUS_RIDER2,

Generals/Code/GameEngine/Include/Common/Radar.h → Core/GameEngine/Include/Common/Radar.h

@@ -1,5 +1,5 @@
 /*
-**	Command & Conquer Generals(tm)
+**	Command & Conquer Generals Zero Hour(tm)
 **	Copyright 2025 Electronic Arts Inc.
 **
 **	This program is free software: you can redistribute it and/or modify

GeneralsMD/Code/GameEngine/Source/Common/System/ObjectStatusTypes.cpp → Core/GameEngine/Source/Common/System/ObjectStatusTypes.cpp

@@ -64,6 +64,7 @@ const char* const ObjectStatusMaskType::s_bitNameList[] =
 	"NO_ATTACK_FROM_AI",
 	"IGNORING_STEALTH",
 	"IS_CARBOMB",
+	// TheSuperHackers @info New statuses added in Zero Hour
 	"DECK_HEIGHT_OFFSET",
 	"STATUS_RIDER1",
 	"STATUS_RIDER2",

GeneralsMD/Code/GameEngine/Source/Common/System/Radar.cpp → Core/GameEngine/Source/Common/System/Radar.cpp

@@ -362,15 +362,15 @@ void Radar::newMap( TerrainLogic *terrain )
 	m_waterAverageZ = 0.0f;
 	Coord3D worldPoint;
 
-  // since we're averaging let's skip every second sample...
-  worldPoint.y=0;
+	// since we're averaging let's skip every second sample...
+	worldPoint.y=0;
 	for( y = 0; y < RADAR_CELL_HEIGHT; y+=2, worldPoint.y+=2.0*m_ySample )
-  {
-    worldPoint.x=0;
-    for( x = 0; x < RADAR_CELL_WIDTH; x+=2, worldPoint.x+=2.0*m_xSample )
+	{
+		worldPoint.x=0;
+		for( x = 0; x < RADAR_CELL_WIDTH; x+=2, worldPoint.x+=2.0*m_xSample )
 		{
 			// don't use this, we don't really need the
-      // Z position by this function... radarToWorld( &radarPoint, &worldPoint );
+			// Z position by this function... radarToWorld( &radarPoint, &worldPoint );
 			// and this is done by isUnderwater anyway: z = terrain->getGroundHeight( worldPoint.x, worldPoint.y );
 			Real z,waterZ;
 			if( terrain->isUnderwater( worldPoint.x, worldPoint.y, &waterZ, &z ) )
@@ -383,9 +383,8 @@ void Radar::newMap( TerrainLogic *terrain )
 				m_terrainAverageZ += z;
 				terrainSamples++;
 			}
-
 		}
-  }
+	}
 
 	// avoid divide by zeros
 	if( terrainSamples == 0 )
@@ -436,7 +435,7 @@ RadarObjectType Radar::addObject( Object *obj )
 		//Because we have support for disguised units pretending to be units from another
 		//team, we need to intercept it here and make sure it's rendered appropriately
 		//based on which client is rendering it.
-    StealthUpdate *update = obj->getStealth();
+		StealthUpdate *update = obj->getStealth();
 		if( update )
 		{
 			if( update->isDisguised() )
@@ -1506,7 +1505,7 @@ void Radar::xfer( Xfer *xfer )
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
-	
+
 	if (version <= 1)
 	{
 		const Int localPlayerIndex = ThePlayerList->getLocalPlayer()->getPlayerIndex();

Core/GameEngineDevice/CMakeLists.txt

@@ -4,7 +4,7 @@ set(GAMEENGINEDEVICE_SRC
 #    Include/W3DDevice/Common/W3DConvert.h
 #    Include/W3DDevice/Common/W3DFunctionLexicon.h
 #    Include/W3DDevice/Common/W3DModuleFactory.h
-#    Include/W3DDevice/Common/W3DRadar.h
+    Include/W3DDevice/Common/W3DRadar.h
 #    Include/W3DDevice/Common/W3DThingFactory.h
 #    Include/W3DDevice/GameClient/BaseHeightMap.h
 #    Include/W3DDevice/GameClient/camerashakesystem.h
@@ -93,7 +93,7 @@ set(GAMEENGINEDEVICE_SRC
     Source/MilesAudioDevice/MilesAudioManager.cpp
     Source/VideoDevice/Bink/BinkVideoPlayer.cpp
 #    Source/W3DDevice/Common/System/W3DFunctionLexicon.cpp
-#    Source/W3DDevice/Common/System/W3DRadar.cpp
+    Source/W3DDevice/Common/System/W3DRadar.cpp
 #    Source/W3DDevice/Common/Thing/W3DModuleFactory.cpp
 #    Source/W3DDevice/Common/Thing/W3DThingFactory.cpp
 #    Source/W3DDevice/Common/W3DConvert.cpp

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

@@ -890,8 +890,8 @@ void W3DRadar::init( void )
 	DEBUG_ASSERTCRASH( m_overlayTexture, ("W3DRadar: Unable to allocate overlay texture") );
 
 	// set filter type for the overlay texture, try it and see if you like it, I don't ;)
-//	m_overlayTexture->Set_Min_Filter( TextureClass::FILTER_TYPE_NONE );
-//	m_overlayTexture->Set_Mag_Filter( TextureClass::FILTER_TYPE_NONE );
+//	m_overlayTexture->Set_Min_Filter( TextureFilterClass::FILTER_TYPE_NONE );
+//	m_overlayTexture->Set_Mag_Filter( TextureFilterClass::FILTER_TYPE_NONE );
 
 	// allocate our shroud texture
 	m_shroudTexture = MSGNEW("TextureClass") TextureClass( m_textureWidth, m_textureHeight,
@@ -1136,7 +1136,7 @@ void W3DRadar::buildTerrainTexture( TerrainLogic *terrain )
 								radarToWorld2D( &radarPoint, &worldPoint );
 
 								// get color for this Z and add to our sample color
-                Real underwaterZ;
+								Real underwaterZ;
 								if( terrain->isUnderwater( worldPoint.x, worldPoint.y, NULL, &underwaterZ ) )
 								{
 									// this is our "color" for water
@@ -1544,7 +1544,7 @@ void W3DRadar::refreshObjects()
 		// they are godlike and can see everything)
  		//
  		if( obj->getRadarPriority() == RADAR_PRIORITY_LOCAL_UNIT_ONLY &&
- 				obj->getControllingPlayer() != player &&
+				obj->getControllingPlayer() != player &&
 				player->isPlayerActive() )
  			continue;
 

Generals/Code/GameEngine/CMakeLists.txt

@@ -74,7 +74,7 @@ set(GAMEENGINE_SRC
     Include/Common/Money.h
     Include/Common/MultiplayerSettings.h
     Include/Common/NameKeyGenerator.h
-    Include/Common/ObjectStatusTypes.h
+#    Include/Common/ObjectStatusTypes.h
     Include/Common/OSDisplay.h
     Include/Common/Overridable.h
     Include/Common/Override.h
@@ -87,7 +87,7 @@ set(GAMEENGINE_SRC
     Include/Common/ProductionPrerequisite.h
     Include/Common/QuickmatchPreferences.h
     Include/Common/QuotedPrintable.h
-    Include/Common/Radar.h
+#    Include/Common/Radar.h
 #    Include/Common/RAMFile.h
 #    Include/Common/RandomValue.h
     Include/Common/Recorder.h
@@ -610,9 +610,9 @@ set(GAMEENGINE_SRC
 #    Source/Common/System/LocalFile.cpp
 #    Source/Common/System/LocalFileSystem.cpp
     #Source/Common/System/MemoryInit.cpp
-    Source/Common/System/ObjectStatusTypes.cpp
+#    Source/Common/System/ObjectStatusTypes.cpp
     Source/Common/System/QuotedPrintable.cpp
-    Source/Common/System/Radar.cpp
+#    Source/Common/System/Radar.cpp
 #    Source/Common/System/RAMFile.cpp
     Source/Common/System/registry.cpp
     Source/Common/System/SaveGame/GameState.cpp