[Scummvm-git-logs] scummvm master -> 19563ca0f36725b0b6402f470fb11af58094770e

[digitall]

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:
19563ca0f3 TINSEL: Fix Shadowed Constructor GCC Compiler Warning


Commit: 19563ca0f36725b0b6402f470fb11af58094770e
    https://github.com/scummvm/scummvm/commit/19563ca0f36725b0b6402f470fb11af58094770e
Author: D G Turner (digitall at scummvm.org)
Date: 2020-05-15T07:56:14+01:00

Commit Message:
TINSEL: Fix Shadowed Constructor GCC Compiler Warning

Changed paths:
    engines/tinsel/tinlib.cpp


diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index 1f0386ab51..6d92e98d01 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -635,7 +635,7 @@ static void AuxScale(int actor, int scale, SCNHANDLE *rp) {
 /**
  * Defines the background image for a scene.
  */
-static void Background(CORO_PARAM, SCNHANDLE bfilm) {
+static void startBackground(CORO_PARAM, SCNHANDLE bfilm) {
 	_vm->_bg->StartupBackground(coroParam, bfilm);
 }
 
@@ -4279,7 +4279,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 
 	case BACKGROUND:
 		// Common to both DW1 & DW2
-		Background(coroParam, pp[0]);
+		startBackground(coroParam, pp[0]);
 		return -1;
 
 	case BLOCKING: