diff --git a/Barotrauma/BarotraumaClient/Source/Map/Levels/LevelRenderer.cs b/Barotrauma/BarotraumaClient/Source/Map/Levels/LevelRenderer.cs
index 4cd7d27b8..14e5de89d 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/Levels/LevelRenderer.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/Levels/LevelRenderer.cs
@@ -270,7 +270,7 @@ namespace Barotrauma
wallCenterEffect.CurrentTechnique.Passes[0].Apply();
if (GameMain.GameScreen.Cam.WorldView.Y - GameMain.GameScreen.Cam.WorldView.Height < level.SeaFloorTopPos + 1024)
{
- foreach (LevelWall wall in level.WrappingWalls)
+ foreach (LevelWall wall in level.ExtraWalls)
{
graphicsDevice.SetVertexBuffer(wall.BodyVertices);
graphicsDevice.DrawPrimitives(PrimitiveType.TriangleList, 0, (int)Math.Floor(wall.BodyVertices.VertexCount / 3.0f));
@@ -287,7 +287,7 @@ namespace Barotrauma
if (GameMain.GameScreen.Cam.WorldView.Y - GameMain.GameScreen.Cam.WorldView.Height < level.SeaFloorTopPos + 1024)
{
- foreach (LevelWall wall in level.WrappingWalls)
+ foreach (LevelWall wall in level.ExtraWalls)
{
graphicsDevice.SetVertexBuffer(wall.WallVertices);
graphicsDevice.DrawPrimitives(PrimitiveType.TriangleList, 0, (int)Math.Floor(wall.WallVertices.VertexCount / 3.0f));
diff --git a/Barotrauma/BarotraumaShared/Content/Map/LevelGenerationParameters.xml b/Barotrauma/BarotraumaShared/Content/Map/LevelGenerationParameters.xml
index 83dbd38d9..c7e8ee73f 100644
--- a/Barotrauma/BarotraumaShared/Content/Map/LevelGenerationParameters.xml
+++ b/Barotrauma/BarotraumaShared/Content/Map/LevelGenerationParameters.xml
@@ -3,16 +3,19 @@
+ name = "Cold Caverns"
+ description= "asdgfdfg"/>
+ name = "Volcanic Ridge"
+ description= "asdgfdfg"/>
+ name = "Hydrothermal Wastes"
+ description= "asdgfdfg"/>
+
+
+
\ No newline at end of file
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Levels/Level.cs b/Barotrauma/BarotraumaShared/Source/Map/Levels/Level.cs
index 8679f32ec..a6df9f7a6 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Levels/Level.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Levels/Level.cs
@@ -107,7 +107,7 @@ namespace Barotrauma
get { return ruins; }
}
- public LevelWall[] WrappingWalls
+ public LevelWall[] ExtraWalls
{
get { return extraWalls; }
}
@@ -907,31 +907,29 @@ namespace Barotrauma
}
}
- /*
- if (wrappingWalls == null) return cells;
-
- for (int side = 0; side < 2; side++)
+ if (extraWalls != null)
{
- for (int n = 0; n < 2; n++)
+ Debug.Assert(extraWalls.Count() == 1, "Level.GetCells may need to be updated to support extra walls other than the ocean floor.");
+ if (pos.Y - searchDepth * GridCellSize < SeaFloorTopPos)
{
- if (wrappingWalls[side, n] == null) continue;
-
- if (Vector2.Distance(wrappingWalls[side, n].MidPos, pos) > WrappingWall.WallWidth) continue;
-
- foreach (VoronoiCell cell in wrappingWalls[side, n].Cells)
+ foreach (VoronoiCell cell in extraWalls[0].Cells)
{
- cells.Add(cell);
+ if (Math.Abs(cell.Center.X - pos.X) < searchDepth * GridCellSize)
+ {
+ cells.Add(cell);
+ }
}
}
- }*/
+ }
+
return cells;
}
private void Unload()
{
#if CLIENT
- if (renderer!=null)
+ if (renderer != null)
{
renderer.Dispose();
renderer = null;