[GEN][ZH] Fix Retail Mismatch in Release Build when Logging is enabled (TheSuperHackers#759)

helmutbuhler · web-flow · commit 7e18d29f7270 · 2025-06-27T16:20:39.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp
@@ -672,12 +672,15 @@ void AISkirmishPlayer::buildAIBaseDefenseStructure(const AsciiString &thingName,
 		Real s = sin(angle);
 		Real c = cos(angle);
 
-	  DEBUG_LOG(("Angle is %f sin %f, cos %f \n", 180*angle/PI, s, c));
+// TheSuperHackers @info helmutbuhler 21/04/2025 This debug mutates the code to become CRC incompatible
+#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) || !RETAIL_COMPATIBLE_CRC
+		DEBUG_LOG(("Angle is %f sin %f, cos %f \n", 180*angle/PI, s, c));
 		DEBUG_LOG(("Offset is %f  %f, new is %f, %f \n", 
 			offset.x, offset.y, 
 			offset.x*c - offset.y*s,
 			offset.y*c + offset.x*s
-			));	
+			));
+#endif
 		Coord3D buildPos = m_baseCenter;
 		buildPos.x += offset.x*c - offset.y*s;
 		buildPos.y += offset.y*c + offset.x*s;
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
@@ -4028,8 +4028,11 @@ StateReturnType AIFollowWaypointPathState::update()
 		if (getAdjustsDestination() && ai->isDoingGroundMovement()) {
 			if (!TheAI->pathfinder()->adjustDestination(obj, ai->getLocomotorSet(), &m_goalPosition)) {
 				if (m_currentWaypoint) {
+// TheSuperHackers @info helmutbuhler 05/05/2025 This debug mutates the code to become CRC incompatible
+#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) || !RETAIL_COMPATIBLE_CRC
 					DEBUG_LOG(("Breaking out of follow waypoint path %s of %s\n", 
 					m_currentWaypoint->getName().str(), m_currentWaypoint->getPathLabel1().str()));
+#endif
 				}
 				return STATE_FAILURE;
 			}
@@ -4098,8 +4101,11 @@ StateReturnType AIFollowWaypointPathState::update()
 		if (getAdjustsDestination() && ai->isDoingGroundMovement()) {
 			if (!TheAI->pathfinder()->adjustDestination(obj, ai->getLocomotorSet(), &m_goalPosition)) {
 				if (m_currentWaypoint) {
+// TheSuperHackers @info helmutbuhler 05/05/2025 This debug mutates the code to become CRC incompatible
+#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) || !RETAIL_COMPATIBLE_CRC
 					DEBUG_LOG(("Breaking out of follow waypoint path %s of %s\n", 
 					m_currentWaypoint->getName().str(), m_currentWaypoint->getPathLabel1().str()));
+#endif
 				}
 				return STATE_FAILURE;
 			}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp
@@ -93,7 +93,10 @@ inline Real calcDistSqr(const Coord3D& a, const Coord3D& b)
 Int GarrisonContain::findClosestFreeGarrisonPointIndex( Int conditionIndex, 
 																												const Coord3D *targetPos )
 {
+// TheSuperHackers @info helmutbuhler 05/05/2025 This debug mutates the code to become CRC incompatible
+#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) || !RETAIL_COMPATIBLE_CRC
 	DEBUG_ASSERTCRASH(m_garrisonPointsInitialized, ("garrisonPoints are not inited"));
+#endif
 
 	// sanity
 	if( targetPos == NULL || m_garrisonPointsInUse == MAX_GARRISON_POINTS )
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp
@@ -303,7 +303,10 @@ Real PhysicsBehavior::getZFriction() const
  */
 void PhysicsBehavior::applyForce( const Coord3D *force )
 {
+// TheSuperHackers @info helmutbuhler 06/05/2025 This debug mutates the code to become CRC incompatible
+#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) || !RETAIL_COMPATIBLE_CRC
 	DEBUG_ASSERTCRASH(!(_isnan(force->x) || _isnan(force->y) || _isnan(force->z)), ("PhysicsBehavior::applyForce force NAN!\n"));
+#endif
 	if (_isnan(force->x) || _isnan(force->y) || _isnan(force->z)) {
 		return;
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp
@@ -681,12 +681,15 @@ void AISkirmishPlayer::buildAIBaseDefenseStructure(const AsciiString &thingName,
 		Real s = sin(angle);
 		Real c = cos(angle);
 
-	  DEBUG_LOG(("buildAIBaseDefenseStructure -- Angle is %f sin %f, cos %f \n", 180*angle/PI, s, c));
+// TheSuperHackers @info helmutbuhler 21/04/2025 This debug mutates the code to become CRC incompatible
+#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) || !RETAIL_COMPATIBLE_CRC
+		DEBUG_LOG(("buildAIBaseDefenseStructure -- Angle is %f sin %f, cos %f \n", 180*angle/PI, s, c));
 		DEBUG_LOG(("buildAIBaseDefenseStructure -- Offset is %f  %f, Final Position is %f, %f \n", 
 			offset.x, offset.y, 
 			offset.x*c - offset.y*s,
 			offset.y*c + offset.x*s
-			));	
+			));
+#endif
 		Coord3D buildPos = m_baseCenter;
 		buildPos.x += offset.x*c - offset.y*s;
 		buildPos.y += offset.y*c + offset.x*s;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
@@ -4149,8 +4149,11 @@ StateReturnType AIFollowWaypointPathState::update()
 		if (getAdjustsDestination() && ai->isDoingGroundMovement()) {
 			if (!TheAI->pathfinder()->adjustDestination(obj, ai->getLocomotorSet(), &m_goalPosition)) {
 				if (m_currentWaypoint) {
+// TheSuperHackers @info helmutbuhler 05/05/2025 This debug mutates the code to become CRC incompatible
+#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) || !RETAIL_COMPATIBLE_CRC
 					DEBUG_LOG(("Breaking out of follow waypoint path %s of %s\n", 
 					m_currentWaypoint->getName().str(), m_currentWaypoint->getPathLabel1().str()));
+#endif
 				}
 				return STATE_FAILURE;
 			}
@@ -4219,8 +4222,11 @@ StateReturnType AIFollowWaypointPathState::update()
 		if (getAdjustsDestination() && ai->isDoingGroundMovement()) {
 			if (!TheAI->pathfinder()->adjustDestination(obj, ai->getLocomotorSet(), &m_goalPosition)) {
 				if (m_currentWaypoint) {
+// TheSuperHackers @info helmutbuhler 05/05/2025 This debug mutates the code to become CRC incompatible
+#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) || !RETAIL_COMPATIBLE_CRC
 					DEBUG_LOG(("Breaking out of follow waypoint path %s of %s\n", 
 					m_currentWaypoint->getName().str(), m_currentWaypoint->getPathLabel1().str()));
+#endif
 				}
 				return STATE_FAILURE;
 			}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp
@@ -94,7 +94,10 @@ inline Real calcDistSqr(const Coord3D& a, const Coord3D& b)
 Int GarrisonContain::findClosestFreeGarrisonPointIndex( Int conditionIndex, 
 																												const Coord3D *targetPos )
 {
+// TheSuperHackers @info helmutbuhler 05/05/2025 This debug mutates the code to become CRC incompatible
+#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) || !RETAIL_COMPATIBLE_CRC
 	DEBUG_ASSERTCRASH(m_garrisonPointsInitialized, ("garrisonPoints are not inited"));
+#endif
 
 	// sanity
 	if( targetPos == NULL || m_garrisonPointsInUse == MAX_GARRISON_POINTS )
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp
@@ -321,7 +321,10 @@ Real PhysicsBehavior::getZFriction() const
  */
 void PhysicsBehavior::applyForce( const Coord3D *force )
 {
+// TheSuperHackers @info helmutbuhler 06/05/2025 This debug mutates the code to become CRC incompatible
+#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) || !RETAIL_COMPATIBLE_CRC
 	DEBUG_ASSERTCRASH(!(_isnan(force->x) || _isnan(force->y) || _isnan(force->z)), ("PhysicsBehavior::applyForce force NAN!\n"));
+#endif
 	if (_isnan(force->x) || _isnan(force->y) || _isnan(force->z)) {
 		return;
 	}

Original file line number	Diff line number	Diff line change
`@@ -4028,8 +4028,11 @@ StateReturnType AIFollowWaypointPathState::update()`
`4028`	`4028`	`if (getAdjustsDestination() && ai->isDoingGroundMovement()) {`
`4029`	`4029`	`if (!TheAI->pathfinder()->adjustDestination(obj, ai->getLocomotorSet(), &m_goalPosition)) {`
`4030`	`4030`	`if (m_currentWaypoint) {`
	`4031`	`+// TheSuperHackers @info helmutbuhler 05/05/2025 This debug mutates the code to become CRC incompatible`
	`4032`	`+#if (defined(RTS_DEBUG) \|\| defined(RTS_INTERNAL)) \|\| !RETAIL_COMPATIBLE_CRC`
`4031`	`4033`	`DEBUG_LOG(("Breaking out of follow waypoint path %s of %s\n",`
`4032`	`4034`	`m_currentWaypoint->getName().str(), m_currentWaypoint->getPathLabel1().str()));`
	`4035`	`+#endif`
`4033`	`4036`	`}`
`4034`	`4037`	`return STATE_FAILURE;`
`4035`	`4038`	`}`
`@@ -4098,8 +4101,11 @@ StateReturnType AIFollowWaypointPathState::update()`
`4098`	`4101`	`if (getAdjustsDestination() && ai->isDoingGroundMovement()) {`
`4099`	`4102`	`if (!TheAI->pathfinder()->adjustDestination(obj, ai->getLocomotorSet(), &m_goalPosition)) {`
`4100`	`4103`	`if (m_currentWaypoint) {`
	`4104`	`+// TheSuperHackers @info helmutbuhler 05/05/2025 This debug mutates the code to become CRC incompatible`
	`4105`	`+#if (defined(RTS_DEBUG) \|\| defined(RTS_INTERNAL)) \|\| !RETAIL_COMPATIBLE_CRC`
`4101`	`4106`	`DEBUG_LOG(("Breaking out of follow waypoint path %s of %s\n",`
`4102`	`4107`	`m_currentWaypoint->getName().str(), m_currentWaypoint->getPathLabel1().str()));`
	`4108`	`+#endif`
`4103`	`4109`	`}`
`4104`	`4110`	`return STATE_FAILURE;`
`4105`	`4111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,10 @@ Real PhysicsBehavior::getZFriction() const`
`303`	`303`	`*/`
`304`	`304`	`void PhysicsBehavior::applyForce( const Coord3D *force )`
`305`	`305`	`{`
	`306`	`+// TheSuperHackers @info helmutbuhler 06/05/2025 This debug mutates the code to become CRC incompatible`
	`307`	`+#if (defined(RTS_DEBUG) \|\| defined(RTS_INTERNAL)) \|\| !RETAIL_COMPATIBLE_CRC`
`306`	`308`	`DEBUG_ASSERTCRASH(!(_isnan(force->x) \|\| _isnan(force->y) \|\| _isnan(force->z)), ("PhysicsBehavior::applyForce force NAN!\n"));`
	`309`	`+#endif`
`307`	`310`	`if (_isnan(force->x) \|\| _isnan(force->y) \|\| _isnan(force->z)) {`
`308`	`311`	`return;`
`309`	`312`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4149,8 +4149,11 @@ StateReturnType AIFollowWaypointPathState::update()`
`4149`	`4149`	`if (getAdjustsDestination() && ai->isDoingGroundMovement()) {`
`4150`	`4150`	`if (!TheAI->pathfinder()->adjustDestination(obj, ai->getLocomotorSet(), &m_goalPosition)) {`
`4151`	`4151`	`if (m_currentWaypoint) {`
	`4152`	`+// TheSuperHackers @info helmutbuhler 05/05/2025 This debug mutates the code to become CRC incompatible`
	`4153`	`+#if (defined(RTS_DEBUG) \|\| defined(RTS_INTERNAL)) \|\| !RETAIL_COMPATIBLE_CRC`
`4152`	`4154`	`DEBUG_LOG(("Breaking out of follow waypoint path %s of %s\n",`
`4153`	`4155`	`m_currentWaypoint->getName().str(), m_currentWaypoint->getPathLabel1().str()));`
	`4156`	`+#endif`
`4154`	`4157`	`}`
`4155`	`4158`	`return STATE_FAILURE;`
`4156`	`4159`	`}`
`@@ -4219,8 +4222,11 @@ StateReturnType AIFollowWaypointPathState::update()`
`4219`	`4222`	`if (getAdjustsDestination() && ai->isDoingGroundMovement()) {`
`4220`	`4223`	`if (!TheAI->pathfinder()->adjustDestination(obj, ai->getLocomotorSet(), &m_goalPosition)) {`
`4221`	`4224`	`if (m_currentWaypoint) {`
	`4225`	`+// TheSuperHackers @info helmutbuhler 05/05/2025 This debug mutates the code to become CRC incompatible`
	`4226`	`+#if (defined(RTS_DEBUG) \|\| defined(RTS_INTERNAL)) \|\| !RETAIL_COMPATIBLE_CRC`
`4222`	`4227`	`DEBUG_LOG(("Breaking out of follow waypoint path %s of %s\n",`
`4223`	`4228`	`m_currentWaypoint->getName().str(), m_currentWaypoint->getPathLabel1().str()));`
	`4229`	`+#endif`
`4224`	`4230`	`}`
`4225`	`4231`	`return STATE_FAILURE;`
`4226`	`4232`	`}`
Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,10 @@ Real PhysicsBehavior::getZFriction() const`
`321`	`321`	`*/`
`322`	`322`	`void PhysicsBehavior::applyForce( const Coord3D *force )`
`323`	`323`	`{`
	`324`	`+// TheSuperHackers @info helmutbuhler 06/05/2025 This debug mutates the code to become CRC incompatible`
	`325`	`+#if (defined(RTS_DEBUG) \|\| defined(RTS_INTERNAL)) \|\| !RETAIL_COMPATIBLE_CRC`
`324`	`326`	`DEBUG_ASSERTCRASH(!(_isnan(force->x) \|\| _isnan(force->y) \|\| _isnan(force->z)), ("PhysicsBehavior::applyForce force NAN!\n"));`
	`327`	`+#endif`
`325`	`328`	`if (_isnan(force->x) \|\| _isnan(force->y) \|\| _isnan(force->z)) {`
`326`	`329`	`return;`
`327`	`330`	`}`