From d3d7a9280081ad6711b8f5ae09100b4368768faf Mon Sep 17 00:00:00 2001
From: whiterandrek
Date: Tue, 22 May 2018 08:26:23 +0300
Subject: PINK: fix compilation error

---
 engines/pink/objects/actions/action_play_with_sfx.cpp | 2 +-
 engines/pink/objects/actions/action_sound.cpp         | 4 ++--
 engines/pink/objects/actions/action_talk.cpp          | 2 +-
 engines/pink/objects/sequences/sequence.cpp           | 4 ++--
 engines/pink/pink.cpp                                 | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'engines')

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();
-- 
cgit v1.2.3