vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

v0.1.2: Asynchronous master server connections, largefont, traitor mode ends when traitor dies or sub reaches end of level

Browse Source
This commit is contained in:
Regalis
2015-08-14 01:59:41 +03:00
parent 5771bc7e02
commit bc4ea098f7
23 changed files with 377 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Subsurface/Source/Sounds/AmbientSoundManager.cs
View File

@@ -155,7 +155,7 @@ namespace Subsurface
if (startDrone!=null)
{
if (!SoundManager.IsPlaying(startDrone.AlBufferId))
if (!startDrone.IsPlaying)
{
startDrone.Remove();
startDrone = null;

21
Subsurface/Source/Sounds/Sound.cs
View File

@@ -19,6 +19,8 @@ namespace Subsurface
private OggSound oggSound;
string filePath;
private int alSourceId;
//public float Volume
@@ -71,7 +73,8 @@ namespace Subsurface
public int Play(float volume = 1.0f)
{
return SoundManager.Play(this, volume);
alSourceId = SoundManager.Play(this, volume);
return alSourceId;
}
public int Play(float baseVolume, float range, Vector2 position)
@@ -83,7 +86,9 @@ namespace Subsurface
Vector2 relativePos = GetRelativePosition(position);
float volume = GetVolume(relativePos, range, baseVolume);
return SoundManager.Play(this, relativePos, volume, volume);
alSourceId = SoundManager.Play(this, relativePos, volume, volume);
return alSourceId;
//if (newIndex == -1) return -1;
@@ -96,7 +101,9 @@ namespace Subsurface
//bodyPosition.Y = -bodyPosition.Y;
return Play(volume, range, ConvertUnits.ToDisplayUnits(body.Position));
alSourceId = Play(volume, range, ConvertUnits.ToDisplayUnits(body.Position));
return alSourceId;
}
private float GetVolume(Vector2 relativePosition, float range, float baseVolume)
@@ -178,6 +185,14 @@ namespace Subsurface
}
public bool IsPlaying
{
get
{
return SoundManager.IsPlaying(alSourceId);
}
}
//public int Loop(float volume = 1.0f)
//{
// return SoundManager.Loop(this, volume);