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

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

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;