From d6443ac6a4dc6377bfc1ba6c9cfd9342e3cb3f86 Mon Sep 17 00:00:00 2001 From: Regalis Date: Sun, 21 Feb 2016 00:29:53 +0200 Subject: [PATCH] v0.3.3.1: fixed the inventories of selected players going behind the chatbox, fixed clients sending deselect messages for characters other than their own, using keybinds when moving the camera --- Subsurface/Source/Camera.cs | 8 ++--- Subsurface/Source/Characters/Character.cs | 8 ++--- Subsurface/Source/Characters/CharacterHUD.cs | 28 ++---------------- Subsurface/Source/GameSession/GameSession.cs | 4 +-- Subsurface/Source/Networking/NetworkMember.cs | 5 ++++ Subsurface_Solution.v12.suo | Bin 923648 -> 907776 bytes 6 files changed, 16 insertions(+), 37 deletions(-) diff --git a/Subsurface/Source/Camera.cs b/Subsurface/Source/Camera.cs index cd23b9fb0..12aacd1be 100644 --- a/Subsurface/Source/Camera.cs +++ b/Subsurface/Source/Camera.cs @@ -166,10 +166,10 @@ namespace Barotrauma if (PlayerInput.KeyDown(Keys.LeftShift)) moveSpeed *= 2.0f; if (PlayerInput.KeyDown(Keys.LeftControl)) moveSpeed *= 0.5f; - if (PlayerInput.KeyDown(Keys.A)) moveCam.X -= moveSpeed; - if (PlayerInput.KeyDown(Keys.D)) moveCam.X += moveSpeed; - if (PlayerInput.KeyDown(Keys.S)) moveCam.Y -= moveSpeed; - if (PlayerInput.KeyDown(Keys.W)) moveCam.Y += moveSpeed; + if (GameMain.Config.KeyBind(InputType.Left).IsDown()) moveCam.X -= moveSpeed; + if (GameMain.Config.KeyBind(InputType.Right).IsDown()) moveCam.X += moveSpeed; + if (GameMain.Config.KeyBind(InputType.Down).IsDown()) moveCam.Y -= moveSpeed; + if (GameMain.Config.KeyBind(InputType.Up).IsDown()) moveCam.Y += moveSpeed; } if (Submarine.Loaded!=null && Screen.Selected == GameMain.GameScreen) diff --git a/Subsurface/Source/Characters/Character.cs b/Subsurface/Source/Characters/Character.cs index 98a107d01..a50e7aa1b 100644 --- a/Subsurface/Source/Characters/Character.cs +++ b/Subsurface/Source/Characters/Character.cs @@ -671,9 +671,9 @@ namespace Barotrauma if (selectedCharacter!=null) { - if (Vector2.Distance(selectedCharacter.SimPosition, SimPosition) > 2.0f || !selectedCharacter.CanBeSelected) + if (Vector2.Distance(selectedCharacter.SimPosition, SimPosition) > 3.0f || !selectedCharacter.CanBeSelected) { - DeselectCharacter(); + DeselectCharacter(controlled == this); } } @@ -905,7 +905,7 @@ namespace Barotrauma { if (selectedCharacter != null) { - DeselectCharacter(); + DeselectCharacter(controlled == this); } else if (closestCharacter != null && closestCharacter.IsHumanoid && closestCharacter.CanBeSelected) { @@ -915,7 +915,7 @@ namespace Barotrauma } else { - if (selectedCharacter != null) DeselectCharacter(); + if (selectedCharacter != null) DeselectCharacter(controlled==this); selectedConstruction = null; closestItem = null; closestCharacter = null; diff --git a/Subsurface/Source/Characters/CharacterHUD.cs b/Subsurface/Source/Characters/CharacterHUD.cs index c917b6eaf..2fc846110 100644 --- a/Subsurface/Source/Characters/CharacterHUD.cs +++ b/Subsurface/Source/Characters/CharacterHUD.cs @@ -60,9 +60,7 @@ namespace Barotrauma if (character.SelectedCharacter != null && character.SelectedCharacter.Inventory!=null) { - character.SelectedCharacter.Inventory.DrawOwn(spriteBatch, new Vector2(GameMain.GraphicsWidth - 310, 0.0f)); - - //if (Vector2.Distance(selectedCharacter.SimPosition, SimPosition) > 2.0f) selectedCharacter = null; + character.SelectedCharacter.Inventory.DrawOwn(spriteBatch, new Vector2(320.0f, 0.0f)); } if (character.ClosestCharacter != null && character.ClosestCharacter.CanBeSelected) @@ -74,9 +72,6 @@ namespace Barotrauma textPos -= new Vector2(GUI.Font.MeasureString(character.ClosestCharacter.Info.Name).X / 2, 20); GUI.DrawString(spriteBatch, textPos, character.ClosestCharacter.Info.Name, Color.Orange, Color.Black, 2); - - //spriteBatch.DrawString(GUI.Font, character.ClosestCharacter.Info.Name, textPos, Color.Black); - //spriteBatch.DrawString(GUI.Font, character.ClosestCharacter.Info.Name, textPos + new Vector2(1, -1), Color.Orange); } else if (character.SelectedCharacter == null && character.ClosestItem != null && character.SelectedConstruction == null) { @@ -86,9 +81,6 @@ namespace Barotrauma Vector2 textPos = startPos; textPos -= new Vector2(GUI.Font.MeasureString(character.ClosestItem.Name).X / 2, 20); - //spriteBatch.DrawString(GUI.Font, character.ClosestItem.Prefab.Name, textPos, Color.Black); - //GUI.DrawRectangle(spriteBatch, textPos-Vector2.One*2.0f, textSize+Vector2.One*4.0f, Color.Black * 0.7f, true); - //spriteBatch.DrawString(GUI.Font, character.ClosestItem.Prefab.Name, textPos, Color.Orange); GUI.DrawString(spriteBatch, textPos, character.ClosestItem.Name, Color.Orange, Color.Black * 0.7f, 2); @@ -99,21 +91,10 @@ namespace Barotrauma textPos.X = startPos.X - GUI.Font.MeasureString(coloredText.Text).X / 2; GUI.DrawString(spriteBatch, textPos, coloredText.Text, coloredText.Color, Color.Black*0.7f, 2); - - //spriteBatch.DrawString(GUI.Font, coloredText.Text, textPos, Color.Black); - //GUI.DrawRectangle(spriteBatch, textPos - Vector2.One * 2.0f, textSize + Vector2.One * 4.0f, Color.Black * 0.7f, true); - //spriteBatch.DrawString(GUI.Font, coloredText.Text, textPos, coloredText.Color); - + textPos.Y += 25; } } - //Vector2 offset = Rand.Vector(noise.size.X); - //offset.X = Math.Abs(offset.X); - //offset.Y = Math.Abs(offset.Y); - - //noise.DrawTiled(spriteBatch, Vector2.Zero - offset, new Vector2(GameMain.GraphicsWidth, GameMain.GraphicsHeight) + offset, - // Vector2.Zero, - // Color.White * 0.1f); if (character.Oxygen < 50.0f && !character.IsDead) { @@ -124,11 +105,6 @@ namespace Barotrauma noiseOverlay.DrawTiled(spriteBatch, Vector2.Zero - offset, new Vector2(GameMain.GraphicsWidth, GameMain.GraphicsHeight) + offset, Vector2.Zero, Color.White * ((50.0f - character.Oxygen) / 50.0f)); - - //spriteBatch.Draw(noise.Texture, - // new Rectangle(0, 0, GameMain.GraphicsWidth, GameMain.GraphicsHeight), - // new Rectangle(Rand.Int(GameMain.GraphicsWidth), Rand.Int(GameMain.GraphicsHeight), (int)noise.size.X, (int)noise.size.Y), - // Color.White * ((100.0f - character.Oxygen) / 100.0f)); } if (damageOverlayTimer>0.0f) diff --git a/Subsurface/Source/GameSession/GameSession.cs b/Subsurface/Source/GameSession/GameSession.cs index 9c8fc717e..6d2813205 100644 --- a/Subsurface/Source/GameSession/GameSession.cs +++ b/Subsurface/Source/GameSession/GameSession.cs @@ -120,9 +120,7 @@ namespace Barotrauma { level.Generate(); - Vector2 subOffsetFromCenter = new Vector2(Submarine.Borders.Center.X, Submarine.Borders.Y - Submarine.Borders.Height / 2); - - submarine.SetPosition(level.StartPosition - subOffsetFromCenter - new Vector2(0.0f, 2000.0f)); + submarine.SetPosition(level.StartPosition - new Vector2(0.0f, 2000.0f)); GameMain.GameScreen.BackgroundCreatureManager.SpawnSprites(80); } diff --git a/Subsurface/Source/Networking/NetworkMember.cs b/Subsurface/Source/Networking/NetworkMember.cs index 911a0029a..4e7d727f4 100644 --- a/Subsurface/Source/Networking/NetworkMember.cs +++ b/Subsurface/Source/Networking/NetworkMember.cs @@ -105,6 +105,11 @@ namespace Barotrauma.Networking get { return inGameHUD; } } + public GUIListBox ChatBox + { + get { return chatBox; } + } + public NetworkMember() { inGameHUD = new GUIFrame(new Rectangle(0,0,0,0), null, null); diff --git a/Subsurface_Solution.v12.suo b/Subsurface_Solution.v12.suo index ad135a719669e6366eb247a85e0036770a451d01..6fab769fa0f39f1c8d204c9b2fa65c9efa54e5ab 100644 GIT binary patch delta 3354 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