diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:34:29 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:39:44 +0200 |
| commit | 01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6 (patch) | |
| tree | 544b07f3aa41abe7907bcd2040cdad11ebc324bb /engines/tucker | |
| parent | 9cf2c83e5e5a35816ab153bf8443dac691829ea8 (diff) | |
| parent | a41d72a44a660c72fdadbc3a8ef580e5e03cb890 (diff) | |
| download | scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.tar.gz scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.tar.bz2 scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.zip | |
Merge branch 'master'
Diffstat (limited to 'engines/tucker')
| -rw-r--r-- | engines/tucker/detection.cpp | 16 | ||||
| -rw-r--r-- | engines/tucker/staticres.cpp | 2 | ||||
| -rw-r--r-- | engines/tucker/tucker.h | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/engines/tucker/detection.cpp b/engines/tucker/detection.cpp index 4a3313e3f7..77c84b281c 100644 --- a/engines/tucker/detection.cpp +++ b/engines/tucker/detection.cpp @@ -43,7 +43,7 @@ static const ADGameDescription tuckerGameDescriptions[] = { Common::FR_FRA, Common::kPlatformPC, Tucker::kGameFlagNoSubtitles, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, { "tucker", @@ -52,7 +52,7 @@ static const ADGameDescription tuckerGameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, Tucker::kGameFlagEncodedData, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, { "tucker", @@ -61,7 +61,7 @@ static const ADGameDescription tuckerGameDescriptions[] = { Common::ES_ESP, Common::kPlatformPC, Tucker::kGameFlagEncodedData, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, { "tucker", @@ -70,7 +70,7 @@ static const ADGameDescription tuckerGameDescriptions[] = { Common::DE_DEU, Common::kPlatformPC, Tucker::kGameFlagEncodedData, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, { "tucker", @@ -79,7 +79,7 @@ static const ADGameDescription tuckerGameDescriptions[] = { Common::PL_POL, Common::kPlatformPC, 0, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, { "tucker", @@ -88,7 +88,7 @@ static const ADGameDescription tuckerGameDescriptions[] = { Common::CZ_CZE, Common::kPlatformPC, Tucker::kGameFlagEncodedData, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, { "tucker", @@ -97,7 +97,7 @@ static const ADGameDescription tuckerGameDescriptions[] = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | Tucker::kGameFlagDemo, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }, AD_TABLE_END_MARKER }; @@ -109,7 +109,7 @@ static const ADGameDescription tuckerDemoGameDescription = { Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO | Tucker::kGameFlagDemo | Tucker::kGameFlagIntroOnly, - Common::GUIO_NONE + GUIO1(GUIO_NONE) }; class TuckerMetaEngine : public AdvancedMetaEngine { diff --git a/engines/tucker/staticres.cpp b/engines/tucker/staticres.cpp index ef778b6f54..388f5ba05c 100644 --- a/engines/tucker/staticres.cpp +++ b/engines/tucker/staticres.cpp @@ -340,7 +340,7 @@ const SoundSequenceDataList AnimationSequencePlayer::_soundSeqDataList[] = { { 0, 0, 4, 0, 7, _soundDataSeq19_20 } }; -const char *AnimationSequencePlayer::_audioFileNamesTable[] = { +const char *const AnimationSequencePlayer::_audioFileNamesTable[] = { "demomenu.raw", "demorolc.raw", "fx101.wav", diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h index e676369427..3daf75d44a 100644 --- a/engines/tucker/tucker.h +++ b/engines/tucker/tucker.h @@ -989,7 +989,7 @@ private: Audio::SoundHandle _musicHandle; static const SoundSequenceDataList _soundSeqDataList[]; - static const char *_audioFileNamesTable[]; + static const char *const _audioFileNamesTable[]; }; } // namespace Tucker |