[Scummvm-git-logs] scummvm master -> 2d69d675681ca5308704c37e65b79629f14f0289

sev- sev at scummvm.org
Sun Jan 15 18:04:44 CET 2017


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:
2d69d67568 DIRECTOR: Lingo: Fixing calling built-in symbols


Commit: 2d69d675681ca5308704c37e65b79629f14f0289
    https://github.com/scummvm/scummvm/commit/2d69d675681ca5308704c37e65b79629f14f0289
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-15T18:04:34+01:00

Commit Message:
DIRECTOR: Lingo: Fixing calling built-in symbols

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


diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index b75dc0b..01b6207 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -273,8 +273,12 @@ ScriptType Lingo::event2script(LEvent ev) {
 }
 
 Symbol *Lingo::getHandler(Common::String &name) {
-	if (!_eventHandlerTypeIds.contains(name))
+	if (!_eventHandlerTypeIds.contains(name)) {
+		if (_builtins.contains(name))
+			return _builtins[name];
+
 		return NULL;
+	}
 
 	uint32 entityIndex = ENTITY_INDEX(_eventHandlerTypeIds[name], _currentEntityId);
 	if (!_handlers.contains(entityIndex))





More information about the Scummvm-git-logs mailing list