Fixed client compilation errors

This commit is contained in:
juanjp600
2017-06-14 18:24:11 -03:00
parent 96b08ed8aa
commit e4a878113f
9 changed files with 10 additions and 54 deletions
@@ -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;
@@ -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; }
+1 -16
View File
@@ -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);
}
}
}