From c4441864263ab29aa0251edc06160c86028f69de Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Thu, 5 Oct 2017 21:35:57 +0300 Subject: [PATCH] Updated client project (ShiftSummary -> RoundSummary), removed unused drowningtime variable --- Barotrauma/BarotraumaClient/BarotraumaClient.csproj | 2 +- Barotrauma/BarotraumaShared/Content/Characters/Human/human.xml | 2 +- Barotrauma/BarotraumaShared/Source/Characters/Character.cs | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Barotrauma/BarotraumaClient/BarotraumaClient.csproj b/Barotrauma/BarotraumaClient/BarotraumaClient.csproj index c3d99e1ce..9f688d9a7 100644 --- a/Barotrauma/BarotraumaClient/BarotraumaClient.csproj +++ b/Barotrauma/BarotraumaClient/BarotraumaClient.csproj @@ -99,7 +99,7 @@ - + diff --git a/Barotrauma/BarotraumaShared/Content/Characters/Human/human.xml b/Barotrauma/BarotraumaShared/Content/Characters/Human/human.xml index 12a106e08..8cd39e6fd 100644 --- a/Barotrauma/BarotraumaShared/Content/Characters/Human/human.xml +++ b/Barotrauma/BarotraumaShared/Content/Characters/Human/human.xml @@ -1,5 +1,5 @@  - + diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Character.cs b/Barotrauma/BarotraumaShared/Source/Characters/Character.cs index c4c8e86bf..b772e2a12 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/Character.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/Character.cs @@ -89,7 +89,6 @@ namespace Barotrauma protected bool needsAir; protected float oxygen, oxygenAvailable; - protected float drowningTime; private float health, lastSentHealth; protected float minHealth, maxHealth; @@ -584,7 +583,6 @@ namespace Barotrauma BleedingDecreaseSpeed = doc.Root.GetAttributeFloat("bleedingdecreasespeed", 0.05f); needsAir = doc.Root.GetAttributeBool("needsair", false); - drowningTime = doc.Root.GetAttributeFloat("drowningtime", 10.0f); if (file == humanConfigFile) {