aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorwhiterandrek2018-05-22 08:26:23 +0300
committerEugene Sandulenko2018-06-28 23:51:32 +0200
commitd3d7a9280081ad6711b8f5ae09100b4368768faf (patch)
tree3be5e2dffc799f73d487bd96468e9e97e3f44744 /engines
parentf6dd0f2f49c1a33ab5563ae1c3a7f7cf272cc8eb (diff)
downloadscummvm-rg350-d3d7a9280081ad6711b8f5ae09100b4368768faf.tar.gz
scummvm-rg350-d3d7a9280081ad6711b8f5ae09100b4368768faf.tar.bz2
scummvm-rg350-d3d7a9280081ad6711b8f5ae09100b4368768faf.zip
PINK: fix compilation error
Diffstat (limited to 'engines')
-rw-r--r--engines/pink/objects/actions/action_play_with_sfx.cpp2
-rw-r--r--engines/pink/objects/actions/action_sound.cpp4
-rw-r--r--engines/pink/objects/actions/action_talk.cpp2
-rw-r--r--engines/pink/objects/sequences/sequence.cpp4
-rw-r--r--engines/pink/pink.cpp4
5 files changed, 8 insertions, 8 deletions
diff --git a/engines/pink/objects/actions/action_play_with_sfx.cpp b/engines/pink/objects/actions/action_play_with_sfx.cpp
index 9cb850384e..62488ac302 100644
--- a/engines/pink/objects/actions/action_play_with_sfx.cpp
+++ b/engines/pink/objects/actions/action_play_with_sfx.cpp
@@ -95,7 +95,7 @@ void ActionSfx::play(GamePage *page) {
_sound = page->loadSound(_sfxName);
if (!_sound->isPlaying())
- _sound->play(Audio::Mixer::SoundType::kSFXSoundType, _volume, 0);
+ _sound->play(Audio::Mixer::kSFXSoundType, _volume, 0);
}
ActionSfx::~ActionSfx() {
diff --git a/engines/pink/objects/actions/action_sound.cpp b/engines/pink/objects/actions/action_sound.cpp
index e94251d9c0..2e69228dd3 100644
--- a/engines/pink/objects/actions/action_sound.cpp
+++ b/engines/pink/objects/actions/action_sound.cpp
@@ -56,8 +56,8 @@ void ActionSound::start(bool unk) {
assert(!_sound);
_sound = _actor->getPage()->loadSound(_fileName);
- Audio::Mixer::SoundType soundType = _isBackground ? Audio::Mixer::SoundType::kMusicSoundType
- : Audio::Mixer::SoundType::kSpeechSoundType;
+ Audio::Mixer::SoundType soundType = _isBackground ? Audio::Mixer::kMusicSoundType
+ : Audio::Mixer::kSpeechSoundType;
Director *director = _actor->getPage()->getGame()->getDirector();
director->addSound(this);
diff --git a/engines/pink/objects/actions/action_talk.cpp b/engines/pink/objects/actions/action_talk.cpp
index 1f55de1f42..555e6fe95d 100644
--- a/engines/pink/objects/actions/action_talk.cpp
+++ b/engines/pink/objects/actions/action_talk.cpp
@@ -43,7 +43,7 @@ void ActionTalk::toConsole() {
void ActionTalk::onStart() {
ActionPlay::onStart();
_sound = _actor->getPage()->loadSound(_vox);
- _sound->play(Audio::Mixer::SoundType::kSpeechSoundType, 100, 0);
+ _sound->play(Audio::Mixer::kSpeechSoundType, 100, 0);
}
void ActionTalk::update() {
diff --git a/engines/pink/objects/sequences/sequence.cpp b/engines/pink/objects/sequences/sequence.cpp
index 5eeae68657..f388b7cd66 100644
--- a/engines/pink/objects/sequences/sequence.cpp
+++ b/engines/pink/objects/sequences/sequence.cpp
@@ -175,12 +175,12 @@ void SequenceAudio::update() {
void SequenceAudio::init(int unk) {
_sample = 0;
_sound = _sequencer->_page->loadSound(_soundName);
- _sound->play(Audio::Mixer::SoundType::kMusicSoundType, 100, 0);
+ _sound->play(Audio::Mixer::kMusicSoundType, 100, 0);
Sequence::init(unk);
}
void SequenceAudio::restart() {
- _sound->play(Audio::Mixer::SoundType::kMusicSoundType, 100, 0);
+ _sound->play(Audio::Mixer::kMusicSoundType, 100, 0);
Sequence::restart();
}
diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp
index 26de1cf6dc..74b38cf6e2 100644
--- a/engines/pink/pink.cpp
+++ b/engines/pink/pink.cpp
@@ -69,8 +69,8 @@ Common::Error PinkEngine::init() {
_console = new Console(this);
- const Common::String orbName{_desc.filesDescriptions[0].fileName};
- const Common::String broName{_desc.filesDescriptions[1].fileName};
+ const Common::String orbName = _desc.filesDescriptions[0].fileName;
+ const Common::String broName = _desc.filesDescriptions[1].fileName;
if (strcmp(_desc.gameId, kPeril) == 0){
_bro = new BroFile();