[GEN][ZH] Fix DEBUG_CRC compile errors

xezon · xezon · commit 8f2c9e907eb1 · 2025-04-26T22:50:35.000+02:00
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Object.h b/Generals/Code/GameEngine/Include/GameLogic/Object.h
@@ -763,10 +763,10 @@ class Object : public Thing, public Snapshot
 
 };  // end class Object
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_CRC
 // 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
+#endif
 
 #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", DescribeObject(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,7 +142,7 @@ extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBCo
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_CRC
 AsciiString DescribeObject(const Object *obj)
 {
 	if (!obj)
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h
@@ -811,10 +811,10 @@ class Object : public Thing, public Snapshot
 
 };  // end class Object
 
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_CRC
 // 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
+#endif
 
 #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", DescribeObject(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,7 +152,7 @@ extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBCo
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-#ifdef DEBUG_LOGGING
+#ifdef DEBUG_CRC
 AsciiString DescribeObject(const Object *obj)
 {
 	if (!obj)

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", DescribeObject(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,7 +142,7 @@ extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBCo`
`142`	`142`
`143`	`143`	`//-------------------------------------------------------------------------------------------------`
`144`	`144`	`//-------------------------------------------------------------------------------------------------`
`145`		`-#ifdef DEBUG_LOGGING`
	`145`	`+#ifdef DEBUG_CRC`
`146`	`146`	`AsciiString DescribeObject(const Object *obj)`
`147`	`147`	`{`
`148`	`148`	`if (!obj)`
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", DescribeObject(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,7 +152,7 @@ extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBCo`
`152`	`152`
`153`	`153`	`//-------------------------------------------------------------------------------------------------`
`154`	`154`	`//-------------------------------------------------------------------------------------------------`
`155`		`-#ifdef DEBUG_LOGGING`
	`155`	`+#ifdef DEBUG_CRC`
`156`	`156`	`AsciiString DescribeObject(const Object *obj)`
`157`	`157`	`{`
`158`	`158`	`if (!obj)`