mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Clean up ConnectHall

pull/5354/head
Anders Jenbo 4 years ago
parent
810f229388
commit
58c8c021f8
1 changed files with 82 additions and 68 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 150
      Source/levels/drlg_l2.cpp

150
Source/levels/drlg_l2.cpp
Unescape View File

@ -22,10 +22,18 @@ namespace devilution {
namespace { namespace {
enum class HallDirection : int8_t {
None,
Up,
Right,
Down,
Left,
};
struct HallNode { struct HallNode {
Point beginning; Point beginning;
Point end; Point end;
int nHalldir; HallDirection direction;
}; };
struct RoomNode { struct RoomNode {
@ -39,7 +47,13 @@ std::list<HallNode> HallList;
// An ASCII representation of the level // An ASCII representation of the level
char predungeon[DMAXX][DMAXY]; char predungeon[DMAXX][DMAXY];
const Displacement DirAdd[5] = { { 0, 0 }, { 0, -1 }, { 1, 0 }, { 0, 1 }, { -1, 0 } }; const Displacement DirAdd[5] = {
{ 0, 0 },
{ 0, -1 },
{ 1, 0 },
{ 0, 1 },
{ -1, 0 }
};
const ShadowStruct SPATSL2[2] = { { 6, 3, 0, 3, 48, 0, 50 }, { 9, 3, 0, 3, 48, 0, 50 } }; const ShadowStruct SPATSL2[2] = { { 6, 3, 0, 3, 48, 0, 50 }, { 9, 3, 0, 3, 48, 0, 50 } };
// short word_48489A = 0; // short word_48489A = 0;
@ -1738,7 +1752,7 @@ void PlaceHallExt(Point position)
* @param nHDir The direction of the hall from nRDest to this room. * @param nHDir The direction of the hall from nRDest to this room.
* @param size If set, is is used used for room size instead of random values. * @param size If set, is is used used for room size instead of random values.
*/ */
void CreateRoom(Point topLeft, Point bottomRight, int nRDest, int nHDir, std::optional<Size> size) void CreateRoom(Point topLeft, Point bottomRight, int nRDest, HallDirection nHDir, std::optional<Size> size)
{ {
if (nRoomCnt >= 80) if (nRoomCnt >= 80)
return; return;
@ -1790,28 +1804,28 @@ void CreateRoom(Point topLeft, Point bottomRight, int nRDest, int nHDir, std::op
int nHy1 = 0; int nHy1 = 0;
int nHx2 = 0; int nHx2 = 0;
int nHy2 = 0; int nHy2 = 0;
if (nHDir == 1) { if (nHDir == HallDirection::Up) {
nHx1 = GenerateRnd(roomSize.width - 2) + roomTopLeft.x + 1; nHx1 = GenerateRnd(roomSize.width - 2) + roomTopLeft.x + 1;
nHy1 = roomTopLeft.y; nHy1 = roomTopLeft.y;
int nHw = RoomList[nRDest].bottomRight.x - RoomList[nRDest].topLeft.x - 2; int nHw = RoomList[nRDest].bottomRight.x - RoomList[nRDest].topLeft.x - 2;
nHx2 = GenerateRnd(nHw) + RoomList[nRDest].topLeft.x + 1; nHx2 = GenerateRnd(nHw) + RoomList[nRDest].topLeft.x + 1;
nHy2 = RoomList[nRDest].bottomRight.y; nHy2 = RoomList[nRDest].bottomRight.y;
} }
if (nHDir == 3) { if (nHDir == HallDirection::Down) {
nHx1 = GenerateRnd(roomSize.width - 2) + roomTopLeft.x + 1; nHx1 = GenerateRnd(roomSize.width - 2) + roomTopLeft.x + 1;
nHy1 = roomBottomRight.y; nHy1 = roomBottomRight.y;
int nHw = RoomList[nRDest].bottomRight.x - RoomList[nRDest].topLeft.x - 2; int nHw = RoomList[nRDest].bottomRight.x - RoomList[nRDest].topLeft.x - 2;
nHx2 = GenerateRnd(nHw) + RoomList[nRDest].topLeft.x + 1; nHx2 = GenerateRnd(nHw) + RoomList[nRDest].topLeft.x + 1;
nHy2 = RoomList[nRDest].topLeft.y; nHy2 = RoomList[nRDest].topLeft.y;
} }
if (nHDir == 2) { if (nHDir == HallDirection::Right) {
nHx1 = roomBottomRight.x; nHx1 = roomBottomRight.x;
nHy1 = GenerateRnd(roomSize.height - 2) + roomTopLeft.y + 1; nHy1 = GenerateRnd(roomSize.height - 2) + roomTopLeft.y + 1;
nHx2 = RoomList[nRDest].topLeft.x; nHx2 = RoomList[nRDest].topLeft.x;
int nHh = RoomList[nRDest].bottomRight.y - RoomList[nRDest].topLeft.y - 2; int nHh = RoomList[nRDest].bottomRight.y - RoomList[nRDest].topLeft.y - 2;
nHy2 = GenerateRnd(nHh) + RoomList[nRDest].topLeft.y + 1; nHy2 = GenerateRnd(nHh) + RoomList[nRDest].topLeft.y + 1;
} }
if (nHDir == 4) { if (nHDir == HallDirection::Left) {
nHx1 = roomTopLeft.x; nHx1 = roomTopLeft.x;
nHy1 = GenerateRnd(roomSize.height - 2) + roomTopLeft.y + 1; nHy1 = GenerateRnd(roomSize.height - 2) + roomTopLeft.y + 1;
nHx2 = RoomList[nRDest].bottomRight.x; nHx2 = RoomList[nRDest].bottomRight.x;
@ -1824,15 +1838,15 @@ void CreateRoom(Point topLeft, Point bottomRight, int nRDest, int nHDir, std::op
Point roomBottomLeft { roomTopLeft.x, roomBottomRight.y }; Point roomBottomLeft { roomTopLeft.x, roomBottomRight.y };
Point roomTopRight { roomBottomRight.x, roomTopLeft.y }; Point roomTopRight { roomBottomRight.x, roomTopLeft.y };
if (roomSize.height > roomSize.width) { if (roomSize.height > roomSize.width) {
CreateRoom(topLeft + standoff, roomBottomLeft - standoff, nRid, 2, {}); CreateRoom(topLeft + standoff, roomBottomLeft - standoff, nRid, HallDirection::Right, {});
CreateRoom(roomTopRight + standoff, bottomRight - standoff, nRid, 4, {}); CreateRoom(roomTopRight + standoff, bottomRight - standoff, nRid, HallDirection::Left, {});
CreateRoom(Point { topLeft.x, roomBottomRight.y } + standoff, Point { roomBottomRight.x, bottomRight.y } - standoff, nRid, 1, {}); CreateRoom(Point { topLeft.x, roomBottomRight.y } + standoff, Point { roomBottomRight.x, bottomRight.y } - standoff, nRid, HallDirection::Up, {});
CreateRoom(Point { roomTopLeft.x, topLeft.y } + standoff, Point { bottomRight.x, roomTopLeft.y } - standoff, nRid, 3, {}); CreateRoom(Point { roomTopLeft.x, topLeft.y } + standoff, Point { bottomRight.x, roomTopLeft.y } - standoff, nRid, HallDirection::Down, {});
} else { } else {
CreateRoom(topLeft + standoff, roomTopRight - standoff, nRid, 3, {}); CreateRoom(topLeft + standoff, roomTopRight - standoff, nRid, HallDirection::Down, {});
CreateRoom(roomBottomLeft + standoff, bottomRight - standoff, nRid, 1, {}); CreateRoom(roomBottomLeft + standoff, bottomRight - standoff, nRid, HallDirection::Up, {});
CreateRoom(Point { topLeft.x, roomTopLeft.y } + standoff, Point { roomTopLeft.x, bottomRight.y } - standoff, nRid, 2, {}); CreateRoom(Point { topLeft.x, roomTopLeft.y } + standoff, Point { roomTopLeft.x, bottomRight.y } - standoff, nRid, HallDirection::Right, {});
CreateRoom(Point { roomBottomRight.x, topLeft.y } + standoff, Point { bottomRight.x, roomBottomRight.y } - standoff, nRid, 4, {}); CreateRoom(Point { roomBottomRight.x, topLeft.y } + standoff, Point { bottomRight.x, roomBottomRight.y } - standoff, nRid, HallDirection::Left, {});
} }
} }
@ -1841,49 +1855,49 @@ void ConnectHall(const HallNode &node)
Point beginning = node.beginning; Point beginning = node.beginning;
Point end = node.end; Point end = node.end;
int fMinusFlag = GenerateRnd(100); bool fMinusFlag = GenerateRnd(100) < 50;
int fPlusFlag = GenerateRnd(100); bool fPlusFlag = GenerateRnd(100) < 50;
CreateDoorType(beginning); CreateDoorType(beginning);
CreateDoorType(end); CreateDoorType(end);
int nCurrd = node.nHalldir; HallDirection nCurrd = node.direction;
end -= DirAdd[nCurrd]; end -= DirAdd[static_cast<uint8_t>(nCurrd)];
predungeon[end.x][end.y] = ','; predungeon[end.x][end.y] = ',';
bool fInroom = false; bool fInroom = false;
do { do {
if (beginning.x >= 38 && nCurrd == 2) if (beginning.x >= 38 && nCurrd == HallDirection::Right)
nCurrd = 4; nCurrd = HallDirection::Left;
if (beginning.y >= 38 && nCurrd == 3) if (beginning.y >= 38 && nCurrd == HallDirection::Down)
nCurrd = 1; nCurrd = HallDirection::Up;
if (beginning.x <= 1 && nCurrd == 4) if (beginning.x <= 1 && nCurrd == HallDirection::Left)
nCurrd = 2; nCurrd = HallDirection::Right;
if (beginning.y <= 1 && nCurrd == 1) if (beginning.y <= 1 && nCurrd == HallDirection::Up)
nCurrd = 3; nCurrd = HallDirection::Down;
if (predungeon[beginning.x][beginning.y] == 'C' && (nCurrd == 1 || nCurrd == 4)) if (predungeon[beginning.x][beginning.y] == 'C' && IsAnyOf(nCurrd, HallDirection::Up, HallDirection::Left))
nCurrd = 2; nCurrd = HallDirection::Right;
if (predungeon[beginning.x][beginning.y] == 'B' && (nCurrd == 1 || nCurrd == 2)) if (predungeon[beginning.x][beginning.y] == 'B' && IsAnyOf(nCurrd, HallDirection::Up, HallDirection::Right))
nCurrd = 3; nCurrd = HallDirection::Down;
if (predungeon[beginning.x][beginning.y] == 'E' && (nCurrd == 4 || nCurrd == 3)) if (predungeon[beginning.x][beginning.y] == 'E' && IsAnyOf(nCurrd, HallDirection::Left, HallDirection::Down))
nCurrd = 1; nCurrd = HallDirection::Up;
if (predungeon[beginning.x][beginning.y] == 'A' && (nCurrd == 2 || nCurrd == 3)) if (predungeon[beginning.x][beginning.y] == 'A' && IsAnyOf(nCurrd, HallDirection::Right, HallDirection::Down))
nCurrd = 4; nCurrd = HallDirection::Left;
beginning += DirAdd[nCurrd]; beginning += DirAdd[static_cast<uint8_t>(nCurrd)];
if (predungeon[beginning.x][beginning.y] == ' ') { if (predungeon[beginning.x][beginning.y] == ' ') {
if (fInroom) { if (fInroom) {
CreateDoorType(beginning - DirAdd[nCurrd]); CreateDoorType(beginning - DirAdd[static_cast<uint8_t>(nCurrd)]);
fInroom = false; fInroom = false;
} else { } else {
if (fMinusFlag < 50) { if (fMinusFlag) {
if (nCurrd != 1 && nCurrd != 3) if (IsNoneOf(nCurrd, HallDirection::Up, HallDirection::Down))
PlaceHallExt(beginning + Displacement { 0, -1 }); PlaceHallExt(beginning + Displacement { 0, -1 }); // Up
else else
PlaceHallExt(beginning + Displacement { -1, 0 }); PlaceHallExt(beginning + Displacement { -1, 0 }); // Left
} }
if (fPlusFlag < 50) { if (fPlusFlag) {
if (nCurrd != 1 && nCurrd != 3) if (IsNoneOf(nCurrd, HallDirection::Up, HallDirection::Down))
PlaceHallExt(beginning + Displacement { 0, 1 }); PlaceHallExt(beginning + Displacement { 0, 1 }); // Down
else else
PlaceHallExt(beginning + Displacement { 1, 0 }); PlaceHallExt(beginning + Displacement { 1, 0 }); // Right
} }
} }
predungeon[beginning.x][beginning.y] = ','; predungeon[beginning.x][beginning.y] = ',';
@ -1899,54 +1913,54 @@ void ConnectHall(const HallNode &node)
int nRp = std::min(2 * nDx, 30); int nRp = std::min(2 * nDx, 30);
if (GenerateRnd(100) < nRp) { if (GenerateRnd(100) < nRp) {
if (end.x <= beginning.x || beginning.x >= DMAXX) if (end.x <= beginning.x || beginning.x >= DMAXX)
nCurrd = 4; nCurrd = HallDirection::Left;
else else
nCurrd = 2; nCurrd = HallDirection::Right;
} }
} else { } else {
int nRp = std::min(5 * nDy, 80); int nRp = std::min(5 * nDy, 80);
if (GenerateRnd(100) < nRp) { if (GenerateRnd(100) < nRp) {
if (end.y <= beginning.y || beginning.y >= DMAXY) if (end.y <= beginning.y || beginning.y >= DMAXY)
nCurrd = 1; nCurrd = HallDirection::Up;
else else
nCurrd = 3; nCurrd = HallDirection::Down;
} }
} }
if (nDy < 10 && beginning.x == end.x && (nCurrd == 2 || nCurrd == 4)) { if (nDy < 10 && beginning.x == end.x && IsAnyOf(nCurrd, HallDirection::Right, HallDirection::Left)) {
if (end.y <= beginning.y || beginning.y >= DMAXY) if (end.y <= beginning.y || beginning.y >= DMAXY)
nCurrd = 1; nCurrd = HallDirection::Up;
else else
nCurrd = 3; nCurrd = HallDirection::Down;
} }
if (nDx < 10 && beginning.y == end.y && (nCurrd == 1 || nCurrd == 3)) { if (nDx < 10 && beginning.y == end.y && IsAnyOf(nCurrd, HallDirection::Up, HallDirection::Down)) {
if (end.x <= beginning.x || beginning.x >= DMAXX) if (end.x <= beginning.x || beginning.x >= DMAXX)
nCurrd = 4; nCurrd = HallDirection::Left;
else else
nCurrd = 2; nCurrd = HallDirection::Right;
} }
if (nDy == 1 && nDx > 1 && (nCurrd == 1 || nCurrd == 3)) { if (nDy == 1 && nDx > 1 && IsAnyOf(nCurrd, HallDirection::Up, HallDirection::Down)) {
if (end.x <= beginning.x || beginning.x >= DMAXX) if (end.x <= beginning.x || beginning.x >= DMAXX)
nCurrd = 4; nCurrd = HallDirection::Left;
else else
nCurrd = 2; nCurrd = HallDirection::Right;
} }
if (nDx == 1 && nDy > 1 && (nCurrd == 2 || nCurrd == 4)) { if (nDx == 1 && nDy > 1 && IsAnyOf(nCurrd, HallDirection::Right, HallDirection::Left)) {
if (end.y <= beginning.y || beginning.x >= DMAXX) if (end.y <= beginning.y || beginning.x >= DMAXX)
nCurrd = 1; nCurrd = HallDirection::Up;
else else
nCurrd = 3; nCurrd = HallDirection::Down;
} }
if (nDx == 0 && predungeon[beginning.x][beginning.y] != ' ' && (nCurrd == 2 || nCurrd == 4)) { if (nDx == 0 && predungeon[beginning.x][beginning.y] != ' ' && IsAnyOf(nCurrd, HallDirection::Right, HallDirection::Left)) {
if (end.x <= node.beginning.x || beginning.x >= DMAXX) if (end.x <= node.beginning.x || beginning.x >= DMAXX)
nCurrd = 1; nCurrd = HallDirection::Up;
else else
nCurrd = 3; nCurrd = HallDirection::Down;
} }
if (nDy == 0 && predungeon[beginning.x][beginning.y] != ' ' && (nCurrd == 1 || nCurrd == 3)) { if (nDy == 0 && predungeon[beginning.x][beginning.y] != ' ' && IsAnyOf(nCurrd, HallDirection::Up, HallDirection::Down)) {
if (end.y <= node.beginning.y || beginning.y >= DMAXY) if (end.y <= node.beginning.y || beginning.y >= DMAXY)
nCurrd = 4; nCurrd = HallDirection::Left;
else else
nCurrd = 2; nCurrd = HallDirection::Right;
} }
} while (beginning != end); } while (beginning != end);
} }
@ -2430,7 +2444,7 @@ bool CreateDungeon()
break; break;
} }
CreateRoom({ 2, 2 }, { DMAXX - 1, DMAXY - 1 }, 0, 0, size); CreateRoom({ 2, 2 }, { DMAXX - 1, DMAXY - 1 }, 0, HallDirection::None, size);
while (!HallList.empty()) { while (!HallList.empty()) {
ConnectHall(HallList.front()); ConnectHall(HallList.front());

Write Preview
Loading…
Cancel
Save