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

Merged branch master into master

Browse Source
This commit is contained in:
juanjp600
2016-08-29 17:55:46 -03:00
parent b3f0f71d43 a0a5e2df33
commit 8a3b901fa2
5 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Subsurface/Source/Map/Structure.cs
View File

@@ -401,10 +401,10 @@ namespace Barotrauma
s.isHighLighted = false;
if (s.damage < 0.01f) continue;
/* GUI.DrawRectangle(spriteBatch,
new Vector2(s.rect.X + drawOffset.X, -(s.rect.Y + drawOffset.Y)), new Vector2(s.rect.Width, s.rect.Height),
Color.Black * (s.damage / prefab.MaxHealth), true);*/
GUI.DrawRectangle(spriteBatch,
new Vector2(s.rect.X + drawOffset.X, -(s.rect.Y + drawOffset.Y)), new Vector2(s.rect.Width, s.rect.Height),
Color.Black * (s.damage / prefab.MaxHealth), true);
}
/*
if(_convexHulls == null) return;

4
Subsurface/Source/Networking/Client.cs
View File

@@ -125,8 +125,8 @@ namespace Barotrauma.Networking
}
public bool HasPermission(ClientPermissions permission)
{
return Permissions.HasFlag(permission);
{
return false; //Permissions.HasFlag(permission);
}
public T GetVote<T>(VoteType voteType)

4
Subsurface/Source/Networking/GameClient.cs
View File

@@ -832,8 +832,8 @@ namespace Barotrauma.Networking
}
public bool HasPermission(ClientPermissions permission)
{
return permissions.HasFlag(permission);
{
return false;// permissions.HasFlag(permission);
}
public override void Draw(Microsoft.Xna.Framework.Graphics.SpriteBatch spriteBatch)