- Stability fixes

- More merge fixes

Author: x64-dev

Core/GameEngine/Include/Common/GameDefines.h

@@ -41,18 +41,6 @@
 #endif
 #endif
 
-// This is here to easily toggle between the retail compatible with fixed pathfinding fallback and pure fixed pathfinding mode
-#if RETAIL_COMPATIBLE_CRC
-
-#if defined(GENERALS_ONLINE)
-#define RETAIL_COMPATIBLE_PATHFINDING (0)
-#else
-#define RETAIL_COMPATIBLE_PATHFINDING (1)
-#endif
-#else
-#define RETAIL_COMPATIBLE_PATHFINDING (0)
-#endif
-
 // This is here to easily toggle between the retail compatible pathfinding memory allocation and the new static allocated data mode
 #ifndef RETAIL_COMPATIBLE_PATHFINDING_ALLOCATION
 #if defined(GENERALS_ONLINE)

Core/GameEngine/Include/GameClient/View.h

@@ -131,7 +131,8 @@ class View : public Snapshot
 	virtual void forceRedraw() = 0;
 
 	virtual void lookAt(const Coord3D* o);														///< Center the view on the given coordinate
-	virtual void initHeightForMap() {};														///<  Init the camera height for the map at the current position.
+	virtual void initHeightForMap() {};														///< Init the camera height for the map at the current position.
+	virtual void resetPivotToGround() {};													///< Set the camera pivot to the terrain height at the current position.
 	virtual void scrollBy(const Coord2D* delta);														///< Shift the view by the given delta
 
 	virtual void moveCameraTo(const Coord3D* o, Int frames, Int shutter, Bool orient, Real easeIn = 0.0f, Real easeOut = 0.0f) { lookAt(o); }
@@ -208,6 +209,7 @@ class View : public Snapshot
 	Bool userSetZoomToDefault() { return doUserAction(&View::setZoomToDefault); }
 	Bool userSetFieldOfView(Real angle) { return doUserAction(&View::setFieldOfView, angle); }
 	Bool userLookAt(const Coord3D* o) { return doUserAction(&View::lookAt, o); }
+	Bool userResetPivotToGround() { return doUserAction(&View::resetPivotToGround); }
 	Bool userScrollBy(const Coord2D* delta) { return doUserAction(&View::scrollBy, delta); }
 	Bool userSetLocation(const ViewLocation* location) { return doUserAction(&View::setLocation, location); }
 	Bool userSetCameraLock(ObjectID id) { return doUserAction(&View::setCameraLock, id); }
@@ -375,7 +377,7 @@ class ViewLocation
 		m_pos.z = z;
 		m_angle = angle;
 		m_pitch = pitch;
-		m_zoom = zoom;
+		m_zoom = std::clamp(zoom, 0.f, 1.f);
 		m_valid = true;
 	}
 };

Core/GameEngine/Source/GameClient/View.cpp

@@ -37,7 +37,7 @@
 UnsignedInt View::m_idNext = 1;
 
 // the tactical view singleton
-View *TheTacticalView = nullptr;
+View* TheTacticalView = nullptr;
 
 
 View::View()
@@ -118,7 +118,7 @@ void View::reset()
 /**
  * Prepend this view to the given list, return the new list.
  */
