[GEN][ZH] Fix DEBUG_CRC compile errors (#771)

xezon · xezon · commit cca7e1ec68fe · 2025-04-27T10:42:26.000+02:00
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Object.h b/Generals/Code/GameEngine/Include/GameLogic/Object.h
@@ -763,10 +763,8 @@ class Object : public Thing, public Snapshot
 
 };  // end class Object
 
-#ifdef DEBUG_LOGGING
 // describe an object as an AsciiString: e.g. "Object 102 (KillerBuggy) [GLARocketBuggy, owned by player 2 (GLAIntroPlayer)]"
-AsciiString DescribeObject(const Object *obj);
-#endif // DEBUG_LOGGING
+AsciiString DebugDescribeObject(const Object *obj);
 
 #if defined(_DEBUG) || defined(_INTERNAL)
 	#define DEBUG_OBJECT_ID_EXISTS
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp
@@ -743,7 +743,7 @@ void Path::computePointOnPath(
 	ClosestPointOnPathInfo& out
 )
 {
-	CRCDEBUG_LOG(("Path::computePointOnPath() fzor %s\n", DescribeObject(obj).str()));
+	CRCDEBUG_LOG(("Path::computePointOnPath() for %s\n", DebugDescribeObject(obj).str()));
 
 	out.layer = LAYER_GROUND;
 	out.posOnPath.zero();
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp
@@ -142,8 +142,7 @@ extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBCo
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-#ifdef DEBUG_LOGGING
-AsciiString DescribeObject(const Object *obj)
+AsciiString DebugDescribeObject(const Object *obj)
 {
 	if (!obj)
 		return "<No Object>";
@@ -167,7 +166,6 @@ AsciiString DescribeObject(const Object *obj)
 
 	return ret;
 }
-#endif // DEBUG_LOGGING
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
@@ -2163,7 +2163,7 @@ UpdateSleepTime AIUpdateInterface::doLocomotor( void )
 							// obstacles, and follow the intermediate path points.
 							ClosestPointOnPathInfo info;
 							CRCDEBUG_LOG(("AIUpdateInterface::doLocomotor() - calling computePointOnPath() for %s\n",
-								DescribeObject(getObject()).str()));
+								DebugDescribeObject(getObject()).str()));
 							getPath()->computePointOnPath(getObject(), m_locomotorSet, *getObject()->getPosition(), info);
 							onPathDistToGoal = info.distAlongPath;
 							goalPos = info.posOnPath;
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h
@@ -811,10 +811,8 @@ class Object : public Thing, public Snapshot
 
 };  // end class Object
 
-#ifdef DEBUG_LOGGING
 // describe an object as an AsciiString: e.g. "Object 102 (KillerBuggy) [GLARocketBuggy, owned by player 2 (GLAIntroPlayer)]"
-AsciiString DescribeObject(const Object *obj);
-#endif // DEBUG_LOGGING
+AsciiString DebugDescribeObject(const Object *obj);
 
 #if defined(_DEBUG) || defined(_INTERNAL)
 	#define DEBUG_OBJECT_ID_EXISTS
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp
@@ -760,7 +760,7 @@ void Path::computePointOnPath(
 	ClosestPointOnPathInfo& out
 )
 {
-	CRCDEBUG_LOG(("Path::computePointOnPath() fzor %s\n", DescribeObject(obj).str()));
+	CRCDEBUG_LOG(("Path::computePointOnPath() for %s\n", DebugDescribeObject(obj).str()));
 
 	out.layer = LAYER_GROUND;
 	out.posOnPath.zero();
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp
@@ -152,8 +152,7 @@ extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBCo
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-#ifdef DEBUG_LOGGING
-AsciiString DescribeObject(const Object *obj)
+AsciiString DebugDescribeObject(const Object *obj)
 {
 	if (!obj)
 		return "<No Object>";
@@ -177,7 +176,6 @@ AsciiString DescribeObject(const Object *obj)
 
 	return ret;
 }
-#endif // DEBUG_LOGGING
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
@@ -2205,7 +2205,7 @@ UpdateSleepTime AIUpdateInterface::doLocomotor( void )
 							// obstacles, and follow the intermediate path points.
 							ClosestPointOnPathInfo info;
 							CRCDEBUG_LOG(("AIUpdateInterface::doLocomotor() - calling computePointOnPath() for %s\n",
-								DescribeObject(getObject()).str()));
+								DebugDescribeObject(getObject()).str()));
 							getPath()->computePointOnPath(getObject(), m_locomotorSet, *getObject()->getPosition(), info);
 							onPathDistToGoal = info.distAlongPath;
 							goalPos = info.posOnPath;

