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

Updated client project (ShiftSummary -> RoundSummary), removed unused drowningtime variable

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-10-05 21:35:57 +03:00
parent f8dfba91b8
commit c444186426
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/BarotraumaClient.csproj
+1 -1
View File
@@ -99,7 +99,7 @@
<Compile Include="Source\GameSession\GameModes\Tutorials\TutorialType.cs" /> <Compile Include="Source\GameSession\GameModes\Tutorials\TutorialType.cs" />
<Compile Include="Source\GameSession\GameSession.cs" /> <Compile Include="Source\GameSession\GameSession.cs" />
<Compile Include="Source\GameSession\HireManager.cs" /> <Compile Include="Source\GameSession\HireManager.cs" />
<Compile Include="Source\GameSession\ShiftSummary.cs" /> <Compile Include="Source\GameSession\RoundSummary.cs" />
<Compile Include="Source\GameSettings.cs" /> <Compile Include="Source\GameSettings.cs" />
<Compile Include="Source\GUI\ComponentStyle.cs" /> <Compile Include="Source\GUI\ComponentStyle.cs" />
<Compile Include="Source\GUI\GUI.cs" /> <Compile Include="Source\GUI\GUI.cs" />
Barotrauma/BarotraumaShared/Content/Characters/Human/human.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<Character name ="human" humanoid="true" needsair="true" genders="true" maleheadid="1,8" femaleheadid="1,8" drowningtime="30"> <Character name ="human" humanoid="true" needsair="true" genders="true" maleheadid="1,8" femaleheadid="1,8">
<name firstname="Content/Characters/Human/[GENDER]firstnames.txt" lastname="Content/Characters/Human/lastnames.txt" /> <name firstname="Content/Characters/Human/[GENDER]firstnames.txt" lastname="Content/Characters/Human/lastnames.txt" />
Barotrauma/BarotraumaShared/Source/Characters/Character.cs
-2
View File
@@ -89,7 +89,6 @@ namespace Barotrauma
protected bool needsAir; protected bool needsAir;
protected float oxygen, oxygenAvailable; protected float oxygen, oxygenAvailable;
protected float drowningTime;
private float health, lastSentHealth; private float health, lastSentHealth;
protected float minHealth, maxHealth; protected float minHealth, maxHealth;
@@ -584,7 +583,6 @@ namespace Barotrauma
BleedingDecreaseSpeed = doc.Root.GetAttributeFloat("bleedingdecreasespeed", 0.05f); BleedingDecreaseSpeed = doc.Root.GetAttributeFloat("bleedingdecreasespeed", 0.05f);
needsAir = doc.Root.GetAttributeBool("needsair", false); needsAir = doc.Root.GetAttributeBool("needsair", false);
drowningTime = doc.Root.GetAttributeFloat("drowningtime", 10.0f);
if (file == humanConfigFile) if (file == humanConfigFile)
{ {