@@ -879,7 +879,7 @@ void GeoscapeState::time5Seconds()
 							continue;
 						}
 						// Can we actually fight it
-						if (!(*j)->isInDogfight() && !(*j)->getDistance(u))
+						if (!(*j)->isInDogfight())
 						{
 							_dogfightsToBeStarted.push_back(new DogfightState(this, (*j), u));
 							if ((*j)->getRules()->isWaterOnly() && u->getAltitudeInt() > (*j)->getRules()->getMaxAltitude())
 
@@ -685,6 +685,7 @@ void Craft::think()
 	else
 	{
 		_takeoff--;
+		resetMeetPoint();
 	}
 	if (reachedDestination() && _dest == (Target*)_base)
 	{
 
@@ -207,7 +207,7 @@ void MovingTarget::move()
 	calculateSpeed();
 	if (_dest != 0)
 	{
-		if (getDistance(_dest) > _speedRadian)
+		if (getDistance(_meetPointLon, _meetPointLat) > _speedRadian)
 		{
 			setLongitude(_lon + _speedLon);
 			setLatitude(_lat + _speedLat);
@@ -216,6 +216,7 @@ void MovingTarget::move()
 		{
 			setLongitude(_dest->getLongitude());
 			setLatitude(_dest->getLatitude());
+			resetMeetPoint();
 		}
 	}
 }
@@ -240,7 +241,7 @@ void MovingTarget::calculateMeetPoint()
 		_meetPointLon = _lon;
 	}
 
-	if (!_dest || !Options::meetingPoint) return;
+	if (!_dest || !Options::meetingPoint || reachedDestination()) return;
 
 	MovingTarget *t = dynamic_cast<MovingTarget*>(_dest);
 	if (!t || !t->getDestination()) return;
 
@@ -238,7 +238,12 @@ std::vector<Craft*> Target::getCraftFollowers() const
  */
 double Target::getDistance(const Target *target) const
 {
-	return acos(cos(_lat) * cos(target->getLatitude()) * cos(target->getLongitude() - _lon) + sin(_lat) * sin(target->getLatitude()));
+	return getDistance(target->getLongitude(), target->getLatitude());
+}
+
+double Target::getDistance(double lon, double lat) const
+{
+	return acos(cos(_lat) * cos(lat) * cos(lon - _lon) + sin(_lat) * sin(lat));
 }
 
 }
@@ -80,6 +80,7 @@ class Target
 	std::vector<Craft*> getCraftFollowers() const;
 	/// Gets the distance to another target.
 	double getDistance(const Target *target) const;
+	double getDistance(double lon, double lat) const;
 };
 
 }
@@ -32,12 +32,12 @@
 
 inline bool AreSame(float l, float r)
 {
-	return std::fabs(l-r) <= FLT_EPSILON;
+	return std::fabs(l-r) <= FLT_EPSILON * std::max(1.0f, std::max(std::fabs(l), std::fabs(r)));
 }
 
 inline bool AreSame(double l, double r)
 {
-	return std::fabs(l-r) <= DBL_EPSILON;
+	return std::fabs(l-r) <= DBL_EPSILON * std::max(1.0, std::max(std::fabs(l), std::fabs(r)));;
 }
 
 inline float Round(float x)
Original file line number	Diff line number	Diff line change
`@@ -879,7 +879,7 @@ void GeoscapeState::time5Seconds()`
`879`	`879`	`continue;`
`880`	`880`	`}`
`881`	`881`	`// Can we actually fight it`
`882`		`- if (!(j)->isInDogfight() && !(j)->getDistance(u))`
	`882`	`+ if (!(*j)->isInDogfight())`
`883`	`883`	`{`
`884`	`884`	`_dogfightsToBeStarted.push_back(new DogfightState(this, (*j), u));`
`885`	`885`	`if ((j)->getRules()->isWaterOnly() && u->getAltitudeInt() > (j)->getRules()->getMaxAltitude())`
Original file line number	Diff line number	Diff line change
`@@ -685,6 +685,7 @@ void Craft::think()`
`685`	`685`	`else`
`686`	`686`	`{`
`687`	`687`	`_takeoff--;`
	`688`	`+ resetMeetPoint();`
`688`	`689`	`}`
`689`	`690`	`if (reachedDestination() && _dest == (Target*)_base)`
`690`	`691`	`{`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ void MovingTarget::move()`
`207`	`207`	`calculateSpeed();`
`208`	`208`	`if (_dest != 0)`
`209`	`209`	`{`
`210`		`- if (getDistance(_dest) > _speedRadian)`
	`210`	`+ if (getDistance(_meetPointLon, _meetPointLat) > _speedRadian)`
`211`	`211`	`{`
`212`	`212`	`setLongitude(_lon + _speedLon);`
`213`	`213`	`setLatitude(_lat + _speedLat);`
`@@ -216,6 +216,7 @@ void MovingTarget::move()`
`216`	`216`	`{`
`217`	`217`	`setLongitude(_dest->getLongitude());`
`218`	`218`	`setLatitude(_dest->getLatitude());`
	`219`	`+ resetMeetPoint();`
`219`	`220`	`}`
`220`	`221`	`}`
`221`	`222`	`}`
`@@ -240,7 +241,7 @@ void MovingTarget::calculateMeetPoint()`
`240`	`241`	`_meetPointLon = _lon;`
`241`	`242`	`}`
`242`	`243`
`243`		`- if (!_dest \|\| !Options::meetingPoint) return;`
	`244`	`+ if (!_dest \|\| !Options::meetingPoint \|\| reachedDestination()) return;`
`244`	`245`
`245`	`246`	`MovingTarget t = dynamic_cast<MovingTarget>(_dest);`
`246`	`247`	`if (!t \|\| !t->getDestination()) return;`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,12 @@ std::vector<Craft*> Target::getCraftFollowers() const`
`238`	`238`	`*/`
`239`	`239`	`double Target::getDistance(const Target *target) const`
`240`	`240`	`{`
`241`		`- return acos(cos(_lat) * cos(target->getLatitude()) * cos(target->getLongitude() - _lon) + sin(_lat) * sin(target->getLatitude()));`
	`241`	`+ return getDistance(target->getLongitude(), target->getLatitude());`
	`242`	`+}`
	`243`	`+`
	`244`	`+double Target::getDistance(double lon, double lat) const`
	`245`	`+{`
	`246`	`+ return acos(cos(_lat) * cos(lat) * cos(lon - _lon) + sin(_lat) * sin(lat));`
`242`	`247`	`}`
`243`	`248`
`244`	`249`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ class Target`
`80`	`80`	`std::vector<Craft*> getCraftFollowers() const;`
`81`	`81`	`/// Gets the distance to another target.`
`82`	`82`	`double getDistance(const Target *target) const;`
	`83`	`+ double getDistance(double lon, double lat) const;`
`83`	`84`	`};`
`84`	`85`
`85`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,12 +32,12 @@`
`32`	`32`
`33`	`33`	`inline bool AreSame(float l, float r)`
`34`	`34`	`{`
`35`		`- return std::fabs(l-r) <= FLT_EPSILON;`
	`35`	`+ return std::fabs(l-r) <= FLT_EPSILON * std::max(1.0f, std::max(std::fabs(l), std::fabs(r)));`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`inline bool AreSame(double l, double r)`
`39`	`39`	`{`
`40`		`- return std::fabs(l-r) <= DBL_EPSILON;`
	`40`	`+ return std::fabs(l-r) <= DBL_EPSILON * std::max(1.0, std::max(std::fabs(l), std::fabs(r)));;`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`inline float Round(float x)`