Show item IDs in inventory tooltips if debugdraw is enabled, itemspawner sync bugfix, characters can be revived (atm only through the debug console)

This commit is contained in:
Regalis
2016-02-09 20:00:53 +02:00
parent 5beaf43e17
commit 4e46c44d51
9 changed files with 76 additions and 9 deletions
@@ -266,7 +266,15 @@ namespace Barotrauma
if (Items[i] != null && slotRect.Contains(PlayerInput.MousePosition))
{
toolTip = string.IsNullOrEmpty(Items[i].Description) ? Items[i].Name : Items[i].Name + '\n' + Items[i].Description;
if (GameMain.DebugDraw)
{
toolTip = Items[i].ToString();
}
else
{
toolTip = string.IsNullOrEmpty(Items[i].Description) ? Items[i].Name : Items[i].Name + '\n' + Items[i].Description;
}
highlightedSlot = slotRect;
}
+1 -1
View File
@@ -199,7 +199,7 @@ namespace Barotrauma
if (slotRect.Contains(PlayerInput.MousePosition) && Items[i] != null)
{
highlightedSlot = slotRect;
toolTip = Items[i].Name;
toolTip = GameMain.DebugDraw ? Items[i].ToString() : Items[i].Name;
}
}
+1 -1
View File
@@ -88,7 +88,7 @@ namespace Barotrauma
message.Write(items[i].Prefab.Name);
message.Write(items[i].ID);
message.Write(inventories[i].Owner == null ? 0 : inventories[i].Owner.ID);
message.Write((inventories[i]==null || inventories[i].Owner == null) ? (ushort)0 : inventories[i].Owner.ID);
}
}