[Scummvm-cvs-logs] scummvm master -> 94fd3809bf57ca9f4cd054dcbb06364fbee53151

[clone2727]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
94fd3809bf PEGASUS: Fix going left initially in the globe game


Commit: 94fd3809bf57ca9f4cd054dcbb06364fbee53151
    https://github.com/scummvm/scummvm/commit/94fd3809bf57ca9f4cd054dcbb06364fbee53151
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2013-05-12T16:42:32-07:00

Commit Message:
PEGASUS: Fix going left initially in the globe game

Changed paths:
    engines/pegasus/neighborhood/norad/delta/globegame.cpp



diff --git a/engines/pegasus/neighborhood/norad/delta/globegame.cpp b/engines/pegasus/neighborhood/norad/delta/globegame.cpp
index 35ec9b8..1416c51 100644
--- a/engines/pegasus/neighborhood/norad/delta/globegame.cpp
+++ b/engines/pegasus/neighborhood/norad/delta/globegame.cpp
@@ -64,6 +64,10 @@ void GlobeTracker::setTrackParameters(const Hotspot *trackSpot, GlobeTrackDirect
 
 		_globeMovie->setSegment(start, start + kDurationPerRow);
 
+		// Clip new time so we don't go past the end of the segment
+		if (newTime >= start + kDurationPerRow)
+			newTime = start + kDurationPerRow - 1;
+
 		if (newTime != time) {
 			_globeMovie->setTime(newTime);
 			_globeMovie->redrawMovieWorld();
@@ -84,6 +88,10 @@ void GlobeTracker::setTrackParameters(const Hotspot *trackSpot, GlobeTrackDirect
 
 		_globeMovie->setSegment(start, start + kDurationPerRow);
 
+		// Clip new time so we don't go past the end of the segment
+		if (newTime >= start + kDurationPerRow)
+			newTime = start + kDurationPerRow - 1;
+
 		if (newTime != time) {
 			_globeMovie->setTime(newTime);
 			_globeMovie->redrawMovieWorld();