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

Made game compilable

Browse Source 
Networking functionality is fully disabled now.

I think it's time to start rewriting everything. OH BOY
This commit is contained in:
juanjp600
2016-08-30 21:13:36 -03:00
parent 4157e5aab2
commit 7bdcc51bae
11 changed files with 80 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Subsurface/Source/Items/CharacterInventory.cs
View File

@@ -235,8 +235,8 @@ namespace Barotrauma
Items[index] = null;
//swapping the items failed -> move them back to where they were
TryPutItem(item, currentIndex, false, false);
TryPutItem(existingItem, index, false, false);
TryPutItem(item, currentIndex, false);
TryPutItem(existingItem, index, false);
}
}
@@ -287,7 +287,7 @@ namespace Barotrauma
{
if (doubleClickedItem.ParentInventory != this)
{
TryPutItem(doubleClickedItem, doubleClickedItem.AllowedSlots, true);
TryPutItem(doubleClickedItem, doubleClickedItem.AllowedSlots);
}
else
{
@@ -296,24 +296,24 @@ namespace Barotrauma
var selectedContainer = character.SelectedConstruction.GetComponent<ItemContainer>();
if (selectedContainer != null && selectedContainer.Inventory != null)
{
selectedContainer.Inventory.TryPutItem(doubleClickedItem, doubleClickedItem.AllowedSlots, true);
selectedContainer.Inventory.TryPutItem(doubleClickedItem, doubleClickedItem.AllowedSlots);
}
}
else if (character.SelectedCharacter != null && character.SelectedCharacter.Inventory != null)
{
character.SelectedCharacter.Inventory.TryPutItem(doubleClickedItem, doubleClickedItem.AllowedSlots, true);
character.SelectedCharacter.Inventory.TryPutItem(doubleClickedItem, doubleClickedItem.AllowedSlots);
}
else //doubleclicked and no other inventory is selected
{
//not equipped -> attempt to equip
if (IsInLimbSlot(doubleClickedItem, InvSlotType.Any))
{
TryPutItem(doubleClickedItem, doubleClickedItem.AllowedSlots.FindAll(i => i != InvSlotType.Any), true);
TryPutItem(doubleClickedItem, doubleClickedItem.AllowedSlots.FindAll(i => i != InvSlotType.Any));
}
//equipped -> attempt to unequip
else if (doubleClickedItem.AllowedSlots.Contains(InvSlotType.Any))
{
TryPutItem(doubleClickedItem, new List<InvSlotType>() { InvSlotType.Any }, true);
TryPutItem(doubleClickedItem, new List<InvSlotType>() { InvSlotType.Any });
}
}
}

6
Subsurface/Source/Items/Inventory.cs
View File

@@ -122,7 +122,7 @@ namespace Barotrauma
if (removeItem)
{
item.Drop(null, false);
item.Drop(null);
if (item.ParentInventory != null) item.ParentInventory.RemoveItem(item);
}
@@ -156,7 +156,7 @@ namespace Barotrauma
protected virtual void DropItem(Item item)
{
item.Drop(null, false);
item.Drop(null);
return;
}
//public void DropItem(int i)
@@ -276,7 +276,7 @@ namespace Barotrauma
}
//selectedSlot = slotIndex;
TryPutItem(draggingItem, slotIndex, true, true);
TryPutItem(draggingItem, slotIndex, true);
draggingItem = null;
}

6
Subsurface/Source/Items/ItemSpawner.cs
View File

@@ -80,8 +80,7 @@ namespace Barotrauma
//inventories.Add(inventory);
}
}
if (GameMain.Server != null) GameMain.Server.SendItemSpawnMessage(items);
}
public void AddToSpawnedList(Item item)
@@ -133,8 +132,7 @@ namespace Barotrauma
items.Add(item);
}
if (GameMain.Server != null) GameMain.Server.SendItemRemoveMessage(items);
}
public void Clear()