Remove items in dummycharacter inventory in editmapscreen, important character updates a separate networkeventtype

This commit is contained in:
Regalis
2015-10-23 19:28:21 +03:00
parent b3462b24b4
commit 6736f1dd82
17 changed files with 545 additions and 475 deletions
-1
View File
@@ -308,7 +308,6 @@ namespace Barotrauma
Color.Red*((100.0f-OxygenPercentage)/400.0f), true);
spriteBatch.DrawString(GUI.Font, "Pressure: " + ((int)pressure - rect.Y).ToString() +
" - Lethality: " + lethalPressure +
" - Oxygen: "+((int)OxygenPercentage), new Vector2(rect.X+10, -rect.Y+10), Color.Black);
spriteBatch.DrawString(GUI.Font, volume +" / "+ FullVolume, new Vector2(rect.X+10, -rect.Y+30), Color.Black);
+9 -3
View File
@@ -506,7 +506,7 @@ namespace Barotrauma
/// Has to be done after all the entities have been loaded (an entity can't
/// be linked to some other entity that hasn't been loaded yet)
/// </summary>
public static void OnMapLoaded()
public static void MapLoaded()
{
foreach (MapEntity e in mapEntityList)
{
@@ -524,13 +524,19 @@ namespace Barotrauma
}
}
foreach (MapEntity e in mapEntityList)
{
e.OnMapLoaded();
}
//mapEntityList.Sort((x, y) =>
//{
// return x.Name.CompareTo(y.Name);
//});
}
public virtual void OnMapLoaded() { }
public void RemoveLinked(MapEntity e)
+1 -1
View File
@@ -623,7 +623,7 @@ namespace Barotrauma
subBody = new SubmarineBody(this);
MapEntity.OnMapLoaded();
MapEntity.MapLoaded();
foreach (Item item in Item.itemList)
{