[Scummvm-git-logs] scummvm master -> a84532e01226e8b7e863232202445992e2a96abe

[sev-]

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:
a84532e012 DIRECTOR: Fix compilation


Commit: a84532e01226e8b7e863232202445992e2a96abe
    https://github.com/scummvm/scummvm/commit/a84532e01226e8b7e863232202445992e2a96abe
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-20T09:45:46+02:00

Commit Message:
DIRECTOR: Fix compilation

Changed paths:
    engines/director/lingo/lingo-object.cpp
    engines/director/stage.cpp


diff --git a/engines/director/lingo/lingo-object.cpp b/engines/director/lingo/lingo-object.cpp
index 39fef8a37b..c00a66c93b 100644
--- a/engines/director/lingo/lingo-object.cpp
+++ b/engines/director/lingo/lingo-object.cpp
@@ -143,7 +143,7 @@ ScriptContext::ScriptContext(Common::String name, LingoArchive *archive, ScriptT
 	_objType = kScriptObj;
 }
 
-ScriptContext::ScriptContext(const ScriptContext &sc) : Object(sc) {
+ScriptContext::ScriptContext(const ScriptContext &sc) : Object<ScriptContext>(sc) {
 	_scriptType = sc._scriptType;
 	_functionNames = sc._functionNames;
 	for (SymbolHash::iterator it = sc._functionHandlers.begin(); it != sc._functionHandlers.end(); ++it) {
diff --git a/engines/director/stage.cpp b/engines/director/stage.cpp
index dd22d56ae1..4445830b79 100644
--- a/engines/director/stage.cpp
+++ b/engines/director/stage.cpp
@@ -42,7 +42,7 @@
 namespace Director {
 
 Stage::Stage(int id, bool scrollable, bool resizable, bool editable, Graphics::MacWindowManager *wm, DirectorEngine *vm)
-	: MacWindow(id, scrollable, resizable, editable, wm), Object("Stage") {
+	: MacWindow(id, scrollable, resizable, editable, wm), Object<Stage>("Stage") {
 	_vm = vm;
 	_stageColor = 0;
 	_puppetTransition = nullptr;