Fixed vote count text overlapping with the submarine preview button in NetLobbyScreen

This commit is contained in:
Joonas Rikkonen
2018-01-26 10:36:34 +02:00
parent a1ccf501c7
commit ad18eb0db0
5 changed files with 43 additions and 28 deletions
@@ -10,27 +10,24 @@ namespace Barotrauma
{
class CharacterEditorScreen : Screen
{
Camera cam;
private Camera cam;
GUIComponent GUIpanel;
GUIButton physicsButton;
private GUIComponent GUIpanel;
private GUIButton physicsButton;
GUIListBox limbList, jointList;
private GUIListBox limbList, jointList;
GUIFrame limbPanel;
Character editingCharacter;
Limb editingLimb;
//RevoluteJoint editingJoint;
private GUIFrame limbPanel;
private Character editingCharacter;
private Limb editingLimb;
List<Texture2D> textures;
List<string> texturePaths;
private List<Texture2D> textures;
private List<string> texturePaths;
private bool physicsEnabled;
public Camera Cam
public override Camera Cam
{
get { return cam; }
}
@@ -99,6 +96,8 @@ namespace Barotrauma
{
cam.MoveCamera((float)deltaTime);
GUIpanel.Update((float)deltaTime);
if (physicsEnabled)
{
Character.UpdateAnimAll((float)deltaTime);
@@ -109,6 +108,11 @@ namespace Barotrauma
}
}
public override void AddToGUIUpdateList()
{
GUIpanel.AddToGUIUpdateList();
}
/// <summary>
/// This is called when the game should draw itself.
/// </summary>