diff --git a/BarotraumaClient/Source/Screens/GameScreen.cs b/BarotraumaClient/Source/Screens/GameScreen.cs
index 6c2e21abb..b8c95f332 100644
--- a/BarotraumaClient/Source/Screens/GameScreen.cs
+++ b/BarotraumaClient/Source/Screens/GameScreen.cs
@@ -8,6 +8,8 @@ namespace Barotrauma
{
partial class GameScreen : Screen
{
+ private Color waterColor = new Color(0.75f, 0.8f, 0.9f, 1.0f);
+
private BlurEffect lightBlur;
readonly RenderTarget2D renderTargetBackground;
diff --git a/BarotraumaClient/Source/Sprite/SpriteSheet.cs b/BarotraumaClient/Source/Sprite/SpriteSheet.cs
index eadc93492..3dc8436a7 100644
--- a/BarotraumaClient/Source/Sprite/SpriteSheet.cs
+++ b/BarotraumaClient/Source/Sprite/SpriteSheet.cs
@@ -5,39 +5,8 @@ using Microsoft.Xna.Framework.Graphics;
namespace Barotrauma
{
- class SpriteSheet : Sprite
+ partial class SpriteSheet : Sprite
{
- private Rectangle[] sourceRects;
-
- public int FrameCount
- {
- get { return sourceRects.Length; }
- }
-
- public SpriteSheet(XElement element, string path = "", string file = "")
- : base(element, path, file)
- {
- int columnCount = Math.Max(ToolBox.GetAttributeInt(element, "columns", 1), 1);
- int rowCount = Math.Max(ToolBox.GetAttributeInt(element, "rows", 1), 1);
-
- sourceRects = new Rectangle[rowCount * columnCount];
-
- int cellWidth = SourceRect.Width / columnCount;
- int cellHeight = SourceRect.Height / rowCount;
-
- for (int x = 0; x < columnCount; x++)
- {
- for (int y = 0; y < rowCount; y++)
- {
- sourceRects[x + y * columnCount] = new Rectangle(x * cellWidth, y * cellHeight, cellWidth, cellHeight);
- }
- }
-
- origin = ToolBox.GetAttributeVector2(element, "origin", new Vector2(0.5f, 0.5f));
- origin.X = origin.X * cellWidth;
- origin.Y = origin.Y * cellHeight;
- }
-
public override void Draw(SpriteBatch spriteBatch, Vector2 pos, Color color, Vector2 origin, float rotate, Vector2 scale, SpriteEffects spriteEffect = SpriteEffects.None, float? depth = default(float?))
{
if (texture == null) return;
diff --git a/BarotraumaServer/Source/Sprite/Sprite.cs b/BarotraumaServer/Source/Sprite/Sprite.cs
index db3e8ea43..51f774941 100644
--- a/BarotraumaServer/Source/Sprite/Sprite.cs
+++ b/BarotraumaServer/Source/Sprite/Sprite.cs
@@ -9,7 +9,7 @@ namespace Barotrauma
{
public partial class Sprite
{
- private void LoadTexture(ref Vector4 sourceVector,ref bool shouldReturn)
+ private void LoadTexture(ref Vector4 sourceVector, ref bool shouldReturn)
{
//do nothing
}
@@ -23,3 +23,5 @@ namespace Barotrauma
{
//do nothing
}
+ }
+}
diff --git a/BarotraumaShared/BarotraumaShared.projitems b/BarotraumaShared/BarotraumaShared.projitems
index f1db12941..cabe8ea8b 100644
--- a/BarotraumaShared/BarotraumaShared.projitems
+++ b/BarotraumaShared/BarotraumaShared.projitems
@@ -1298,7 +1298,7 @@
-
+
diff --git a/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs b/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs
index 7fb78c83f..dbed48d27 100644
--- a/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs
+++ b/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs
@@ -181,7 +181,7 @@ namespace Barotrauma
return priority;
}
- private static float GetHullSafety(Hull hull, Character character)
+ public static float GetHullSafety(Hull hull, Character character)
{
if (hull == null) return 0.0f;
diff --git a/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveRescureAll.cs b/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveRescueAll.cs
similarity index 100%
rename from BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveRescureAll.cs
rename to BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveRescueAll.cs
diff --git a/BarotraumaShared/Source/Screens/GameScreen.cs b/BarotraumaShared/Source/Screens/GameScreen.cs
index 156b00fa8..015e93733 100644
--- a/BarotraumaShared/Source/Screens/GameScreen.cs
+++ b/BarotraumaShared/Source/Screens/GameScreen.cs
@@ -7,8 +7,6 @@ namespace Barotrauma
{
private Camera cam;
- private Color waterColor = new Color(0.75f, 0.8f, 0.9f, 1.0f);
-
public override Camera Cam
{
get { return cam; }
diff --git a/BarotraumaShared/Source/Sprite/SpriteSheet.cs b/BarotraumaShared/Source/Sprite/SpriteSheet.cs
index eadc93492..12e091d44 100644
--- a/BarotraumaShared/Source/Sprite/SpriteSheet.cs
+++ b/BarotraumaShared/Source/Sprite/SpriteSheet.cs
@@ -1,11 +1,10 @@
using Microsoft.Xna.Framework;
using System;
using System.Xml.Linq;
-using Microsoft.Xna.Framework.Graphics;
namespace Barotrauma
{
- class SpriteSheet : Sprite
+ partial class SpriteSheet : Sprite
{
private Rectangle[] sourceRects;
@@ -37,19 +36,5 @@ namespace Barotrauma
origin.X = origin.X * cellWidth;
origin.Y = origin.Y * cellHeight;
}
-
- public override void Draw(SpriteBatch spriteBatch, Vector2 pos, Color color, Vector2 origin, float rotate, Vector2 scale, SpriteEffects spriteEffect = SpriteEffects.None, float? depth = default(float?))
- {
- if (texture == null) return;
-
- spriteBatch.Draw(texture, pos + offset, sourceRects[0], color, rotation + rotate, origin, scale, spriteEffect, depth == null ? this.depth : (float)depth);
- }
-
- public void Draw(SpriteBatch spriteBatch, int spriteIndex, Vector2 pos, Color color, Vector2 origin, float rotate, Vector2 scale, SpriteEffects spriteEffect = SpriteEffects.None, float? depth = default(float?))
- {
- if (texture == null) return;
-
- spriteBatch.Draw(texture, pos + offset, sourceRects[spriteIndex], color, rotation + rotate, origin, scale, spriteEffect, depth == null ? this.depth : (float)depth);
- }
}
}
diff --git a/Barotrauma_Solution.sln b/Barotrauma_Solution.sln
index fb9e68833..ec4bf898d 100644
--- a/Barotrauma_Solution.sln
+++ b/Barotrauma_Solution.sln
@@ -418,7 +418,7 @@ Global
{008C0F83-E914-4966-9135-EA885059EDD8} = {F35DF9BF-0BED-4FEF-A51C-DD83C531882F}
{0AAD36E3-51A5-4A07-AB60-5C8A66BD38B7} = {DE36F45F-F09E-4719-B953-00D148F7722A}
{49BA1C69-6104-41AC-A5D8-B54FA9F696E8} = {DE36F45F-F09E-4719-B953-00D148F7722A}
- {251AAFE1-F24B-4837-9128-9D04FCBFD528} = {DE36F45F-F09E-4719-B953-00D148F7722A}
+ {251AAFE1-F24B-4837-9128-9D04FCBFD528} = {F35DF9BF-0BED-4FEF-A51C-DD83C531882F}
{3B8F9EDB-6E5E-450C-ABC2-EC49075D0B50} = {DE36F45F-F09E-4719-B953-00D148F7722A}
{C293DB32-FA42-486D-B128-5A12522FAE4E} = {DE36F45F-F09E-4719-B953-00D148F7722A}
{2E4773B7-961A-4328-9D77-9749F9071CA2} = {DE36F45F-F09E-4719-B953-00D148F7722A}