1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 21:23:52 +00:00

Properly mark streams as 2D or 3D

This commit is contained in:
Chris Robinson 2015-11-27 02:36:33 -08:00
parent 21bb2e9314
commit 449eca4fb4

View file

@ -304,7 +304,7 @@ namespace MWSound
decoder->open(filename); decoder->open(filename);
mMusic = mOutput->streamSound(decoder, volumeFromType(Play_TypeMusic), mMusic = mOutput->streamSound(decoder, volumeFromType(Play_TypeMusic),
1.0f, Play_NoEnv|Play_TypeMusic); 1.0f, Play_NoEnv|Play_TypeMusic|Play_2D);
} }
catch(std::exception &e) catch(std::exception &e)
{ {
@ -393,7 +393,8 @@ namespace MWSound
DecoderPtr decoder = loadVoice(voicefile, &loudness); DecoderPtr decoder = loadVoice(voicefile, &loudness);
MWBase::SoundPtr sound = mOutput->streamSound3D(decoder, MWBase::SoundPtr sound = mOutput->streamSound3D(decoder,
objpos, 1.0f, basevol, 1.0f, minDistance, maxDistance, Play_Normal|Play_TypeVoice objpos, 1.0f, basevol, 1.0f, minDistance, maxDistance,
Play_Normal|Play_TypeVoice|Play_3D
); );
mActiveSaySounds[ptr] = std::make_pair(sound, loudness); mActiveSaySounds[ptr] = std::make_pair(sound, loudness);
} }
@ -432,7 +433,7 @@ namespace MWSound
DecoderPtr decoder = loadVoice(voicefile, &loudness); DecoderPtr decoder = loadVoice(voicefile, &loudness);
MWBase::SoundPtr sound = mOutput->streamSound(decoder, MWBase::SoundPtr sound = mOutput->streamSound(decoder,
basevol, 1.0f, Play_Normal|Play_TypeVoice basevol, 1.0f, Play_Normal|Play_TypeVoice|Play_2D
); );
mActiveSaySounds[MWWorld::Ptr()] = std::make_pair(sound, loudness); mActiveSaySounds[MWWorld::Ptr()] = std::make_pair(sound, loudness);
} }