diff --git a/engines/director/lingo/lingodec/ast.h b/engines/director/lingo/lingodec/ast.h index 0c21cd3fa46..b1d7122bd8c 100644 --- a/engines/director/lingo/lingodec/ast.h +++ b/engines/director/lingo/lingodec/ast.h @@ -316,12 +316,12 @@ struct MemberExprNode : ExprNode { Common::SharedPtr memberID; Common::SharedPtr castID; - MemberExprNode(Common::String type_, Common::SharedPtr memberID, Common::SharedPtr castID) + MemberExprNode(Common::String type_, Common::SharedPtr memberID_, Common::SharedPtr castID_) : ExprNode(kMemberExprNode), type(type_) { - this->memberID = Common::move(memberID); + this->memberID = Common::move(memberID_); this->memberID->parent = this; - if (castID) { - this->castID = Common::move(castID); + if (castID_) { + this->castID = Common::move(castID_); this->castID->parent = this; } } @@ -425,8 +425,8 @@ struct RepeatWithToStmtNode : LoopNode { Common::SharedPtr end; Common::SharedPtr block; - RepeatWithToStmtNode(uint32 startIndex_, Common::String v, Common::SharedPtr s, bool up, Common::SharedPtr e) - : LoopNode(kRepeatWithToStmtNode, startIndex_), up(up) { + RepeatWithToStmtNode(uint32 startIndex_, Common::String v, Common::SharedPtr s, bool up_, Common::SharedPtr e) + : LoopNode(kRepeatWithToStmtNode, startIndex_), up(up_) { varName = v; start = Common::move(s); start->parent = this; diff --git a/engines/director/lingo/lingodec/context.h b/engines/director/lingo/lingodec/context.h index 62b0a503013..3a0e4425057 100644 --- a/engines/director/lingo/lingodec/context.h +++ b/engines/director/lingo/lingodec/context.h @@ -44,8 +44,8 @@ struct ScriptContext { Common::Array sectionMap; Common::StableMap scripts; - ScriptContext(unsigned int version, ChunkResolver *resolver) : version(version), - resolver(resolver), + ScriptContext(unsigned int version_, ChunkResolver *resolver_) : version(version_), + resolver(resolver_), lnam(nullptr) {} void read(Common::SeekableReadStream &stream); diff --git a/engines/director/lingo/lingodec/handler.cpp b/engines/director/lingo/lingodec/handler.cpp index c90af798062..fba36cb4aa5 100644 --- a/engines/director/lingo/lingodec/handler.cpp +++ b/engines/director/lingo/lingodec/handler.cpp @@ -169,7 +169,7 @@ Common::SharedPtr Handler::readVar(int varType) { case 0x6: // field return Common::SharedPtr(new MemberExprNode("field", Common::move(id), Common::move(castID))); default: - warning(Common::String::format("findVar: unhandled var type %d", varType).c_str()); + warning("%s", Common::String::format("findVar: unhandled var type %d", varType).c_str()); break; } return Common::SharedPtr(new ErrorNode()); diff --git a/engines/director/lingo/lingodec/script.cpp b/engines/director/lingo/lingodec/script.cpp index c4c3f8d8b88..59e783090e0 100644 --- a/engines/director/lingo/lingodec/script.cpp +++ b/engines/director/lingo/lingodec/script.cpp @@ -17,8 +17,8 @@ namespace LingoDec { /* Script */ -Script::Script(unsigned int version) : - version(version), +Script::Script(unsigned int version_) : + version(version_), context(nullptr) {} Script::~Script() = default; diff --git a/engines/director/lingo/lingodec/script.h b/engines/director/lingo/lingodec/script.h index 11173a50a2c..33945ee4c81 100644 --- a/engines/director/lingo/lingodec/script.h +++ b/engines/director/lingo/lingodec/script.h @@ -74,7 +74,7 @@ struct Script { unsigned int version; ScriptContext *context; - Script(unsigned int version); + Script(unsigned int version_); ~Script(); void read(Common::SeekableReadStream &stream); Common::Array readVarnamesTable(Common::SeekableReadStream &stream, uint16 count, uint32 offset);