Using filename as sub name, disposing convexhull vertexbuffers when removing, canceling networkplayer ladder climbing only if movement key pressed

This commit is contained in:
Regalis
2016-01-29 00:08:17 +02:00
parent f5c2dbf22a
commit a1770427a0
5 changed files with 53 additions and 27 deletions
+11 -11
View File
@@ -274,10 +274,10 @@ namespace Barotrauma
return false;
}
if (Submarine.Loaded!=null)
{
Submarine.Loaded.Name = nameBox.Text;
}
//if (Submarine.Loaded!=null)
//{
// Submarine.Loaded.Name = nameBox.Text;
//}
Submarine.SaveCurrent(nameBox.Text + ".sub");
@@ -326,15 +326,15 @@ namespace Barotrauma
return true;
}
private bool ChangeSubName(GUITextBox textBox, string text)
{
if (Submarine.Loaded != null) Submarine.Loaded.Name = text;
textBox.Deselect();
//private bool ChangeSubName(GUITextBox textBox, string text)
//{
// if (Submarine.Loaded != null) Submarine.Loaded.Name = text;
// textBox.Deselect();
textBox.Text = text;
// textBox.Text = text;
return true;
}
// return true;
//}
private bool SelectPrefab(GUIComponent component, object obj)
{