From 5673dc16925c67eb4c5bb91227773ed6087cf087 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 26 Jan 2013 14:42:41 +0100
Subject: QUEEN: Rename override to overrideCmd.

This fixes compilation on pre-C++11 compilers.
---
 engines/queen/sound.cpp | 4 ++--
 engines/queen/sound.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp
index ac58dda728..dd01a7efcf 100644
--- a/engines/queen/sound.cpp
+++ b/engines/queen/sound.cpp
@@ -246,8 +246,8 @@ void PCSound::playSong(int16 songNum) {
 	if (!musicOn())
 		return;
 
-	int override = (_vm->resource()->isDemo()) ? _songDemo[songNum - 1].override : _song[songNum - 1].override;
-	switch (override) {
+	int overrideCmd = (_vm->resource()->isDemo()) ? _songDemo[songNum - 1].overrideCmd : _song[songNum - 1].overrideCmd;
+	switch (overrideCmd) {
 	// Override all songs
 	case  1:
 		break;
diff --git a/engines/queen/sound.h b/engines/queen/sound.h
index 371500f356..6a5dfc2c28 100644
--- a/engines/queen/sound.h
+++ b/engines/queen/sound.h
@@ -39,7 +39,7 @@ struct SongData {
 	int16 volume;
 	int16 tempo;
 	int16 reverb;
-	int16 override;
+	int16 overrideCmd;
 	int16 ignore;
 };
 
-- 
cgit v1.2.3