diff options
| author | Johannes Schickel | 2013-01-26 14:42:41 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2013-01-26 14:43:21 +0100 |
| commit | 5673dc16925c67eb4c5bb91227773ed6087cf087 (patch) | |
| tree | 2c65326769170f2be7e66de1a053f09eb6e23b50 | |
| parent | 2ef500ce8108208099ff1aec2a99f4db54e33418 (diff) | |
| download | scummvm-rg350-5673dc16925c67eb4c5bb91227773ed6087cf087.tar.gz scummvm-rg350-5673dc16925c67eb4c5bb91227773ed6087cf087.tar.bz2 scummvm-rg350-5673dc16925c67eb4c5bb91227773ed6087cf087.zip | |
QUEEN: Rename override to overrideCmd.
This fixes compilation on pre-C++11 compilers.
| -rw-r--r-- | engines/queen/sound.cpp | 4 | ||||
| -rw-r--r-- | 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; }; |