libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PINK: fix compilation error

Browse Source
This commit is contained in:
whiterandrek 2018-05-22 08:26:23 +03:00 committed by Eugene Sandulenko
parent f6dd0f2f49
commit d3d7a92800
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/pink/objects/actions/action_play_with_sfx.cpp
View File

@ -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() {

4
engines/pink/objects/actions/action_sound.cpp
View File

@ -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);

2
engines/pink/objects/actions/action_talk.cpp
View File

@ -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() {

4
engines/pink/objects/sequences/sequence.cpp
View File

@ -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();
}

4
engines/pink/pink.cpp
View File

@ -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();