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

"Shifting" entity IDs to prevent them from overlapping between different subs, loading another submarine now works without crashing

Browse Source
This commit is contained in:
Regalis
2016-06-10 20:53:35 +03:00
parent 7349cdd310
commit ee2d817e6b
14 changed files with 83 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Subsurface/Source/GameSession/GameModes/Tutorials/TutorialMode.cs
View File

@@ -9,7 +9,7 @@ namespace Barotrauma
public static void StartTutorial(TutorialType tutorialType)
{
Submarine.Load("Content/Map/TutorialSub.sub", "");
Submarine.Load("Content/Map/TutorialSub.sub", "", true);
tutorialType.Initialize();

7
Subsurface/Source/GameSession/GameSession.cs
View File

@@ -125,7 +125,10 @@ namespace Barotrauma
return;
}
if (reloadSub || Submarine.MainSub != submarine) submarine.Load();
if (reloadSub || Submarine.MainSub != submarine) submarine.Load(true);
//var secondSub = new Submarine(submarine.FilePath, submarine.MD5Hash.Hash);
//secondSub.Load(false);
if (level != null)
{
@@ -133,6 +136,8 @@ namespace Barotrauma
submarine.SetPosition(level.StartPosition - new Vector2(0.0f, 2000.0f));
//secondSub.SetPosition(level.EndPosition - new Vector2(0.0f, 2000.0f));
GameMain.GameScreen.BackgroundCreatureManager.SpawnSprites(80);
}