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

v0.1.2: Asynchronous master server connections, largefont, traitor mode ends when traitor dies or sub reaches end of level

Browse Source
This commit is contained in:
Regalis
2015-08-14 01:59:41 +03:00
parent 5771bc7e02
commit bc4ea098f7
23 changed files with 377 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,11 +144,11 @@ namespace Subsurface
//PutItem(item, i, false, false);
combined = true;
}
else if (items[i].Combine(item))
{
//PutItem(items[i], i, false, false);
combined = true;
}
//else if (items[i].Combine(item))
//{
// //PutItem(items[i], i, false, false);
// combined = true;
//}
if (!combined) return false;

2
Subsurface/Source/Items/Components/Projectile.cs
View File

@@ -179,7 +179,7 @@ namespace Subsurface.Items.Components
foreach (Item contained in item.ContainedItems)
{
contained.Condition = 0.0f;
if (contained.body!=null)
if (contained.body != null)
{
contained.body.SetTransform(item.SimPosition, contained.body.Rotation);
}

2
Subsurface/Source/Items/Item.cs
View File

@@ -178,7 +178,7 @@ namespace Subsurface
get
{
ItemContainer c = GetComponent<ItemContainer>();
return (c == null) ? null : c.inventory.items;
return (c == null) ? null : Array.FindAll(c.inventory.items, i=>i!=null);
}
}