[Scummvm-cvs-logs] scummvm master -> 0113e79e23cb4c8d2507546390f18460f2c7083c

[bluegr]

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:
0113e79e23 MADS: Don't error out on unsupported scene transitions


Commit: 0113e79e23cb4c8d2507546390f18460f2c7083c
    https://github.com/scummvm/scummvm/commit/0113e79e23cb4c8d2507546390f18460f2c7083c
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-06-29T05:22:46+03:00

Commit Message:
MADS: Don't error out on unsupported scene transitions

This prevents the game from erroring out when screen fade is toggled

Changed paths:
    engines/mads/screen.cpp



diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp
index 2842686..ab5dff5 100644
--- a/engines/mads/screen.cpp
+++ b/engines/mads/screen.cpp
@@ -630,21 +630,28 @@ void ScreenSurface::transition(ScreenTransition transitionType, bool surfaceFlag
 	case kTransitionBoxInBottomRight:
 	case kTransitionBoxInTopLeft:
 	case kTransitionBoxInTopRight:
-		error("TODO: transition");
+		warning("TODO: box transition");
+		transition(kTransitionFadeIn, surfaceFlag);
 		break;
 
 	case kTransitionPanLeftToRight:
 	case kTransitionPanRightToLeft:
-		error("TODO: transition");
+		warning("TODO: pan transition");
+		transition(kTransitionFadeIn, surfaceFlag);
+		break;
 
 	case kTransitionCircleIn1:
 	case kTransitionCircleIn2:
 	case kTransitionCircleIn3:
 	case kTransitionCircleIn4:
-		error("TODO circle transition");
+		warning("TODO circle transition");
+		transition(kTransitionFadeIn, surfaceFlag);
+		break;
 
 	case kCenterVertTransition:
-		error("TODO: center vert transition");
+		warning("TODO: center vert transition");
+		transition(kTransitionFadeIn, surfaceFlag);
+		break;
 
 	default:
 		// Quick transitions