Use RotateOffset

Author: orengg

Entities/AtomGroup.cpp

@@ -1280,7 +1280,7 @@ namespace RTE {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	bool AtomGroup::ResolveTerrainIntersection(Vector &position, Matrix &rotation, unsigned char strongerThan) const {
+	bool AtomGroup::ResolveTerrainIntersection(Vector &position, unsigned char strongerThan) const {
 		std::list<Atom *> intersectingAtoms;
 		MOID hitMaterial = g_MaterialAir;
 
@@ -1292,8 +1292,7 @@ namespace RTE {
 
 		// First go through all Atoms to find the first intersection and get the intersected MO
 		for (Atom *atom : m_Atoms) {
-			atomOffset = atom->GetOffset().GetXFlipped(m_OwnerMO->IsHFlipped());
-			atomOffset *= rotation;
+			atomOffset = m_OwnerMO->RotateOffset(atom->GetOffset());
 			atom->SetupPos(position + atomOffset);
 			atomPos = atom->GetCurrentPos();
 			hitMaterial = g_SceneMan.GetTerrain()->GetPixel(atomPos.GetFloorIntX(), atomPos.GetFloorIntY());

Entities/AtomGroup.h

@@ -313,10 +313,9 @@ namespace RTE {
 		/// Checks whether any of the Atoms in this AtomGroup are on top of terrain pixels, and if so, attempt to move the OwnerMO out so none of the Atoms are inside any terrain pixels anymore.
 		/// </summary>
 		/// <param name="position">Current position of the owner MO.</param>
-		/// <param name="rotation">Current rotation of the owner MO.</param>
 		/// <param name="strongerThan">Only attempt to move out of materials stronger than this specific ID.</param>
 		/// <returns>Whether any intersection was successfully resolved. Will return true even if there wasn't any intersections to begin with.</returns>
-		bool ResolveTerrainIntersection(Vector &position, Matrix &rotation, unsigned char strongerThan = 0) const;
+		bool ResolveTerrainIntersection(Vector &position, unsigned char strongerThan = 0) const;
 
 		/// <summary>
 		/// Checks whether any of the Atoms in this AtomGroup are on top of MOSprites, and if so, attempt to move the OwnerMO out so none of the Atoms are inside the other MOSprite's silhouette anymore.

Entities/MOSRotating.cpp

@@ -1084,7 +1084,7 @@ void MOSRotating::GibThis(Vector impactImpulse, float internalBlast, MovableObje
 
 bool MOSRotating::MoveOutOfTerrain(unsigned char strongerThan)
 {
-    return m_pAtomGroup->ResolveTerrainIntersection(m_Pos, m_Rotation, strongerThan);
+    return m_pAtomGroup->ResolveTerrainIntersection(m_Pos, strongerThan);
 }