saibotk/Bildschirmflausch-LD41
1
0
Fork 0
Code Releases Activity

Fixed while(true) in DungeonGenerator

Browse source
This commit is contained in:
Piegames 2018-04-22 16:58:05 +02:00
parent 1531464420
commit 80232d1c27
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Assets/Scripts/Generation/DungeonGenerator.cs
View file

@ -7,6 +7,7 @@ public class DungeonGenerator {
} }
public const int TUNNEL_THICKNESS = 4; public const int TUNNEL_THICKNESS = 4;
// The first and starting room // The first and starting room
public GenRoom start; public GenRoom start;
// The room with the finishing flag // The room with the finishing flag
@ -27,7 +28,7 @@ public class DungeonGenerator {
} }
while ( true ) { while ( true ) {
outest: bool changed = false;
foreach ( GenRoom r1 in rooms ) { foreach ( GenRoom r1 in rooms ) {
foreach ( GenRoom r2 in rooms ) { foreach ( GenRoom r2 in rooms ) {
if ( r1 == r2 ) if ( r1 == r2 )
@ -37,11 +38,15 @@ public class DungeonGenerator {
if ( Math.Pow(Vector2Int.Distance(p1, p2), 2) < 2 * minRoomSize * minRoomSize + 2 ) { if ( Math.Pow(Vector2Int.Distance(p1, p2), 2) < 2 * minRoomSize * minRoomSize + 2 ) {
r2.bounds.x += ( int ) ( ( UnityEngine.Random.value - 0.5 ) * 5 ); r2.bounds.x += ( int ) ( ( UnityEngine.Random.value - 0.5 ) * 5 );
r2.bounds.y += ( int ) ( ( UnityEngine.Random.value - 0.5 ) * 2.5 ); r2.bounds.y += ( int ) ( ( UnityEngine.Random.value - 0.5 ) * 2.5 );
goto outest; changed = true;
break;
} }
} }
if (changed)
break;
} }
break; if (!changed)
break;
} }
HashSet<GenVertex> Q = new HashSet<GenVertex>(); HashSet<GenVertex> Q = new HashSet<GenVertex>();
@ -59,14 +64,14 @@ public class DungeonGenerator {
HashSet<GenVertex> F = new HashSet<GenVertex>(); HashSet<GenVertex> F = new HashSet<GenVertex>();
foreach ( GenVertex r1 in Q ) { foreach ( GenVertex r1 in Q ) {
foreach ( GenVertex r2 in Q ) { foreach ( GenVertex r2 in Q ) {
outer:
if ( r1 == r2 ) if ( r1 == r2 )
goto outer; continue;
foreach ( GenEdge e in E ) foreach ( GenEdge e in E )
if ( e.r2 == r1 && e.r1 == r2 ) if ( e.r2 == r1 && e.r1 == r2 )
goto outer; goto outer;
E.Add(new GenEdge(r1, r2)); E.Add(new GenEdge(r1, r2));
} }
outer:
} }
F.Add(root); F.Add(root);
Q.Remove(root); Q.Remove(root);