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

Add a null check. Simplify.

Browse Source
This commit is contained in:
itchyOwl
2018-04-06 15:07:50 +03:00
parent 061c7d17f1
commit 1d30cbfac7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Sprite/Sprite.cs
+3 -3
View File
@@ -98,18 +98,18 @@ namespace Barotrauma
// } // }
//} //}
if (texture == null) return; if (texture == null) return;
spriteBatch.Draw(texture, pos + offset, sourceRect, color, rotation + rotate, origin, scale, spriteEffect, depth == null ? this.depth : (float)depth); spriteBatch.Draw(texture, pos + offset, sourceRect, color, rotation + rotate, origin, scale, spriteEffect, depth ?? this.depth);
} }
public void DrawTiled(SpriteBatch spriteBatch, Vector2 pos, Vector2 targetSize, public void DrawTiled(SpriteBatch spriteBatch, Vector2 pos, Vector2 targetSize,
Rectangle? sourceRect = null, Color? color = null, Point? startOffset = null, Vector2? textureScale = null, float? depth = null) Rectangle? sourceRect = null, Color? color = null, Point? startOffset = null, Vector2? textureScale = null, float? depth = null)
{ {
if (texture == null) return;
// Init optional values, if not provided // Init optional values, if not provided
Rectangle rect = sourceRect ?? this.sourceRect; Rectangle rect = sourceRect ?? this.sourceRect;
color = color ?? Color.White; color = color ?? Color.White;
startOffset = startOffset ?? Point.Zero; startOffset = startOffset ?? Point.Zero;
Vector2 scale = textureScale ?? Vector2.One; Vector2 scale = textureScale ?? Vector2.One;
depth = depth ?? this.depth;
Rectangle texPerspective = rect; Rectangle texPerspective = rect;
texPerspective.Location += startOffset.Value; texPerspective.Location += startOffset.Value;
@@ -131,7 +131,7 @@ namespace Barotrauma
{ {
float movementX = texPerspective.Width * scale.X; float movementX = texPerspective.Width * scale.X;
texPerspective.Width = Math.Min((int)(targetSize.X - texPerspective.Width * x), texPerspective.Width); texPerspective.Width = Math.Min((int)(targetSize.X - texPerspective.Width * x), texPerspective.Width);
spriteBatch.Draw(texture, new Vector2(left, top), texPerspective, color.Value, rotation, Vector2.Zero, scale, effects, depth.Value); spriteBatch.Draw(texture, new Vector2(left, top), texPerspective, color.Value, rotation, Vector2.Zero, scale, effects, depth ?? this.depth);
if (texPerspective.X + movementX >= rect.Right) if (texPerspective.X + movementX >= rect.Right)
{ {
texPerspective.X = rect.X; texPerspective.X = rect.X;