Original file line number	Diff line number	Diff line change
`@@ -743,7 +743,7 @@ void Path::computePointOnPath(`
`743`	`743`	`ClosestPointOnPathInfo& out`
`744`	`744`	`)`
`745`	`745`	`{`
`746`		`- CRCDEBUG_LOG(("Path::computePointOnPath() fzor %s\n", DescribeObject(obj).str()));`
	`746`	`+ CRCDEBUG_LOG(("Path::computePointOnPath() for %s\n", DebugDescribeObject(obj).str()));`
`747`	`747`
`748`	`748`	`out.layer = LAYER_GROUND;`
`749`	`749`	`out.posOnPath.zero();`
Original file line number	Diff line number	Diff line change
`@@ -142,8 +142,7 @@ extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBCo`
`142`	`142`
`143`	`143`	`//-------------------------------------------------------------------------------------------------`
`144`	`144`	`//-------------------------------------------------------------------------------------------------`
`145`		`-#ifdef DEBUG_LOGGING`
`146`		`-AsciiString DescribeObject(const Object *obj)`
	`145`	`+AsciiString DebugDescribeObject(const Object *obj)`
`147`	`146`	`{`
`148`	`147`	`if (!obj)`
`149`	`148`	`return "<No Object>";`
`@@ -167,7 +166,6 @@ AsciiString DescribeObject(const Object *obj)`
`167`	`166`
`168`	`167`	`return ret;`
`169`	`168`	`}`
`170`		`-#endif // DEBUG_LOGGING`
`171`	`169`
`172`	`170`	`//-------------------------------------------------------------------------------------------------`
`173`	`171`	`//-------------------------------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -760,7 +760,7 @@ void Path::computePointOnPath(`
`760`	`760`	`ClosestPointOnPathInfo& out`
`761`	`761`	`)`
`762`	`762`	`{`
`763`		`- CRCDEBUG_LOG(("Path::computePointOnPath() fzor %s\n", DescribeObject(obj).str()));`
	`763`	`+ CRCDEBUG_LOG(("Path::computePointOnPath() for %s\n", DebugDescribeObject(obj).str()));`
`764`	`764`
`765`	`765`	`out.layer = LAYER_GROUND;`
`766`	`766`	`out.posOnPath.zero();`
Original file line number	Diff line number	Diff line change
`@@ -152,8 +152,7 @@ extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBCo`
`152`	`152`
`153`	`153`	`//-------------------------------------------------------------------------------------------------`
`154`	`154`	`//-------------------------------------------------------------------------------------------------`
`155`		`-#ifdef DEBUG_LOGGING`
`156`		`-AsciiString DescribeObject(const Object *obj)`
	`155`	`+AsciiString DebugDescribeObject(const Object *obj)`
`157`	`156`	`{`
`158`	`157`	`if (!obj)`
`159`	`158`	`return "<No Object>";`
`@@ -177,7 +176,6 @@ AsciiString DescribeObject(const Object *obj)`
`177`	`176`
`178`	`177`	`return ret;`
`179`	`178`	`}`
`180`		`-#endif // DEBUG_LOGGING`
`181`	`179`
`182`	`180`	`//-------------------------------------------------------------------------------------------------`
`183`	`181`	`//-------------------------------------------------------------------------------------------------`