Merge branch 'develop' into feature/label_hero_character

This commit is contained in:
Kevin G Christiano 2019-09-17 16:37:50 -04:00
commit 52387fe9c9

View File

@ -174,7 +174,7 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
super.init(frame: .zero)
setText(fullText, startTag: startTag, endTag: endTag)
actionBlock = label?.createActionBlockFrom(actionMap: actionMap, additionalData: additionalData, delegateObject: delegateObject)
setActionMap(actionMap, additionalData: additionalData, delegateObject: delegateObject)
}
//------------------------------------------------------