[Scummvm-git-logs] scummvm master -> 27ec158e04be2aaff388464c9ec87b35d1ad84c6

[stevenhoefel]

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:
27ec158e04 DIRECTOR: Correct MouseDown Event Handler and fix switch statements missing breaks.


Commit: 27ec158e04be2aaff388464c9ec87b35d1ad84c6
    https://github.com/scummvm/scummvm/commit/27ec158e04be2aaff388464c9ec87b35d1ad84c6
Author: stevenhoefel (stevenhoefel at hotmail.com)
Date: 2020-04-06T23:42:15+10:00

Commit Message:
DIRECTOR: Correct MouseDown Event Handler and fix switch statements missing breaks.

Changed paths:
    engines/director/frame.cpp
    engines/director/lingo/lingo-events.cpp


diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 477d2be2bc..4c5185522e 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -577,8 +577,10 @@ void Frame::renderSprites(Graphics::ManagedSurface &surface, bool renderTrail) {
 					switch (_sprites[i]->_cast->_type) {
 					case kCastButton:
 						castType = kCastButton;
+						break;
 					default:
 						castType = kCastShape;
+						break;
 					}
 				} else {
 					castType = kCastShape;
@@ -591,6 +593,7 @@ void Frame::renderSprites(Graphics::ManagedSurface &surface, bool renderTrail) {
 			case kCheckboxSprite:
 			case kRadioButtonSprite:
 				castType = kCastButton;
+				break;
 			default:
 				warning("Frame::renderSprites(): Unhandled sprite type %d", _sprites[i]->_spriteType);
 				break;
diff --git a/engines/director/lingo/lingo-events.cpp b/engines/director/lingo/lingo-events.cpp
index b869856b9e..c3f7840742 100644
--- a/engines/director/lingo/lingo-events.cpp
+++ b/engines/director/lingo/lingo-events.cpp
@@ -174,7 +174,7 @@ void Lingo::processInputEvent(LEvent event) {
 		processEvent(event, kCastScript, currentFrame->_sprites[spriteId]->_castId);
 		processEvent(event, kFrameScript, score->_frames[score->getCurrentFrame()]->_actionId);
 		// TODO: Is the kFrameScript call above correct?
-	} else if (event == kEventMouseUp || event == kEventMouseDown) {
+	} else if (event == kEventMouseUp) {
 		// Frame script overrides sprite script
 		if (!currentFrame->_sprites[spriteId]->_scriptId) {
 			processEvent(kEventNone, kSpriteScript, currentFrame->_sprites[spriteId]->_castId + score->_castIDoffset);
@@ -182,6 +182,8 @@ void Lingo::processInputEvent(LEvent event) {
 		} else {
 			processEvent(kEventNone, kFrameScript, currentFrame->_sprites[spriteId]->_scriptId);
 		}
+	} else if (event == kEventMouseDown) {
+		processEvent(event, kSpriteScript, currentFrame->_sprites[spriteId]->_castId + score->_castIDoffset);
 	}
 	if (event == kEventKeyDown) {
 		// TODO: is the above condition necessary or useful?