diff options
| author | whiterandrek | 2018-06-03 14:24:59 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-06-28 23:51:32 +0200 |
| commit | da0adc92a2cc1af0da78a4e612f382e1e5b42bd0 (patch) | |
| tree | 773ba0a3694c59516b9c38cc3133d3508909eb2f /engines/pink/objects/actions/action_talk.cpp | |
| parent | 442f725a5d2d36183fdc41d7b050beb4aa4fd8fa (diff) | |
| download | scummvm-rg350-da0adc92a2cc1af0da78a4e612f382e1e5b42bd0.tar.gz scummvm-rg350-da0adc92a2cc1af0da78a4e612f382e1e5b42bd0.tar.bz2 scummvm-rg350-da0adc92a2cc1af0da78a4e612f382e1e5b42bd0.zip | |
PINK: reformat Action's code
Diffstat (limited to 'engines/pink/objects/actions/action_talk.cpp')
| -rw-r--r-- | engines/pink/objects/actions/action_talk.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/pink/objects/actions/action_talk.cpp b/engines/pink/objects/actions/action_talk.cpp index 7ecd40d975..c142dca0e6 100644 --- a/engines/pink/objects/actions/action_talk.cpp +++ b/engines/pink/objects/actions/action_talk.cpp @@ -40,12 +40,6 @@ void ActionTalk::toConsole() { _name.c_str(), _fileName.c_str(), _z, _startFrame, _stopFrame, _intro, _style, _vox.c_str()); } -void ActionTalk::onStart() { - ActionPlay::onStart(); - _sound = _actor->getPage()->loadSound(_vox); - _sound->play(Audio::Mixer::kSpeechSoundType, 100, 0); -} - void ActionTalk::update() { ActionLoop::update(); if (!_sound->isPlaying()) { @@ -66,4 +60,10 @@ void ActionTalk::pause(bool paused) { _sound->pause(paused); } +void ActionTalk::onStart() { + ActionPlay::onStart(); + _sound = _actor->getPage()->loadSound(_vox); + _sound->play(Audio::Mixer::kSpeechSoundType, 100, 0); +} + } // End of namespace Pink |