Merge remote-tracking branch 'upstream/master' into slideshows

myk002 · myk002 · commit ea8a89973a99 · 2015-05-10T10:34:30.000-07:00
diff --git a/src/Savegame/AlienMission.cpp b/src/Savegame/AlienMission.cpp
@@ -444,11 +444,19 @@ void AlienMission::ufoReachedWaypoint(Ufo &ufo, Game &engine, const Globe &globe
 		}
 		else
 		{
-			// Set timer for UFO on the ground.
-			ufo.setSecondsRemaining(trajectory.groundTimer()*5);
-			if (ufo.getDetected() && ufo.getLandId() == 0)
+			if (globe.insideLand(ufo.getLongitude(), ufo.getLatitude()))
 			{
-				ufo.setLandId(engine.getSavedGame()->getId("STR_LANDING_SITE"));
+				// Set timer for UFO on the ground.
+				ufo.setSecondsRemaining(trajectory.groundTimer() * 5);
+				if (ufo.getDetected() && ufo.getLandId() == 0)
+				{
+					ufo.setLandId(engine.getSavedGame()->getId("STR_LANDING_SITE"));
+				}
+			}
+			else
+			{
+				// There's nothing to land on
+				ufo.setSecondsRemaining(5);
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -444,11 +444,19 @@ void AlienMission::ufoReachedWaypoint(Ufo &ufo, Game &engine, const Globe &globe`
`444`	`444`	`}`
`445`	`445`	`else`
`446`	`446`	`{`
`447`		`- // Set timer for UFO on the ground.`
`448`		`- ufo.setSecondsRemaining(trajectory.groundTimer()*5);`
`449`		`- if (ufo.getDetected() && ufo.getLandId() == 0)`
	`447`	`+ if (globe.insideLand(ufo.getLongitude(), ufo.getLatitude()))`
`450`	`448`	`{`
`451`		`- ufo.setLandId(engine.getSavedGame()->getId("STR_LANDING_SITE"));`
	`449`	`+ // Set timer for UFO on the ground.`
	`450`	`+ ufo.setSecondsRemaining(trajectory.groundTimer() * 5);`
	`451`	`+ if (ufo.getDetected() && ufo.getLandId() == 0)`
	`452`	`+ {`
	`453`	`+ ufo.setLandId(engine.getSavedGame()->getId("STR_LANDING_SITE"));`
	`454`	`+ }`
	`455`	`+ }`
	`456`	`+ else`
	`457`	`+ {`
	`458`	`+ // There's nothing to land on`
	`459`	`+ ufo.setSecondsRemaining(5);`
`452`	`460`	`}`
`453`	`461`	`}`
`454`	`462`	`}`