[Scummvm-cvs-logs] scummvm master -> 531b3cb37660e21abfba79fe80450c63e04245f4

[Strangerke]

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:
531b3cb376 HOPKINS: Fix crash when skipping intro animations (regression in one of the lock/unlock commits)


Commit: 531b3cb37660e21abfba79fe80450c63e04245f4
    https://github.com/scummvm/scummvm/commit/531b3cb37660e21abfba79fe80450c63e04245f4
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-04-10T09:16:21-07:00

Commit Message:
HOPKINS: Fix crash when skipping intro animations (regression in one of the lock/unlock commits)

Changed paths:
    engines/hopkins/graphics.cpp



diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
index b58c2c3..f7d69ff 100644
--- a/engines/hopkins/graphics.cpp
+++ b/engines/hopkins/graphics.cpp
@@ -733,7 +733,8 @@ void GraphicsManager::copyVideoVbe16(const byte *srcData) {
 		byte srcByte = srcP[0];
 		if (srcByte >= 222) {
 			if (srcByte == kByteStop)
-				return;
+				break;
+
 			if (srcByte < kSetOffset) {
 				destOffset += srcByte - 221;
 				srcByte = *++srcP;
@@ -754,7 +755,7 @@ void GraphicsManager::copyVideoVbe16(const byte *srcData) {
 
 		if (destOffset > SCREEN_WIDTH * SCREEN_HEIGHT) {
 			warning("HACK: Stopping anim, out of bounds - 0x%x %d", srcByte, destOffset);
-			return;
+			break;
 		}
 
 		if (srcByte > 210) {
@@ -805,7 +806,7 @@ void GraphicsManager::copyVideoVbe16a(const byte *srcData) {
 	for (;;) {
 		srcByte = srcP[0];
 		if (srcByte == kByteStop)
-			return;
+			break;
 		if (srcP[0] > kByteStop) {
 			if (srcByte == k8bVal) {
 				destOffset += srcP[1];