fix(debug): Fix wrong assert condition in W3DTreeDraw::addToTreeBuffer() (#1663)

Author: xezon

Generals/Code/GameEngine/Include/Common/Thing.h

@@ -121,6 +121,9 @@ class Thing : public MemoryPoolObject
 
 	inline const Coord3D *getPosition() const { return &m_cachedPos; }
 	inline Real getOrientation() const { return m_cachedAngle; }
+
+	Bool isPositioned() const;
+
 	const Coord3D *getUnitDirectionVector2D() const;
 	void getUnitDirectionVector2D(Coord3D& dir) const;
 	void getUnitDirectionVector3D(Coord3D& dir) const;

Generals/Code/GameEngine/Source/Common/Thing/Thing.cpp

@@ -47,6 +47,9 @@
 #include "GameLogic/TerrainLogic.h"
 
 
+static constexpr const Real InitialThingPosX = 0.0f;
+static constexpr const Real InitialThingPosY = 0.0f;
+
 //=============================================================================
 /** Constructor */
 //=============================================================================
@@ -67,7 +70,9 @@ Thing::Thing( const ThingTemplate *thingTemplate )
 	m_templateName = thingTemplate->getName();
 #endif
 	m_transform.Make_Identity();
-	m_cachedPos.zero();
+	m_cachedPos.x = InitialThingPosX;
+	m_cachedPos.y = InitialThingPosY;
+	m_cachedPos.z = 0.0f;
 	m_cachedAngle = 0.0f;
 	m_cachedDirVector.zero();
 	m_cachedAltitudeAboveTerrain = 0;
@@ -91,6 +96,12 @@ const ThingTemplate *Thing::getTemplate() const
 	return m_template;
 }
 
+//=============================================================================
+Bool Thing::isPositioned() const
+{
+	return m_cachedPos.x != InitialThingPosX || m_cachedPos.y != InitialThingPosY;
+}
+
 //=============================================================================
 const Coord3D* Thing::getUnitDirectionVector2D() const
 {

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

@@ -121,6 +121,9 @@ class Thing : public MemoryPoolObject
 
 	inline const Coord3D *getPosition() const { return &m_cachedPos; }
 	inline Real getOrientation() const { return m_cachedAngle; }
+
+	Bool isPositioned() const;
+
 	const Coord3D *getUnitDirectionVector2D() const;
 	void getUnitDirectionVector2D(Coord3D& dir) const;
 	void getUnitDirectionVector3D(Coord3D& dir) const;

GeneralsMD/Code/GameEngine/Source/Common/Thing/Thing.cpp

@@ -47,6 +47,9 @@
 #include "GameLogic/TerrainLogic.h"
 
 
+static constexpr const Real InitialThingPosX = 0.0f;
+static constexpr const Real InitialThingPosY = 0.0f;
+
 //=============================================================================
 /** Constructor */
 //=============================================================================
@@ -67,7 +70,9 @@ Thing::Thing( const ThingTemplate *thingTemplate )
 	m_templateName = thingTemplate->getName();
 #endif
 	m_transform.Make_Identity();
-	m_cachedPos.zero();
+	m_cachedPos.x = InitialThingPosX;
+	m_cachedPos.y = InitialThingPosY;
+	m_cachedPos.z = 0.0f;
 	m_cachedAngle = 0.0f;
 	m_cachedDirVector.zero();
 	m_cachedAltitudeAboveTerrain = 0;
@@ -91,6 +96,12 @@ const ThingTemplate *Thing::getTemplate() const
 	return m_template;
 }
 
+//=============================================================================
+Bool Thing::isPositioned() const
+{
+	return m_cachedPos.x != InitialThingPosX || m_cachedPos.y != InitialThingPosY;
+}
+
 //=============================================================================
 const Coord3D* Thing::getUnitDirectionVector2D() const
 {

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTreeDraw.cpp

@@ -126,14 +126,12 @@ void W3DTreeDraw::addToTreeBuffer()
 	const W3DTreeDrawModuleData *moduleData = getW3DTreeDrawModuleData();
 	const Drawable *draw = getDrawable();
 
-	DEBUG_ASSERTCRASH(draw->getPosition()->x == 0.0f && draw->getPosition()->y == 0.0f,
-		("W3DTreeDraw::addToTreeBuffer - Why place tree at x:0 y:0 ?"));
+	DEBUG_ASSERTCRASH(draw->isPositioned(), ("W3DTreeDraw::addToTreeBuffer - This tree was not positioned!"));
 
 	Real scale = draw->getScale();
 	Real scaleRandomness = draw->getTemplate()->getInstanceScaleFuzziness();
 	scaleRandomness = 0.0f; // We use the scale fuzziness inside WB to generate random scales, so they don't change at load time. jba. [4/22/2003]
-	TheTerrainRenderObject->addTree(draw->getID(), *draw->getPosition(),
-		scale, draw->getOrientation(), scaleRandomness, moduleData);
+	TheTerrainRenderObject->addTree(draw->getID(), *draw->getPosition(), scale, draw->getOrientation(), scaleRandomness, moduleData);
 }
 
 // ------------------------------------------------------------------------------------------------