[Scummvm-git-logs] scummvm master -> 18f6172125e43a35d71231535b2365e1ce2a5cb1

[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:
b9b3ba3285 GLK: COMPREHEND: Added missing override keywords
18f6172125 GLK: COMPREHEND: Fix warning


Commit: b9b3ba3285495fbd554efa8ada58adf6067fe750
    https://github.com/scummvm/scummvm/commit/b9b3ba3285495fbd554efa8ada58adf6067fe750
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-17T11:44:23+02:00

Commit Message:
GLK: COMPREHEND: Added missing override keywords

Changed paths:
    engines/glk/comprehend/game_opcodes.h
    engines/glk/zcode/zcode.h


diff --git a/engines/glk/comprehend/game_opcodes.h b/engines/glk/comprehend/game_opcodes.h
index 3222ab3122..fe77980195 100644
--- a/engines/glk/comprehend/game_opcodes.h
+++ b/engines/glk/comprehend/game_opcodes.h
@@ -46,7 +46,7 @@ public:
 	virtual byte getOpcode(const Instruction *instr) {
 		return instr->_opcode;
 	}
-	virtual ScriptOpcode getScriptOpcode(const Instruction *instr) {
+	virtual ScriptOpcode getScriptOpcode(const Instruction *instr) override {
 		return _opcodeMap[getOpcode(instr)];
 	}
 };
diff --git a/engines/glk/zcode/zcode.h b/engines/glk/zcode/zcode.h
index d18cac64a6..7641e30b0b 100644
--- a/engines/glk/zcode/zcode.h
+++ b/engines/glk/zcode/zcode.h
@@ -74,7 +74,7 @@ public:
 	/**
 	 * Indicates whether an autosave can currently be saved.
 	 */
-	virtual bool canSaveAutosaveCurrently() {
+	virtual bool canSaveAutosaveCurrently() override {
 		/* ZCode saves also include the execution stack.
 		 * So I don't know how to do autosaves in the background
 		 * without ending up with an invalid stack state


Commit: 18f6172125e43a35d71231535b2365e1ce2a5cb1
    https://github.com/scummvm/scummvm/commit/18f6172125e43a35d71231535b2365e1ce2a5cb1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-17T11:44:57+02:00

Commit Message:
GLK: COMPREHEND: Fix warning

Changed paths:
    engines/glk/comprehend/debugger_dumper.cpp


diff --git a/engines/glk/comprehend/debugger_dumper.cpp b/engines/glk/comprehend/debugger_dumper.cpp
index c6478e510f..41d60c7f85 100644
--- a/engines/glk/comprehend/debugger_dumper.cpp
+++ b/engines/glk/comprehend/debugger_dumper.cpp
@@ -165,6 +165,9 @@ Common::String DebuggerDumper::dumpInstruction(ComprehendGame *game,
 	case OPCODE_SET_STRING_REPLACEMENT3:
 		line += Common::String::format(" %s", game->_replaceWords[instr->_operand[0] - 1].c_str());
 		break;
+
+	default:
+		break;
 	}
 
 	return line;