Changelog update, stuff

Subsurface/Source/Items/Components/Machines/MiniMap.cs

@@ -178,13 +178,13 @@ namespace Barotrauma.Items.Components
                     }
 
                     GUI.DrawString(spriteBatch,
-                        new Vector2(x+10, y+height-40), 
+                        new Vector2(x + 10, y + height - 60),
                         oxygenAmount == null ? "Air quality data not available" : "Air quality: " + (int)oxygenAmount + " %",
                         oxygenAmount == null ? Color.Red : Color.Lerp(Color.Red, Color.LightGreen, (float)oxygenAmount / 100.0f),
                         Color.Black * 0.5f, 2, GUI.SmallFont);
 
                     GUI.DrawString(spriteBatch,
-                        new Vector2(x + 10, y + height - 20),
+                        new Vector2(x + 10, y + height - 40),
                         waterAmount == null ? "Water level data not available" : "Water level: " + (int)(waterAmount * 100.0f) + " %",
                         waterAmount == null ? Color.Red : Color.Lerp(Color.LightGreen, Color.Red, (float)waterAmount),
                         Color.Black * 0.5f, 2, GUI.SmallFont);

Subsurface/Source/Particles/Particle.cs

@@ -180,9 +180,10 @@ namespace Barotrauma.Particles
                 animFrame = (int)Math.Min(Math.Floor(animState / prefab.AnimDuration * frameCount), frameCount - 1);
             }
             
-            if (prefab.DeleteOnCollision || prefab.CollidesWithWalls)
+            lifeTime -= deltaTime;
-            {
+            if (lifeTime <= 0.0f || alpha <= 0.0f || size.X <= 0.0f || size.Y <= 0.0f) return false;
-                //Vector2 edgePos =  position + prefab.CollisionRadius * Vector2.Normalize(velocity) * size.X;
+
+            if (!prefab.DeleteOnCollision && !prefab.CollidesWithWalls) return true;
             
             if (currentHull == null)
             {
@@ -259,11 +260,6 @@ namespace Barotrauma.Particles
                     }
                 }
             }
-            }
-
-            lifeTime -= deltaTime;
-
-            if (lifeTime <= 0.0f || alpha <= 0.0f || size.X <= 0.0f || size.Y <= 0.0f) return false;
 
             return true;
         }

Subsurface/Source/Screens/GameScreen.cs

@@ -1,19 +1,16 @@
 using System;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework.Input;
-using Barotrauma.Lights;
-using System.Diagnostics;
 using Microsoft.Xna.Framework.Content;
-using System.Collections.Generic;
+using Microsoft.Xna.Framework.Input;
 
 namespace Barotrauma
 {
     class GameScreen : Screen
     {
-        Camera cam;
+        private Camera cam;
 
-        Color waterColor = new Color(0.75f, 0.8f, 0.9f, 1.0f);
+        private Color waterColor = new Color(0.75f, 0.8f, 0.9f, 1.0f);
 
         readonly RenderTarget2D renderTargetBackground;
         readonly RenderTarget2D renderTarget;

Subsurface/Source/Sounds/SoundPlayer.cs

@@ -233,7 +233,7 @@ namespace Barotrauma
 
             foreach (Submarine sub in Submarine.Loaded)
             {
-                float movementFactor = (sub.Velocity == Vector2.Zero) ? 0.0f : sub.Velocity.Length() / 5.0f;
+                float movementFactor = (sub.Velocity == Vector2.Zero) ? 0.0f : sub.Velocity.Length() / 10.0f;
                 movementFactor = MathHelper.Clamp(movementFactor, 0.0f, 1.0f);
 
                 if (Character.Controlled==null || Character.Controlled.Submarine != sub)

Subsurface/changelog.txt

@@ -38,23 +38,16 @@ Submarine editor:
 	- open menus are closed when opening another one (e.g. the save dialog box is automatically closed if
 	the item selection menu is opened)
 
-	
+Misc:
 	- background ice formations with a parallax effect
-
-- swimming animation fix: characters don't swim with their legs extended up over their shoulders after a
-sharp turn
-
 	- the level generation algorithm doesn't place walls behind alien ruins
-
 	- improved fire & smoke particles
-
 	- water puts out fires more slowly
-
 	- explosion damage is reduced if there are walls or other solid obstacles between and explosion and a character
-
 	- heal and revive commands can also be used on other characters than the controlled one
-
 	- fixed fires occasionally causing incorrect sound clips to loop continuously
+	- swimming animation fix: characters don't swim with their legs extended up over their shoulders 
+	after a sharp turn
 
 
 ---------------------------------------------------------------------------------------------------------