[Scummvm-cvs-logs] scummvm master -> df311132228c338b1c22707abade0488fca0db30

[eriktorbjorn]

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:
df31113222 ACCESS: Rename local variable to silence GCC warning


Commit: df311132228c338b1c22707abade0488fca0db30
    https://github.com/scummvm/scummvm/commit/df311132228c338b1c22707abade0488fca0db30
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-07-24T09:14:25+02:00

Commit Message:
ACCESS: Rename local variable to silence GCC warning

Changed paths:
    engines/access/amazon/amazon_scripts.cpp



diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 8c49424..d8f4663 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -380,7 +380,7 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 typedef void(AmazonScripts::*AmazonScriptMethodPtr)();
 
 void AmazonScripts::executeCommand(int commandIndex) {
-	static const AmazonScriptMethodPtr COMMAND_LIST[] = {
+	static const AmazonScriptMethodPtr AMAZON_COMMAND_LIST[] = {
 		&AmazonScripts::cmdHelp_v2, &AmazonScripts::cmdCycleBack,
 		&AmazonScripts::cmdChapter, &AmazonScripts::cmdSetHelp,
 		&AmazonScripts::cmdCenterPanel, &AmazonScripts::cmdMainPanel,
@@ -388,7 +388,7 @@ void AmazonScripts::executeCommand(int commandIndex) {
 	};
 
 	if (commandIndex >= 73)
-		(this->*COMMAND_LIST[commandIndex - 73])();
+		(this->*AMAZON_COMMAND_LIST[commandIndex - 73])();
 	else
 		Scripts::executeCommand(commandIndex);
 }