refactor(view): Remove friends from ViewLocation class (#2516)

Author: xezon

Core/GameEngine/Include/GameClient/View.h

@@ -339,43 +339,41 @@ class View : public Snapshot
 // ------------------------------------------------------------------------------------------------
 class ViewLocation
 {
-	friend class View;
-	friend class LookAtTranslator;
-
-	protected:
-		Bool m_valid;																								///< Is this location valid
-		Coord3D m_pos;																							///< Position of this view, in world coordinates
-		Real m_angle;																								///< Angle at which view has been rotated about the Z axis
-		Real m_pitch;																								///< Angle at which view has been rotated about the Y axis
-		Real m_zoom;																								///< Current zoom value
-
-	public:
-
-		ViewLocation()
-		{
-			m_valid = FALSE;
-			m_pos.zero();
-			m_angle = 0.0f;
-			m_pitch = 0.0f;
-			m_zoom = 0.0f;
-		}
-
-		const Coord3D& getPosition() const { return m_pos; }
-		Bool isValid() const { return m_valid; }
-		Real getAngle() const { return m_angle; }
-		Real getPitch() const { return m_pitch; }
-		Real getZoom() const { return m_zoom; }
-
-		void init(Real x, Real y, Real z, Real angle, Real pitch, Real zoom)
-		{
-			m_pos.x = x;
-			m_pos.y = y;
-			m_pos.z = z;
-			m_angle = angle;
-			m_pitch = pitch;
-			m_zoom = zoom;
-			m_valid = true;
-		}
+public:
+
+	ViewLocation()
+	{
+		m_valid = false;
+		m_pos.zero();
+		m_angle = 0.0f;
+		m_pitch = 0.0f;
+		m_zoom = 0.0f;
+	}
+
+	Bool isValid() const { return m_valid; }
+	const Coord3D& getPosition() const { return m_pos; }
+	Real getAngle() const { return m_angle; }
+	Real getPitch() const { return m_pitch; }
+	Real getZoom() const { return m_zoom; }
+
+	void init(Real x, Real y, Real z, Real angle, Real pitch, Real zoom)
+	{
+		m_valid = true;
+		m_pos.x = x;
+		m_pos.y = y;
+		m_pos.z = z;
+		m_angle = angle;
+		m_pitch = pitch;
+		m_zoom = zoom;
+	}
+
+private:
+
+	Bool m_valid;					///< Is this location valid
+	Coord3D m_pos;				///< Position of this view, in world coordinates
+	Real m_angle;					///< Angle at which view has been rotated about the Z axis
+	Real m_pitch;					///< Angle at which view has been rotated about the Y axis
+	Real m_zoom;					///< Current zoom value
 };
 
 // TheSuperHackers @feature bobtista 31/01/2026

Core/GameEngine/Source/GameClient/View.cpp

@@ -215,12 +215,12 @@ void View::getLocation( ViewLocation *location )
  */
 void View::setLocation( const ViewLocation *location )
 {
-	if ( location->m_valid )
+	if ( location->isValid() )
 	{
-		setPosition(&location->m_pos);
-		setAngle(location->m_angle);
-		setPitch(location->m_pitch);
-		setZoom(location->m_zoom);
+		setPosition(&location->getPosition());
+		setAngle(location->getAngle());
+		setPitch(location->getPitch());
+		setZoom(location->getZoom());
 		forceRedraw();
 	}
 

Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp

@@ -533,10 +533,10 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 				ViewLocation currentView;
 				TheTacticalView->getLocation(&currentView);
 				GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_SET_REPLAY_CAMERA );
-				msg->appendLocationArgument( currentView.m_pos );
-				msg->appendRealArgument( currentView.m_angle );
-				msg->appendRealArgument( currentView.m_pitch );
-				msg->appendRealArgument( currentView.m_zoom );
+				msg->appendLocationArgument( currentView.getPosition() );
+				msg->appendRealArgument( currentView.getAngle() );
+				msg->appendRealArgument( currentView.getPitch() );
+				msg->appendRealArgument( currentView.getZoom() );
 				msg->appendIntegerArgument( (Int)TheMouse->getMouseCursor() );
 				msg->appendPixelArgument( m_currentPos );
 			}

GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp

@@ -532,10 +532,10 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 				ViewLocation currentView;
 				TheTacticalView->getLocation(&currentView);
 				GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_SET_REPLAY_CAMERA );
-				msg->appendLocationArgument( currentView.m_pos );
-				msg->appendRealArgument( currentView.m_angle );
-				msg->appendRealArgument( currentView.m_pitch );
-				msg->appendRealArgument( currentView.m_zoom );
+				msg->appendLocationArgument( currentView.getPosition() );
+				msg->appendRealArgument( currentView.getAngle() );
+				msg->appendRealArgument( currentView.getPitch() );
+				msg->appendRealArgument( currentView.getZoom() );
 				msg->appendIntegerArgument( (Int)TheMouse->getMouseCursor() );
 				msg->appendPixelArgument( m_currentPos );
 			}