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

Merge branch 'master' into new-netcode

Browse Source 
Conflicts:
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/GUI/GUI.cs
	Subsurface/Source/GUI/LoadingScreen.cs
This commit is contained in:
Regalis
2017-02-13 22:04:28 +02:00
parent bfc22c7b33 1ea3044fd6
commit 7f7ac76484
17 changed files with 137 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Subsurface/Source/Map/FireSource.cs
View File

@@ -348,8 +348,16 @@ namespace Barotrauma
{
lightSource.Remove();
if (basicSoundIndex > -1) Sounds.SoundManager.Stop(basicSoundIndex);
if (largeSoundIndex > -1) Sounds.SoundManager.Stop(largeSoundIndex);
if (basicSoundIndex > -1)
{
Sounds.SoundManager.Stop(basicSoundIndex);
basicSoundIndex = -1;
}
if (largeSoundIndex > -1)
{
Sounds.SoundManager.Stop(largeSoundIndex);
largeSoundIndex = -1;
}
hull.RemoveFire(this);
}

7
Subsurface/Source/Map/Submarine.cs
View File

@@ -49,6 +49,8 @@ namespace Barotrauma
private set;
}
public static bool LockX, LockY;
public static List<Submarine> SavedSubmarines = new List<Submarine>();
public static readonly Vector2 GridSize = new Vector2(16.0f, 16.0f);
@@ -754,6 +756,11 @@ namespace Barotrauma
if (Level.Loaded == null) return;
if (subBody == null) return;
subBody.Body.LinearVelocity = new Vector2(
LockX ? 0.0f : subBody.Body.LinearVelocity.X,
LockY ? 0.0f : subBody.Body.LinearVelocity.Y);
subBody.Update(deltaTime);