[Scummvm-git-logs] scummvm master -> 1ca0510284b88b7a05e6d8a1536153e863e8e43d

[sev-]

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:
6e568ba765 GRAPHICS: MACGUI: Catch 'delete' button in MacText. No code for processing yet
1ca0510284 DIRECTOR: LINGO: Remove now redundant sanity check


Commit: 6e568ba7650193a1677e3b054a58184530a40d49
    https://github.com/scummvm/scummvm/commit/6e568ba7650193a1677e3b054a58184530a40d49
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-06-18T10:44:47+02:00

Commit Message:
GRAPHICS: MACGUI: Catch 'delete' button in MacText. No code for processing yet

Changed paths:
    graphics/macgui/mactext.cpp


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index c4d2365ee8..2d72389bf2 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -1127,6 +1127,11 @@ bool MacText::processEvent(Common::Event &event) {
 
 			return true;
 
+		case Common::KEYCODE_DELETE:
+			// TODO
+			warning("MacText::processEvent(): Delete is not yet implemented");
+			return true;
+
 		default:
 			if (event.kbd.ascii == '~')
 				return false;


Commit: 1ca0510284b88b7a05e6d8a1536153e863e8e43d
    https://github.com/scummvm/scummvm/commit/1ca0510284b88b7a05e6d8a1536153e863e8e43d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-06-18T10:47:57+02:00

Commit Message:
DIRECTOR: LINGO: Remove now redundant sanity check

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


diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 5ce1a4131a..ee2dd6fba2 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -180,8 +180,7 @@ ScriptContext *Lingo::getScriptContext(int archiveIndex, ScriptType type, uint16
 	if (archiveIndex < 0)
 		return NULL;
 
-	if (type >= ARRAYSIZE(_archives[archiveIndex].scriptContexts) ||
-			!_archives[archiveIndex].scriptContexts[type].contains(id)) {
+	if (!_archives[archiveIndex].scriptContexts[type].contains(id)) {
 		return NULL;
 	}