Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Remove trailing whitespace. Based on patch by otero, refs #3268.

Browse Source 
This was SVN commit r17576.
This commit is contained in:
elexis 2015-12-31 11:45:13 +00:00
parent 8d9cfd66b8
commit f7a262fa4a
2 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/soundmanager/scripting/SoundGroup.cpp
View File

@ -326,7 +326,6 @@ bool CSoundGroup::LoadSoundGroup(const VfsPath& pathnameXML)
XERO_ITER_EL(root, child)
{
int child_name = child.GetNodeName();
if(child_name == el_gain)
@ -421,7 +420,6 @@ bool CSoundGroup::LoadSoundGroup(const VfsPath& pathnameXML)
m_Decay = child.GetText().ToFloat();
}
}
return true;
}

8
source/soundmanager/scripting/SoundGroup.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2012 Wildfire Games.
/* Copyright (C) 2015 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -25,9 +25,6 @@
*/
/*
Example usage:
Example SoundGroup.xml
<?xml version="1.0" encoding="utf-8"?>
<SoundGroup>
@ -46,7 +43,6 @@ Example SoundGroup.xml
<Sound>audio/voice/hellenes/soldier/Attack_Engagex.ogg</Sound>
<Sound>audio/voice/hellenes/soldier/Attack_ForMyFamily.ogg</Sound>
</SoundGroup>
*/
#ifndef INCLUDED_SOUNDGROUP_H
@ -126,7 +122,7 @@ private:
float m_TimeWindow; // The Intensity Threshold Window
size_t m_IntensityThreshold; // the allowable intensity before a sound switch
size_t m_Intensity; // our current intensity (number of sounds played since m_CurTime - m_TimeWindow)
float m_Decay; //
float m_Decay;
unsigned char m_Flags; // up to eight individual parameters, use with eSndGrpFlags.
float m_Gain;