aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS_TheReturn
diff options
context:
space:
mode:
authorMichael <[email protected]>2017-04-17 15:10:34 -0400
committerMichael <[email protected]>2017-04-17 15:10:34 -0400
commit32fc6ed13d8334a6af66b43cf84324a123670620 (patch)
tree0467b09c0c3d0a65cd2cbbce45d4b8fccd70751a /ShiftOS_TheReturn
parente2de1b7083c4e064b7f195b0d49c93019aa34e39 (diff)
downloadshiftos_thereturn-32fc6ed13d8334a6af66b43cf84324a123670620.tar.gz
shiftos_thereturn-32fc6ed13d8334a6af66b43cf84324a123670620.tar.bz2
shiftos_thereturn-32fc6ed13d8334a6af66b43cf84324a123670620.zip
Basically finish new OOBE
Diffstat (limited to 'ShiftOS_TheReturn')
-rw-r--r--ShiftOS_TheReturn/SaveSystem.cs8
-rw-r--r--ShiftOS_TheReturn/Story.cs2
2 files changed, 5 insertions, 5 deletions
diff --git a/ShiftOS_TheReturn/SaveSystem.cs b/ShiftOS_TheReturn/SaveSystem.cs
index 9ff3111..998c60d 100644
--- a/ShiftOS_TheReturn/SaveSystem.cs
+++ b/ShiftOS_TheReturn/SaveSystem.cs
@@ -120,7 +120,7 @@ namespace ShiftOS.Engine
//This haults the client until the connection is successful.
while (ServerManager.thisGuid == new Guid())
{
-
+ Thread.Sleep(10);
}
Console.WriteLine("GUID received - bootstrapping complete.");
FinishBootstrap();
@@ -133,7 +133,7 @@ namespace ShiftOS.Engine
ServerManager.StartLANServer();
while (ServerManager.thisGuid == new Guid())
{
-
+ Thread.Sleep(10);
}
Console.WriteLine("GUID received - bootstrapping complete.");
FinishBootstrap();
@@ -172,7 +172,7 @@ namespace ShiftOS.Engine
while (CurrentSave == null)
{
-
+ Thread.Sleep(10);
}
Localization.SetupTHETRUEDefaultLocals();
@@ -181,7 +181,7 @@ namespace ShiftOS.Engine
while (CurrentSave.StoryPosition < 1)
{
-
+ Thread.Sleep(10);
}
Thread.Sleep(75);
diff --git a/ShiftOS_TheReturn/Story.cs b/ShiftOS_TheReturn/Story.cs
index ecd04f4..8c726ed 100644
--- a/ShiftOS_TheReturn/Story.cs
+++ b/ShiftOS_TheReturn/Story.cs
@@ -68,7 +68,7 @@ namespace ShiftOS.Engine
}
}
}
- catch { }
+ catch (Exception ex) { throw ex; }
}
}
#if DEBUG