Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

SimulationScriptInit.cpp: add missing headers

Browse Source 
SoundGroup.cpp: fix: avoid invalid-handle complaints if quickstart has
disabled sound

This was SVN commit r6029.
This commit is contained in:
janwas 2008-06-16 18:33:47 +00:00
parent b0a6d6dca8
commit 2b4f3416a8
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/simulation/scripting/SimulationScriptInit.cpp
View File

@ -3,12 +3,17 @@
#include "lib/timer.h"
#include "simulation/Scheduler.h"
#include "simulation/EntityTemplate.h"
#include "simulation/EntityTemplateCollection.h"
#include "simulation/Entity.h"
#include "simulation/Projectile.h"
#include "simulation/EventHandlers.h"
#include "simulation/TriggerManager.h"
#include "simulation/FormationManager.h"
#include "simulation/FormationCollection.h"
#include "simulation/ProductionQueue.h"
#include "simulation/Technology.h"
#include "simulation/TechnologyCollection.h"
#include "simulation/PathfindEngine.h"
void SimulationScriptInit()
{

4
source/sound/SoundGroup.cpp
View File

@ -55,6 +55,8 @@ void CSoundGroup::PlayNext()
{
// load up replacement file
m_hReplacement = snd_open(m_filepath + m_intensity_file);
if(m_hReplacement == ERR::AGAIN) // sound is disabled
return;
snd_set_gain(m_hReplacement, m_Gain);
snd_set_pitch(m_hReplacement, m_Pitch);
snd_set_cone(m_hReplacement, m_ConeInnerAngle, m_ConeOuterAngle, m_ConeOuterGain);
@ -80,6 +82,8 @@ void CSoundGroup::PlayNext()
m_index = (size_t)rand(0, (size_t)filenames.size());
Handle temp;
temp = snd_open(m_filepath + filenames[m_index]);
if(temp == ERR::AGAIN) // sound is disabled
return;
snd_set_gain(temp, m_Gain);
snd_set_pitch(temp, m_Pitch);
snd_set_cone(temp, m_ConeInnerAngle, m_ConeOuterAngle, m_ConeOuterGain);