Ingame syncing kinda works

Reminder to self: Submarines must spawn attached shuttles in Dedicated Server, must've been something I missed when moving over client-specific code
This commit is contained in:
juanjp600
2017-06-20 22:28:18 -03:00
parent 7003214847
commit 0740579f62
25 changed files with 109 additions and 43 deletions
@@ -47,6 +47,8 @@ namespace Barotrauma
private void InitProjSpecific(XDocument doc)
{
keys = new Key[Enum.GetNames(typeof(InputType)).Length];
for (int i = 0; i < Enum.GetNames(typeof(InputType)).Length; i++)
{
keys[i] = new Key(GameMain.Config.KeyBind((InputType)i));
@@ -186,6 +186,8 @@ namespace Barotrauma
}
public static Character ReadSpawnData(NetBuffer inc, bool spawn = true)
{
DebugConsole.NewMessage("READING CHARACTER SPAWN DATA", Color.Cyan);
if (GameMain.Server != null) return null;
bool noInfo = inc.ReadBoolean();
+1
View File
@@ -146,6 +146,7 @@ namespace Barotrauma
case "help":
case "dumpids":
case "admin":
case "entitylist":
return true;
default:
return false;
@@ -190,7 +190,7 @@ namespace Barotrauma.Networking
{
if (GameSettings.VerboseLogging)
{
DebugConsole.ThrowError("Failed to read event for entity \"" + entity.ToString() + "!", e);
DebugConsole.ThrowError("Failed to read event for entity \"" + entity.ToString() + "\"!", e);
}
msg.Position = msgPosition + msgLength * 8;
}
@@ -11,6 +11,22 @@ namespace Barotrauma.Networking
{
abstract partial class NetworkMember
{
protected CharacterInfo characterInfo;
protected Character myCharacter;
public CharacterInfo CharacterInfo
{
get { return characterInfo; }
set { characterInfo = value; }
}
public Character Character
{
get { return myCharacter; }
set { myCharacter = value; }
}
protected GUIFrame inGameHUD;
protected GUIListBox chatBox;
protected GUITextBox chatMsgBox;
+1 -1
View File
@@ -164,7 +164,7 @@ namespace Barotrauma
sw.WriteLine(sb.ToString());
sw.Close();
sw.Close();
CrashMessageBox( "A crash report (\"crashreport.txt\") was saved in the root folder of the game."+
" If you'd like to help fix this bug, please post the report on the Undertow Games forums.");