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

Multiplayer fixes

Browse Source
This commit is contained in:
Regalis
2015-12-12 16:23:01 +02:00
parent 17e8a2171f
commit 04cfca0ede
14 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Subsurface/Source/Networking/GameClient.cs
View File

@@ -3,6 +3,7 @@ using Lidgren.Network;
using Microsoft.Xna.Framework;
using System.Collections.Generic;
using Barotrauma.Networking.ReliableMessages;
using FarseerPhysics;
namespace Barotrauma.Networking
{
@@ -356,7 +357,7 @@ namespace Barotrauma.Networking
if (myCharacter.IsDead)
{
Character.Controlled = null;
GameMain.GameScreen.Cam.TargetPos = Vector2.Zero;
//GameMain.GameScreen.Cam.TargetPos = Vector2.Zero;
}
else if (gameStarted)
{
@@ -742,7 +743,7 @@ namespace Barotrauma.Networking
float closestDist = 0.0f;
foreach (WayPoint wp in WayPoint.WayPointList)
{
float dist = Vector2.Distance(wp.SimPosition, position);
float dist = Vector2.Distance(wp.WorldPosition, position);
if (closestWaypoint != null && dist > closestDist) continue;
closestWaypoint = wp;
@@ -750,9 +751,7 @@ namespace Barotrauma.Networking
continue;
}
Character character = (closestWaypoint == null) ?
Character.Create(ch, position, !isMyCharacter) :
Character.Create(ch, closestWaypoint, !isMyCharacter);
Character character = Character.Create(ch, position, !isMyCharacter);
character.ID = ID;