- clients don't spawn character jobitems themselves (item data is written in the StartGame network message)

- after receiving a StartGame message, clients will wait until the game is loaded before reading new messages from the server
- the Item(prefab, position, submarine) constructor uses the position as the center of the item, not as top-left corner
This commit is contained in:
Regalis
2016-07-29 18:38:42 +03:00
parent c773320a55
commit 4252f4b9d0
12 changed files with 146 additions and 110 deletions
+4 -12
View File
@@ -37,6 +37,8 @@ namespace Barotrauma
public bool SpawnedMidRound;
public List<Item> SpawnItems = new List<Item>();
private bool enabled;
public bool Enabled
@@ -73,11 +75,7 @@ namespace Barotrauma
}
protected Key[] keys;
//protected Key selectKeyHit;
//protected Key actionKeyHit, actionKeyDown;
//protected Key secondaryKeyHit, secondaryKeyDown;
private Item selectedConstruction;
private Item[] selectedItems;
@@ -160,13 +158,7 @@ namespace Barotrauma
{
get { return inventory; }
}
public WayPoint SpawnPoint
{
get;
set;
}
private Color speechBubbleColor;
private float speechBubbleTimer;
+1
View File
@@ -127,6 +127,7 @@ namespace Barotrauma
}
}
character.SpawnItems.Add(item);
if (parentItem != null) parentItem.Combine(item);