[Scummvm-cvs-logs] scummvm master -> fa0b38153d0391dbe9acb5ca05538ec7661fae79

[clone2727]

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

Summary:
007e16dfd1 PEGASUS: Fix floor 2/3 elevator buttons not being shown pressed
fa0b38153d PEGASUS: Fix two missing frames in the globe game


Commit: 007e16dfd190f2950da38f997b247c980828e11b
    https://github.com/scummvm/scummvm/commit/007e16dfd190f2950da38f997b247c980828e11b
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2013-05-04T20:36:47-07:00

Commit Message:
PEGASUS: Fix floor 2/3 elevator buttons not being shown pressed

Changed paths:
    engines/pegasus/neighborhood/caldoria/caldoria.cpp



diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.cpp b/engines/pegasus/neighborhood/caldoria/caldoria.cpp
index 3d81a81..9a378a6 100644
--- a/engines/pegasus/neighborhood/caldoria/caldoria.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoria.cpp
@@ -1641,10 +1641,12 @@ void Caldoria::takeElevator(uint startFloor, uint endFloor) {
 			break;
 		case 2:
 			_croppedMovie.setTime(k1To2Time);
+			_croppedMovie.redrawMovieWorld();
 			requestSpotSound(kCaldoriaNoOtherDestinationIn, kCaldoriaNoOtherDestinationOut, kFilterNoInput, kSpotSoundCompletedFlag);
 			break;
 		case 3:
 			_croppedMovie.setTime(k1To3Time);
+			_croppedMovie.redrawMovieWorld();
 			requestSpotSound(kCaldoriaNoOtherDestinationIn, kCaldoriaNoOtherDestinationOut, kFilterNoInput, kSpotSoundCompletedFlag);
 			break;
 		case 4:
@@ -1671,10 +1673,12 @@ void Caldoria::takeElevator(uint startFloor, uint endFloor) {
 			break;
 		case 2:
 			_croppedMovie.setTime(k4To2Time);
+			_croppedMovie.redrawMovieWorld();
 			requestSpotSound(kCaldoriaNoOtherDestinationIn, kCaldoriaNoOtherDestinationOut, kFilterNoInput, kSpotSoundCompletedFlag);
 			break;
 		case 3:
 			_croppedMovie.setTime(k4To3Time);
+			_croppedMovie.redrawMovieWorld();
 			requestSpotSound(kCaldoriaNoOtherDestinationIn, kCaldoriaNoOtherDestinationOut, kFilterNoInput, kSpotSoundCompletedFlag);
 			break;
 		case 4:
@@ -1698,10 +1702,12 @@ void Caldoria::takeElevator(uint startFloor, uint endFloor) {
 			break;
 		case 2:
 			_croppedMovie.setTime(k5To2Time);
+			_croppedMovie.redrawMovieWorld();
 			requestSpotSound(kCaldoriaNoOtherDestinationIn, kCaldoriaNoOtherDestinationOut, kFilterNoInput, kSpotSoundCompletedFlag);
 			break;
 		case 3:
 			_croppedMovie.setTime(k5To3Time);
+			_croppedMovie.redrawMovieWorld();
 			requestSpotSound(kCaldoriaNoOtherDestinationIn, kCaldoriaNoOtherDestinationOut, kFilterNoInput, kSpotSoundCompletedFlag);
 			break;
 		case 4:


Commit: fa0b38153d0391dbe9acb5ca05538ec7661fae79
    https://github.com/scummvm/scummvm/commit/fa0b38153d0391dbe9acb5ca05538ec7661fae79
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2013-05-04T20:48:00-07:00

Commit Message:
PEGASUS: Fix two missing frames 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 06e40c2..35ec9b8 100644
--- a/engines/pegasus/neighborhood/norad/delta/globegame.cpp
+++ b/engines/pegasus/neighborhood/norad/delta/globegame.cpp
@@ -621,6 +621,7 @@ void GlobeGame::receiveNotification(Notification *notification, const Notificati
 			_monitorMovie.stop();
 			_monitorMovie.setSegment(0, _monitorMovie.getDuration());
 			_monitorMovie.setTime(kSplash2End * scale - 1);
+			_monitorMovie.redrawMovieWorld();
 			_monitorMovie.setFlags(0);
 
 			_owner->requestDelay(1, 2, kFilterNoInput, 0);
@@ -643,6 +644,7 @@ void GlobeGame::receiveNotification(Notification *notification, const Notificati
 			_monitorMovie.stop();
 			_monitorMovie.setSegment(0, _monitorMovie.getDuration());
 			_monitorMovie.setTime(kNewLaunchSiloTime * scale);
+			_monitorMovie.redrawMovieWorld();
 			_owner->requestSpotSound(kNewLaunchSiloIn, kNewLaunchSiloOut, kFilterNoInput,
 					kSpotSoundCompletedFlag);
 			_gameState = kPlayingNewSilo1;