New fonts, loading progress doesn't stay stuck at 70% during SoundPlayer initialization

This commit is contained in:
Regalis
2017-02-22 23:31:11 +02:00
parent 27e74490a0
commit 5006a9af6c
8 changed files with 17 additions and 14 deletions
+1 -1
View File
@@ -8,7 +8,7 @@ with.
<XnaContent xmlns:Graphics="Microsoft.Xna.Framework.Content.Pipeline.Graphics">
<Asset Type="Graphics:FontDescription">
<FontName>Verdana</FontName>
<FontName>Code Pro Bold</FontName>
<Size>16</Size>
Binary file not shown.
+2 -2
View File
@@ -8,9 +8,9 @@ with.
<XnaContent xmlns:Graphics="Microsoft.Xna.Framework.Content.Pipeline.Graphics">
<Asset Type="Graphics:FontDescription">
<FontName>Verdana</FontName>
<FontName>Exo Light</FontName>
<Size>7</Size>
<Size>9</Size>
<Spacing>0</Spacing>
Binary file not shown.
+2 -2
View File
@@ -11,13 +11,13 @@ with.
<!--
Modify this string to change the font that will be imported.
-->
<FontName>Verdana</FontName>
<FontName>Exo Medium</FontName>
<!--
Size is a float value, measured in points. Modify this value to change
the size of the font.
-->
<Size>12</Size>
<Size>10</Size>
<!--
Spacing is a float value, measured in pixels. Modify this value to change
Binary file not shown.
+3 -1
View File
@@ -238,7 +238,9 @@ namespace Barotrauma
while (!SoundPlayer.Initialized)
{
i++;
TitleScreen.LoadState = Math.Min((float)TitleScreen.LoadState + 0.5f*i, 70.0f);
TitleScreen.LoadState = SoundPlayer.SoundCount == 0 ?
30.0f :
Math.Min(30.0f + 40.0f * i / Math.Max(SoundPlayer.SoundCount, 1), 70.0f);
yield return CoroutineStatus.Running;
}
+9 -8
View File
@@ -90,11 +90,18 @@ namespace Barotrauma
get;
set;
}
public static int SoundCount;
public static IEnumerable<object> Init()
{
OverrideMusicType = null;
XDocument doc = ToolBox.TryLoadXml("Content/Sounds/sounds.xml");
if (doc == null) yield return CoroutineStatus.Failure;
SoundCount = 16 + doc.Root.Elements().Count();
startDrone = Sound.Load("Content/Sounds/startDrone.ogg", false);
startDrone.Play();
@@ -116,12 +123,7 @@ namespace Barotrauma
SplashSounds[i] = Sound.Load("Content/Sounds/Water/Splash"+(i)+".ogg", false);
yield return CoroutineStatus.Running;
}
XDocument doc = ToolBox.TryLoadXml("Content/Sounds/sounds.xml");
if (doc == null) yield return CoroutineStatus.Failure;
yield return CoroutineStatus.Running;
var xMusic = doc.Root.Elements("music").ToList();
if (xMusic.Any())
@@ -178,8 +180,7 @@ namespace Barotrauma
}
}
miscSounds = miscSoundList.ToLookup(kvp => kvp.Key, kvp => kvp.Value);
miscSounds = miscSoundList.ToLookup(kvp => kvp.Key, kvp => kvp.Value);
Initialized = true;