fix: Route GameLogic trig calls through global Atan2/Sin/Cos wrappers

Author: Okladnoj

Core/Libraries/Include/Lib/trig.h

@@ -28,3 +28,4 @@ Real Cos(Real);
 Real Tan(Real);
 Real ACos(Real);
 Real ASin(Real x);
+Real Atan2(Real y, Real x);

Generals/Code/GameEngine/Source/Common/System/Trig.cpp

@@ -71,6 +71,11 @@ Real ASin(Real x)
 	return asinf(x);
 }
 
+Real Atan2(Real y, Real x)
+{
+	return atan2f(y, x);
+}
+
 #ifdef REGENERATE_TRIG_TABLES
 void initTrig()
 {

GeneralsMD/Code/GameEngine/Source/Common/System/Trig.cpp

@@ -72,6 +72,11 @@ Real ASin(Real x)
 	return WWMath::Asin(x);
 }
 
+Real Atan2(Real y, Real x)
+{
+	return WWMath::Atan2(y, x);
+}
+
 #ifdef REGENERATE_TRIG_TABLES
 void initTrig()
 {

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SlowDeathBehavior.cpp

@@ -306,7 +306,7 @@ void SlowDeathBehavior::beginSlowDeath(const DamageInfo *damageInfo)
 				physics->setExtraBounciness(-1.0);					// we don't want this guy to bounce at all
 				physics->setExtraFriction(-3 * SECONDS_PER_LOGICFRAME_REAL);							// reduce his ground friction a bit
 				physics->setAllowBouncing(true);
-				Real orientation = atan2(force.y, force.x);
+				Real orientation = Atan2(force.y, force.x);
 				physics->setAngles(orientation, 0, 0);
 				obj->getDrawable()->setModelConditionState(MODELCONDITION_EXPLODED_FLAILING);
 				m_flags |= (1<<FLUNG_INTO_AIR);

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp

@@ -357,7 +357,7 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 			}
 
 
-			Real orient = atan2( moveToPos.y - startPos.y, moveToPos.x - startPos.x);
+			Real orient = Atan2( moveToPos.y - startPos.y, moveToPos.x - startPos.x);
 			if( m_data.m_distToTarget > 0 )
 			{
 				const Real SLOP = 1.5f;
@@ -1108,7 +1108,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 
 				objUp->applyForce(&force);
 				if (m_orientInForceDirection)
-					orientation = atan2(force.y, force.x);
+					orientation = Atan2(force.y, force.x);
 
 			}
 		}
@@ -1205,7 +1205,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 				objUp->applyForce(&force);
 				if (m_orientInForceDirection)
 				{
-					orientation = atan2(force.y, force.x);
+					orientation = Atan2(force.y, force.x);
 				}
 				DUMPREAL(orientation);
 				objUp->setAngles(orientation, 0, 0);

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp

@@ -1110,7 +1110,7 @@ StateReturnType RecoverFromOffMapState::update() // Success if we should try aga
 		enterCoord.z = owner->getPosition()->z;
 	owner->setPosition(&enterCoord);
 
-	Real enterAngle = atan2(ai->getMoveToPos()->y - enterCoord.y, ai->getMoveToPos()->x - enterCoord.x);
+	Real enterAngle = Atan2(ai->getMoveToPos()->y - enterCoord.y, ai->getMoveToPos()->x - enterCoord.x);
 	owner->setOrientation(enterAngle);
 
 	PhysicsBehavior* physics = owner->getPhysics();

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp

@@ -516,7 +516,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 
 		Coord3D intermedPt;
 		Bool intermed = false;
-		Real orient = atan2(ppinfo.runwayPrep.y - ppinfo.parkingSpace.y, ppinfo.runwayPrep.x - ppinfo.parkingSpace.x);
+		Real orient = Atan2(ppinfo.runwayPrep.y - ppinfo.parkingSpace.y, ppinfo.runwayPrep.x - ppinfo.parkingSpace.x);
 		if (fabs(stdAngleDiff(orient, ppinfo.parkingOrientation)) > PI/128)
 		{
 			intermedPt.z = (ppinfo.parkingSpace.z + ppinfo.runwayPrep.z) * 0.5f;
@@ -2297,7 +2297,7 @@ void JetAIUpdate::positionLockon()
 	Real dx = getObject()->getPosition()->x - pos.x;
 	Real dy = getObject()->getPosition()->y - pos.y;
 	if (dx || dy)
-		m_lockonDrawable->setOrientation(atan2(dy, dx));
+		m_lockonDrawable->setOrientation(Atan2(dy, dx));
 
 	// the Gaussian sum, to avoid keeping a running total:
 	//

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp

@@ -1304,7 +1304,7 @@ void RailroadBehavior::updatePositionTrackDistance( PullInfo *pullerInfo, PullIn
 	trackPosDelta.z = 0;
 	Real dx = pullerInfo->towHitchPosition.x - turnPos.x;
 	Real dy = pullerInfo->towHitchPosition.y - turnPos.y;
-	Real desiredAngle = atan2(dy, dx);
+	Real desiredAngle = Atan2(dy, dx);
 
 
 	Real relAngle = stdAngleDiff(desiredAngle, obj->getTransformMatrix()->Get_Z_Rotation());

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DynamicShroudClearingRangeUpdate.cpp

@@ -166,8 +166,8 @@ void DynamicShroudClearingRangeUpdate::animateGridDecals()
 
 	for (int d = 0; d < GRID_FX_DECAL_COUNT; ++d)
 	{
-		pos.x = ctr->x + (sinf(angle) * radius);
-		pos.y = ctr->y + (cosf(angle) * radius);
+		pos.x = ctr->x + (Sin(angle) * radius);
+		pos.y = ctr->y + (Cos(angle) * radius);
 
 		pos.x -= ((Int)pos.x)%23;
 		pos.y -= ((Int)pos.y)%23;

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FloatUpdate.cpp

@@ -119,8 +119,8 @@ UpdateSleepTime FloatUpdate::update()
 	{
 
 		Real angle = INT_TO_REAL(TheGameLogic->getFrame());
-		Real yaw = sin(angle * 0.0291f) * 0.05f;
-		Real pitch = sin(angle * 0.0515f) * 0.05f;
+		Real yaw = Sin(angle * 0.0291f) * 0.05f;
+		Real pitch = Sin(angle * 0.0515f) * 0.05f;
 
 		Matrix3D mx = *draw->getInstanceMatrix();