thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

stole formatting for constructors from existing code

Browse source 
svn-id: r42981
This commit is contained in:
Norbert Lange 2009-08-01 23:14:28 +00:00
parent a28281072d
commit 59395eb6b6
2 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
engines/scumm/player_v4a.cpp
View file

@ -32,17 +32,17 @@
namespace Scumm {
Player_V4A::Player_V4A(ScummEngine *scumm, Audio::Mixer *mixer) :
_vm(scumm),
_mixer(mixer),
_tfmxMusic(_mixer->getOutputRate(), true),
_tfmxSfx(_mixer->getOutputRate(), true),
_musicHandle(),
_sfxHandle(),
_musicId(),
_sfxSlots(),
_initState(0),
_signal(0) {
Player_V4A::Player_V4A(ScummEngine *scumm, Audio::Mixer *mixer)
: _vm(scumm),
_mixer(mixer),
_tfmxMusic(_mixer->getOutputRate(), true),
_tfmxSfx(_mixer->getOutputRate(), true),
_musicHandle(),
_sfxHandle(),
_musicId(),
_sfxSlots(),
_initState(0),
_signal(0) {
assert(scumm);
assert(mixer);

9
sound/mods/tfmx.cpp
View file

@ -48,7 +48,12 @@ const uint16 Tfmx::noteIntervalls[64] = {
214, 202, 191, 180 };
Tfmx::Tfmx(int rate, bool stereo)
: Paula(stereo, rate), _resource(), _resourceSample(), _playerCtx() {
: Paula(stereo, rate),
_resource(),
_resourceSample(),
_playerCtx(),
_deleteResource(false) {
_playerCtx.stopWithLastPattern = false;
for (int i = 0; i < kNumVoices; ++i)
@ -114,7 +119,7 @@ void Tfmx::interrupt() {
--channel.macroWait;
}
Paula::setChannelPeriod(channel.paulaChannel, channel.period);
Paula::setChannelPeriod(i, channel.period);
if (channel.macroSfxRun >= 0)
channel.macroSfxRun = 1;