-View *View::prependViewToList( View *list )
+View* View::prependViewToList(View* list)
 {
 	m_next = list;
 	return this;
@@ -132,7 +132,7 @@ void View::zoom(Real height)
 /**
  * Center the view on the given coordinate.
  */
-void View::lookAt( const Coord3D *o )
+void View::lookAt(const Coord3D* o)
 {
 
 	/// @todo this needs to be changed to be 3D, this is still old 2D stuff
@@ -145,7 +145,7 @@ void View::lookAt( const Coord3D *o )
 /**
  * Shift the view by the given delta.
  */
-void View::scrollBy( const Coord2D *delta )
+void View::scrollBy(const Coord2D* delta)
 {
 	// update view's world position
 	m_pos.x += delta->x;
@@ -155,17 +155,17 @@ void View::scrollBy( const Coord2D *delta )
 /**
  * Rotate the view around the vertical axis to the given angle.
  */
-void View::setAngle( Real radians )
+void View::setAngle(Real radians)
 {
 	m_angle = WWMath::Normalize_Angle(radians);
 }
 
 /**
  * Rotate the view around the horizontal (X) axis to the given angle.
  */
-void View::setPitch( Real radians )
+void View::setPitch(Real radians)
 {
-	constexpr Real limit = PI/5.0f;
+	constexpr Real limit = PI / 5.0f;
 	m_pitch = clamp(-limit, radians, limit);
 }
 
@@ -188,7 +188,7 @@ void View::setPitchToDefault()
 void View::setHeightAboveGround(Real z)
 {
 	// if our zoom is limited, we will stay within a predefined distance from the terrain
-	if( m_zoomLimited )
+	if (m_zoomLimited)
 	{
 		m_heightAboveGround = clamp(m_minHeightAboveGround, z, m_maxHeightAboveGround);
 	}
@@ -201,21 +201,21 @@ void View::setHeightAboveGround(Real z)
 /**
  * write the view's current location in to the view location object
  */
-void View::getLocation( ViewLocation *location )
+void View::getLocation(ViewLocation* location)
 {
 
-	const Coord3D *pos = getPosition();
-	location->init( pos->x, pos->y, pos->z, getAngle(), getPitch(), getZoom() );
+	const Coord3D* pos = getPosition();
+	location->init(pos->x, pos->y, pos->z, getAngle(), getPitch(), getZoom());
 
 }
 
 
 /**
  * set the view's current location from to the view location object
  */
-void View::setLocation( const ViewLocation *location )
+void View::setLocation(const ViewLocation* location)
 {
-	if ( location->m_valid )
+	if (location->m_valid)
 	{
 		setPosition(&location->m_pos);
 		setAngle(location->m_angle);
@@ -234,13 +234,13 @@ Bool View::isUserControlLocked() const
 //-------------------------------------------------------------------------------------------------
 /** project the 4 corners of this view into the world and return each point as a parameter,
 		the world points are at the requested Z */
-//-------------------------------------------------------------------------------------------------
-void View::getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight,
-																					Coord3D *bottomRight, Coord3D *bottomLeft,
-																					Real z )
+		//-------------------------------------------------------------------------------------------------
+void View::getScreenCornerWorldPointsAtZ(Coord3D* topLeft, Coord3D* topRight,
+	Coord3D* bottomRight, Coord3D* bottomLeft,
+	Real z)
 {
 	// sanity
-	if( topLeft == nullptr || topRight == nullptr || bottomRight == nullptr || bottomLeft == nullptr)
+	if (topLeft == nullptr || topRight == nullptr || bottomRight == nullptr || bottomLeft == nullptr)
 		return;
 
 	ICoord2D screenTopLeft;
@@ -252,7 +252,7 @@ void View::getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight,
 	const Int viewHeight = getHeight();
 
 	// setup the screen coords for the 4 corners of the viewable display
-	getOrigin( &origin.x, &origin.y );
+	getOrigin(&origin.x, &origin.y);
 
 	screenTopLeft.x = origin.x;
 	screenTopLeft.y = origin.y;
@@ -264,34 +264,34 @@ void View::getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight,
 	screenBottomLeft.y = origin.y + viewHeight;
 
 	// project
-	screenToWorldAtZ( &screenTopLeft, topLeft, z );
-	screenToWorldAtZ( &screenTopRight, topRight, z );
-	screenToWorldAtZ( &screenBottomRight, bottomRight, z );
-	screenToWorldAtZ( &screenBottomLeft, bottomLeft, z );
+	screenToWorldAtZ(&screenTopLeft, topLeft, z);
+	screenToWorldAtZ(&screenTopRight, topRight, z);
+	screenToWorldAtZ(&screenBottomRight, bottomRight, z);
+	screenToWorldAtZ(&screenBottomLeft, bottomLeft, z);
 }
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method for a view */
 // ------------------------------------------------------------------------------------------------
-void View::xfer( Xfer *xfer )
+void View::xfer(Xfer* xfer)
 {
 
 	// version
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
-	xfer->xferVersion( &version, currentVersion );
+	xfer->xferVersion(&version, currentVersion);
 
 	// camera angle
 	Real angle = getAngle();
-	xfer->xferReal( &angle );
-	setAngle( angle );
+	xfer->xferReal(&angle);
+	setAngle(angle);
 
 	// view position
 	Coord3D viewPos;
-	getPosition( &viewPos );
-	xfer->xferReal( &viewPos.x );
-	xfer->xferReal( &viewPos.y );
-	xfer->xferReal( &viewPos.z );
-	lookAt( &viewPos );
+	getPosition(&viewPos);
+	xfer->xferReal(&viewPos.x);
+	xfer->xferReal(&viewPos.y);
+	xfer->xferReal(&viewPos.z);
+	lookAt(&viewPos);
 
 }