- PowerContainer capacity is initialized before charge to allow setting the charge higher than default capacity

- soundplayer doesn't crash the game if it can't stream a music clip
- some new structure prefabs
- more effective corrigodone (health med)
This commit is contained in:
Regalis
2016-06-07 18:24:14 +03:00
parent 8f8f1ed7dc
commit bd4292c3e5
6 changed files with 28 additions and 10 deletions

View File

@@ -36,6 +36,13 @@ namespace Barotrauma.Items.Components
get { return maxOutput; }
}
[HasDefaultValue(10.0f, true), Editable]
public float Capacity
{
get { return capacity; }
set { capacity = Math.Max(value, 1.0f); }
}
[Editable, HasDefaultValue(0.0f, true)]
public float Charge
{
@@ -47,13 +54,6 @@ namespace Barotrauma.Items.Components
}
}
[HasDefaultValue(10.0f, true), Editable]
public float Capacity
{
get { return capacity; }
set { capacity = Math.Max(value, 1.0f); }
}
[HasDefaultValue(10.0f, true), Editable]
public float RechargeSpeed
{

View File

@@ -7,6 +7,7 @@ using FarseerPhysics.Dynamics;
using Microsoft.Xna.Framework;
using Barotrauma.Sounds;
using System.Collections.Generic;
using System.IO;
namespace Barotrauma
{
@@ -249,7 +250,16 @@ namespace Barotrauma
if (currMusicVolume < 0.01f)
{
Sound.StopStream();
if (targetMusic != null) Sound.StartStream(targetMusic.file, currMusicVolume);
try
{
if (targetMusic != null) Sound.StartStream(targetMusic.file, currMusicVolume);
}
catch (FileNotFoundException e)
{
DebugConsole.ThrowError("Music clip " + targetMusic.file + " not found!");
}
currentMusic = targetMusic;
}
}