teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge pull request #831 from ace13/win-fix

Browse source 
Fix windows builds
This commit is contained in:
scrawl 2015-12-01 01:03:16 +01:00
commit ba5433391f
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwsound/soundmanagerimp.cpp
View file

@ -40,6 +40,7 @@ namespace MWSound
, mMusicVolume(1.0f)
, mVoiceVolume(1.0f)
, mFootstepsVolume(1.0f)
, mSoundBuffers(new SoundBufferList::element_type())
, mBufferCacheSize(0)
, mListenerUnderwater(false)
, mListenerPos(0,0,0)
@ -101,8 +102,8 @@ namespace MWSound
clear();
if(mOutput->isInitialized())
{
SoundBufferList::iterator sfxiter = mSoundBuffers.begin();
for(;sfxiter != mSoundBuffers.end();++sfxiter)
SoundBufferList::element_type::iterator sfxiter = mSoundBuffers->begin();
for(;sfxiter != mSoundBuffers->end();++sfxiter)
{
if(sfxiter->mHandle)
mOutput->unloadSound(sfxiter->mHandle);
@ -145,7 +146,7 @@ namespace MWSound
min = std::max(min, 1.0f);
max = std::max(min, max);
Sound_Buffer *sfx = &*mSoundBuffers.insert(mSoundBuffers.end(),
Sound_Buffer *sfx = &*mSoundBuffers->insert(mSoundBuffers->end(),
Sound_Buffer("Sound/"+sound->mSound, volume, min, max)
);
mVFS->normalizeFilename(sfx->mResourceName);

3
apps/openmw/mwsound/soundmanagerimp.hpp
View file

@ -1,6 +1,7 @@
#ifndef GAME_SOUND_SOUNDMANAGER_H
#define GAME_SOUND_SOUNDMANAGER_H
#include <memory>
#include <string>
#include <utility>
#include <deque>
@ -56,7 +57,7 @@ namespace MWSound
float mVoiceVolume;
float mFootstepsVolume;
typedef std::deque<Sound_Buffer> SoundBufferList;
typedef std::auto_ptr<std::deque<Sound_Buffer> > SoundBufferList;
// List of sound buffers, grown as needed. New enties are added to the
// back, allowing existing Sound_Buffer references/pointers to remain
// valid.