[Scummvm-git-logs] scummvm master -> 17a74d2bc791aa392cd1b170dd7ef0fecea403e7

[waltervn]

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:
17a74d2bc7 ADL: Fix shadowing warning in some versions of GCC


Commit: 17a74d2bc791aa392cd1b170dd7ef0fecea403e7
    https://github.com/scummvm/scummvm/commit/17a74d2bc791aa392cd1b170dd7ef0fecea403e7
Author: Walter van Niftrik (walter at scummvm.org)
Date: 2018-12-26T13:25:48+01:00

Commit Message:
ADL: Fix shadowing warning in some versions of GCC

Changed paths:
    engines/adl/adl.h


diff --git a/engines/adl/adl.h b/engines/adl/adl.h
index 5de53ca..143b074 100644
--- a/engines/adl/adl.h
+++ b/engines/adl/adl.h
@@ -419,7 +419,7 @@ private:
 	virtual void switchRegion(byte region) { }
 	void runScript(const char *filename) const;
 	void stopScript() const;
-	void setScriptDelay(uint delay) const { _scriptDelay = delay; }
+	void setScriptDelay(uint scriptDelay) const { _scriptDelay = scriptDelay; }
 	Common::String getScriptLine() const;
 	// Engine
 	Common::Error run();