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

Hull volume helper is hidden when no hulls are selected, using the HasPermission method for consistency

Browse Source
This commit is contained in:
Regalis
2016-11-21 16:55:56 +02:00
parent 82aa43cda3
commit 4cef011131
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Networking/GameClient.cs
+5 -5
View File
@@ -256,7 +256,7 @@ namespace Barotrauma.Networking
bool hasCharacter = inc.ReadBoolean(); bool hasCharacter = inc.ReadBoolean();
bool allowSpectating = inc.ReadBoolean(); bool allowSpectating = inc.ReadBoolean();
endRoundButton.Visible = permissions.HasFlag(ClientPermissions.EndRound); endRoundButton.Visible = HasPermission(ClientPermissions.EndRound);
if (gameStarted && Screen.Selected != GameMain.GameScreen) if (gameStarted && Screen.Selected != GameMain.GameScreen)
{ {
@@ -613,7 +613,7 @@ namespace Barotrauma.Networking
msg = "Your current permissions:\n"; msg = "Your current permissions:\n";
foreach (ClientPermissions permission in Enum.GetValues(typeof(ClientPermissions))) foreach (ClientPermissions permission in Enum.GetValues(typeof(ClientPermissions)))
{ {
if (!newPermissions.HasFlag(permissions) || permission == ClientPermissions.None) continue; if (!HasPermission(permissions) || permission == ClientPermissions.None) continue;
System.Reflection.FieldInfo fi = typeof(ClientPermissions).GetField(permission.ToString()); System.Reflection.FieldInfo fi = typeof(ClientPermissions).GetField(permission.ToString());
DescriptionAttribute[] attributes = (DescriptionAttribute[])fi.GetCustomAttributes(typeof(DescriptionAttribute), false); DescriptionAttribute[] attributes = (DescriptionAttribute[])fi.GetCustomAttributes(typeof(DescriptionAttribute), false);
@@ -625,7 +625,7 @@ namespace Barotrauma.Networking
new GUIMessageBox("Permissions changed", msg).UserData = "permissions"; new GUIMessageBox("Permissions changed", msg).UserData = "permissions";
} }
endRoundButton.Visible = permissions.HasFlag(ClientPermissions.EndRound); endRoundButton.Visible = HasPermission(ClientPermissions.EndRound);
break; break;
case (byte)PacketTypes.RequestFile: case (byte)PacketTypes.RequestFile:
@@ -1037,8 +1037,8 @@ namespace Barotrauma.Networking
public override void KickPlayer(string kickedName, bool ban, bool range = false) public override void KickPlayer(string kickedName, bool ban, bool range = false)
{ {
if (!permissions.HasFlag(ClientPermissions.Kick) && !ban) return; if (!HasPermission(ClientPermissions.Kick) && !ban) return;
if (!permissions.HasFlag(ClientPermissions.Ban) && ban) return; if (!HasPermission(ClientPermissions.Ban) && ban) return;
NetOutgoingMessage msg = client.CreateMessage(); NetOutgoingMessage msg = client.CreateMessage();
msg.Write((byte)PacketTypes.KickPlayer); msg.Write((byte)PacketTypes.KickPlayer);
Subsurface/Source/Screens/EditMapScreen.cs
+9 -4
View File
@@ -25,6 +25,8 @@ namespace Barotrauma
private GUITextBox nameBox; private GUITextBox nameBox;
private GUIFrame hullVolumeFrame;
const int PreviouslyUsedCount = 10; const int PreviouslyUsedCount = 10;
private GUIListBox previouslyUsedList; private GUIListBox previouslyUsedList;
@@ -88,7 +90,7 @@ namespace Barotrauma
{ {
if (buoyancyVol / selectedVol < 1.0f) if (buoyancyVol / selectedVol < 1.0f)
{ {
retVal += " (optimal NeutralBallastLevel is " + (buoyancyVol / selectedVol) + ")"; retVal += " (optimal NeutralBallastLevel is " + (buoyancyVol / selectedVol).ToString("0.00") + ")";
} }
else else
{ {
@@ -124,13 +126,14 @@ namespace Barotrauma
topPanel = new GUIFrame(new Rectangle(0, 0, 0, 31), GUI.Style); topPanel = new GUIFrame(new Rectangle(0, 0, 0, 31), GUI.Style);
topPanel.Padding = new Vector4(5.0f, 5.0f, 5.0f, 5.0f); topPanel.Padding = new Vector4(5.0f, 5.0f, 5.0f, 5.0f);
GUIFrame hullVolumeFrame = new GUIFrame(new Rectangle(145, 26, 400, 100), GUI.Style, topPanel); hullVolumeFrame = new GUIFrame(new Rectangle(145, 26, 280, 70), GUI.Style, topPanel);
hullVolumeFrame.Padding = new Vector4(3.0f, 3.0f, 3.0f, 3.0f); hullVolumeFrame.Padding = new Vector4(3.0f, 3.0f, 3.0f, 3.0f);
GUITextBlock totalHullVolume = new GUITextBlock(new Rectangle(0, 0, 0, 20), "", GUI.Style, hullVolumeFrame); GUITextBlock totalHullVolume = new GUITextBlock(new Rectangle(0, 0, 0, 20), "", GUI.Style, hullVolumeFrame, GUI.SmallFont);
totalHullVolume.Visible = false;
totalHullVolume.TextGetter = GetTotalHullVolume; totalHullVolume.TextGetter = GetTotalHullVolume;
GUITextBlock selectedHullVolume = new GUITextBlock(new Rectangle(0, 50, 0, 20), "", GUI.Style, hullVolumeFrame); GUITextBlock selectedHullVolume = new GUITextBlock(new Rectangle(0, 30, 0, 20), "", GUI.Style, hullVolumeFrame, GUI.SmallFont);
selectedHullVolume.TextGetter = GetSelectedHullVolume; selectedHullVolume.TextGetter = GetSelectedHullVolume;
var button = new GUIButton(new Rectangle(0, 0, 70, 20), "Open...", GUI.Style, topPanel); var button = new GUIButton(new Rectangle(0, 0, 70, 20), "Open...", GUI.Style, topPanel);
@@ -894,6 +897,8 @@ namespace Barotrauma
{ {
if (tutorial != null) tutorial.Update((float)deltaTime); if (tutorial != null) tutorial.Update((float)deltaTime);
hullVolumeFrame.Visible = MapEntity.SelectedList.Any(s => s is Hull);
if (GUIComponent.MouseOn == null) if (GUIComponent.MouseOn == null)
{ {
cam.MoveCamera((float)deltaTime); cam.MoveCamera((float)deltaTime);