[Scummvm-cvs-logs] scummvm master -> 5673dc16925c67eb4c5bb91227773ed6087cf087
lordhoto
lordhoto at gmail.com
Sat Jan 26 14:44:16 CET 2013
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:
5673dc1692 QUEEN: Rename override to overrideCmd.
Commit: 5673dc16925c67eb4c5bb91227773ed6087cf087
https://github.com/scummvm/scummvm/commit/5673dc16925c67eb4c5bb91227773ed6087cf087
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-01-26T05:43:21-08:00
Commit Message:
QUEEN: Rename override to overrideCmd.
This fixes compilation on pre-C++11 compilers.
Changed paths:
engines/queen/sound.cpp
engines/queen/sound.h
diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp
index ac58dda..dd01a7e 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 371500f..6a5dfc2 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;
};
More information about the Scummvm-git-logs
mailing list