[Scummvm-git-logs] scummvm master -> 4325605111d70917bf8de16fd50cd4f2b363782e

[sev-]

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

Summary:
e0b3001218 SCUMM: Add missing return statement
18e263129f AGI: PREAGI: Add missing break statements
200b9070b3 AGI: PREAGI: Add one more missing break statement
c76e2666f5 JANITORIAL: Fix GCC 7 fall through warning
4325605111 DIRECTOR: Lingo: Add missing break statement


Commit: e0b3001218f73c978d30642e4a9dcfac415dd79f
    https://github.com/scummvm/scummvm/commit/e0b3001218f73c978d30642e4a9dcfac415dd79f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-11T20:20:25+02:00

Commit Message:
SCUMM: Add missing return statement

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 4a53ca3..cc92631 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -1760,6 +1760,7 @@ void ScummEngine_v5::o5_roomOps() {
 					return;
 				case 18: // clear kMainVirtScreen layer 2 buffer
 					_textSurface.fillRect(Common::Rect(0, _virtscr[kMainVirtScreen].topline * _textSurfaceMultiplier, _textSurface.pitch, (_virtscr[kMainVirtScreen].topline + _virtscr[kMainVirtScreen].h) * _textSurfaceMultiplier), 0);
+					return;
 				case 19: // enable palette operations (palManipulate(), cyclePalette() etc.)
 					_townsPaletteFlags |= 1;
 					return;


Commit: 18e263129f351023d6c799281dc736069c017ac6
    https://github.com/scummvm/scummvm/commit/18e263129f351023d6c799281dc736069c017ac6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-11T20:33:21+02:00

Commit Message:
AGI: PREAGI: Add missing break statements

Changed paths:
    engines/agi/preagi.cpp


diff --git a/engines/agi/preagi.cpp b/engines/agi/preagi.cpp
index f8630db..16a2002 100644
--- a/engines/agi/preagi.cpp
+++ b/engines/agi/preagi.cpp
@@ -217,12 +217,15 @@ int PreAgiEngine::getSelection(SelectionTypes type) {
 				case Common::KEYCODE_y:
 					if (type == kSelYesNo)
 						return 1;
+					break;
 				case Common::KEYCODE_n:
 					if (type == kSelYesNo)
 						return 0;
+					break;
 				case Common::KEYCODE_ESCAPE:
 					if (type == kSelNumber || type == kSelAnyKey)
 						return 0;
+					break;
 				case Common::KEYCODE_1:
 				case Common::KEYCODE_2:
 				case Common::KEYCODE_3:
@@ -234,12 +237,15 @@ int PreAgiEngine::getSelection(SelectionTypes type) {
 				case Common::KEYCODE_9:
 					if (type == kSelNumber)
 						return event.kbd.keycode - Common::KEYCODE_1 + 1;
+					break;
 				case Common::KEYCODE_SPACE:
 					if (type == kSelSpace)
 						return 1;
+					break;
 				case Common::KEYCODE_BACKSPACE:
 					if (type == kSelBackspace)
 						return 0;
+					break;
 				default:
 					if (event.kbd.flags & Common::KBD_CTRL)
 						break;


Commit: 200b9070b36e8263b0cdb8ccc976d03b65ebcb2f
    https://github.com/scummvm/scummvm/commit/200b9070b36e8263b0cdb8ccc976d03b65ebcb2f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-11T20:38:35+02:00

Commit Message:
AGI: PREAGI: Add one more missing break statement

Changed paths:
    engines/agi/preagi.cpp


diff --git a/engines/agi/preagi.cpp b/engines/agi/preagi.cpp
index 16a2002..bde7fda 100644
--- a/engines/agi/preagi.cpp
+++ b/engines/agi/preagi.cpp
@@ -204,6 +204,7 @@ int PreAgiEngine::getSelection(SelectionTypes type) {
 			case Common::EVENT_LBUTTONUP:
 				if (type == kSelYesNo || type == kSelAnyKey)
 					return 1;
+				break;
 			case Common::EVENT_KEYDOWN:
 				if (event.kbd.keycode == Common::KEYCODE_d && (event.kbd.flags & Common::KBD_CTRL) && console) {
 					console->attach();


Commit: c76e2666f56f64b8274d6a8c5b42a40dc9604779
    https://github.com/scummvm/scummvm/commit/c76e2666f56f64b8274d6a8c5b42a40dc9604779
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-11T20:40:37+02:00

Commit Message:
JANITORIAL: Fix GCC 7 fall through warning

Changed paths:
    engines/cine/various.cpp


diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp
index 74dee1f..d6654f1 100644
--- a/engines/cine/various.cpp
+++ b/engines/cine/various.cpp
@@ -1770,6 +1770,7 @@ bool makeTextEntryMenu(const char *messagePtr, char *inputString, int stringMaxL
 			}
 			inputPos--;
 			redraw = true;
+			// fall through
 		case Common::KEYCODE_DELETE:
 			if (inputPos <= inputLength) {
 				if (inputPos != 1) {


Commit: 4325605111d70917bf8de16fd50cd4f2b363782e
    https://github.com/scummvm/scummvm/commit/4325605111d70917bf8de16fd50cd4f2b363782e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-11T20:44:42+02:00

Commit Message:
DIRECTOR: Lingo: Add missing break statement

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


diff --git a/engines/director/lingo/lingo-events.cpp b/engines/director/lingo/lingo-events.cpp
index 1dc131e..d5a626a 100644
--- a/engines/director/lingo/lingo-events.cpp
+++ b/engines/director/lingo/lingo-events.cpp
@@ -280,6 +280,8 @@ void Lingo::processEvent(LEvent event) {
 			break;
 		case kEventBeginSprite:
 			processSpriteEvent(event);
+			break;
+
 		default:
 			warning("processEvent: Unhandled event %s", _eventHandlerTypes[event]);
 	}