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

Convert dflags to boolean

pull/4529/head
Anders Jenbo 4 years ago
parent
5c17c92b01
commit
afec954c9a
7 changed files with 72 additions and 95 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      Source/debug.cpp
  2. 74
      Source/drlg_l1.cpp
  3. 18
      Source/drlg_l2.cpp
  4. 18
      Source/drlg_l3.cpp
  5. 26
      Source/drlg_l4.cpp
  6. 2
      Source/gendung.cpp
  7. 19
      Source/gendung.h

10
Source/debug.cpp
Unescape View File

@ -73,7 +73,7 @@ enum class DebugGridTextItem : uint16_t {
AutomapView,
dungeon,
pdungeon,
dflags,
Protected,
};
DebugGridTextItem SelectedDebugGridTextItem;
@ -854,7 +854,7 @@ std::string DebugCmdShowTileData(const string_view parameter)
"AutomapView",
"dungeon",
"pdungeon",
"dflags",
"Protected",
};
if (parameter == "clear") {
@ -1071,7 +1071,7 @@ bool IsDebugGridInMegatiles()
case DebugGridTextItem::AutomapView:
case DebugGridTextItem::dungeon:
case DebugGridTextItem::pdungeon:
case DebugGridTextItem::dflags:
case DebugGridTextItem::Protected:
return true;
default:
return false;
@ -1156,8 +1156,8 @@ bool GetDebugGridText(Point dungeonCoords, char *debugGridTextBuffer)
case DebugGridTextItem::pdungeon:
info = pdungeon[megaCoords.x][megaCoords.y];
break;
case DebugGridTextItem::dflags:
info = dflags[megaCoords.x][megaCoords.y];
case DebugGridTextItem::Protected:
info = Protected[megaCoords.x][megaCoords.y];
break;
case DebugGridTextItem::None:
return false;

74
Source/drlg_l1.cpp
Unescape View File

@ -24,7 +24,8 @@ namespace {
/** Represents a tile ID map of twice the size, repeating each tile of the original map in blocks of 4. */
BYTE L5dungeon[80][80];
uint8_t L5dflags[DMAXX][DMAXY];
/** Marks where walls may not be added to the level */
bool Chamber[DMAXX][DMAXX];
/** Specifies whether a single player quest DUN has been loaded. */
bool L5setloadflag;
/** Specifies whether to generate a horizontal room at position 1 in the Cathedral. */
@ -691,13 +692,13 @@ void ApplyShadowsPatterns()
if (shadow.s3 != 0 && shadow.s3 != sd[1][0])
continue;
if (shadow.nv1 != 0 && L5dflags[x - 1][y - 1] == 0) {
if (shadow.nv1 != 0 && !Protected[x - 1][y - 1]) {
dungeon[x - 1][y - 1] = shadow.nv1;
}
if (shadow.nv2 != 0 && L5dflags[x][y - 1] == 0) {
if (shadow.nv2 != 0 && !Protected[x][y - 1]) {
dungeon[x][y - 1] = shadow.nv2;
}
if (shadow.nv3 != 0 && L5dflags[x - 1][y] == 0) {
if (shadow.nv3 != 0 && !Protected[x - 1][y]) {
dungeon[x - 1][y] = shadow.nv3;
}
}
@ -706,21 +707,21 @@ void ApplyShadowsPatterns()
for (int y = 1; y < DMAXY; y++) {
for (int x = 1; x < DMAXX; x++) {
if (dungeon[x - 1][y] == 139 && L5dflags[x - 1][y] == 0) {
if (dungeon[x - 1][y] == 139 && !Protected[x - 1][y]) {
uint8_t tnv3 = 139;
if (IsAnyOf(dungeon[x][y], 29, 32, 35, 37, 38, 39)) {
tnv3 = 141;
}
dungeon[x - 1][y] = tnv3;
}
if (dungeon[x - 1][y] == 149 && L5dflags[x - 1][y] == 0) {
if (dungeon[x - 1][y] == 149 && !Protected[x - 1][y]) {
uint8_t tnv3 = 149;
if (IsAnyOf(dungeon[x][y], 29, 32, 35, 37, 38, 39)) {
tnv3 = 153;
}
dungeon[x - 1][y] = tnv3;
}
if (dungeon[x - 1][y] == 148 && L5dflags[x - 1][y] == 0) {
if (dungeon[x - 1][y] == 148 && !Protected[x - 1][y]) {
uint8_t tnv3 = 148;
if (IsAnyOf(dungeon[x][y], 29, 32, 35, 37, 38, 39)) {
tnv3 = 154;
@ -786,7 +787,7 @@ bool PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, int cy, bool
for (int xx = 0; xx < sw && abort; xx++) {
if (miniset[ii] != 0 && dungeon[xx + sx][sy + yy] != miniset[ii])
abort = false;
if (L5dflags[xx + sx][sy + yy] != 0)
if (Protected[xx + sx][sy + yy])
abort = false;
ii++;
}
@ -848,16 +849,14 @@ void PlaceMiniSetRandom(const BYTE *miniset, int rndper)
if (miniset[ii] != 0 && dungeon[xx + sx][yy + sy] != miniset[ii]) {
found = false;
}
if (dflags[xx + sx][yy + sy] != 0) {
found = false;
}
// BUGFIX: Check if tile is Protected (fixing this breaks crypt levels)
ii++;
}
}
int kk = sw * sh + 2;
if (miniset[kk] >= 84 && miniset[kk] <= 100 && found) {
// BUGFIX: accesses to dungeon can go out of bounds (fixed)
// BUGFIX: Comparisons vs 100 should use same tile as comparisons vs 84 - NOT A BUG - "fixing" this breaks crypt
// BUGFIX: Comparisons vs 100 should use same tile as comparisons vs 84 (fixing this breaks crypt levels)
constexpr auto ComparisonWithBoundsCheck = [](Point p1, Point p2) {
return (p1.x >= 0 && p1.x < DMAXX && p1.y >= 0 && p1.y < DMAXY) && (p2.x >= 0 && p2.x < DMAXX && p2.y >= 0 && p2.y < DMAXY) && (dungeon[p1.x][p1.y] >= 84 && dungeon[p2.x][p2.y] <= 100);
@ -893,7 +892,7 @@ void FillFloor()
{
for (int j = 0; j < DMAXY; j++) {
for (int i = 0; i < DMAXX; i++) {
if (L5dflags[i][j] == 0 && dungeon[i][j] == CathedralTile::Floor) {
if (!Protected[i][j] && dungeon[i][j] == CathedralTile::Floor) {
int rv = GenerateRnd(3);
if (rv == 1)
@ -956,16 +955,8 @@ void InitDungeonFlags()
for (int j = 0; j < DMAXY; j++) {
for (int i = 0; i < DMAXX; i++) {
dungeon[i][j] = 0;
L5dflags[i][j] = 0;
}
}
}
void ClearFlags()
{
for (int j = 0; j < DMAXY; j++) {
for (int i = 0; i < DMAXX; i++) { // NOLINT(modernize-loop-convert)
L5dflags[i][j] &= ~DLRG_CHAMBER;
Protected[i][j] = false;
Chamber[i][j] = false;
}
}
}
@ -1193,7 +1184,7 @@ int HorizontalWallOk(int i, int j)
{
int x;
for (x = 1; dungeon[i + x][j] == 13; x++) {
if (dungeon[i + x][j - 1] != 13 || dungeon[i + x][j + 1] != 13 || L5dflags[i + x][j] != 0)
if (dungeon[i + x][j - 1] != 13 || dungeon[i + x][j + 1] != 13 || Protected[i + x][j] || Chamber[i + x][j])
break;
}
@ -1217,7 +1208,7 @@ int VerticalWallOk(int i, int j)
{
int y;
for (y = 1; dungeon[i][j + y] == 13; y++) {
if (dungeon[i - 1][j + y] != 13 || dungeon[i + 1][j + y] != 13 || L5dflags[i][j + y] != 0)
if (dungeon[i - 1][j + y] != 13 || dungeon[i + 1][j + y] != 13 || Protected[i][j + y] || Chamber[i][j + y])
break;
}
@ -1275,7 +1266,7 @@ void HorizontalWall(int i, int j, CathedralTile p, int dx)
dungeon[i + xx][j] = wt;
if (wt == CathedralTile::HDoor) {
L5dflags[i + xx][j] |= DLRG_PROTECTED;
Protected[i + xx][j] = true;
}
}
@ -1317,7 +1308,7 @@ void VerticalWall(int i, int j, CathedralTile p, int dy)
dungeon[i][j + yy] = wt;
if (wt == CathedralTile::VDoor) {
L5dflags[i][j + yy] |= DLRG_PROTECTED;
Protected[i][j + yy] = true;
}
}
@ -1325,7 +1316,7 @@ void AddWall()
{
for (int j = 0; j < DMAXY; j++) {
for (int i = 0; i < DMAXX; i++) {
if (L5dflags[i][j] == 0) {
if (!Protected[i][j] && !Chamber[i][j]) {
if (dungeon[i][j] == CathedralTile::Corner) {
AdvanceRndSeed();
int x = HorizontalWallOk(i, j);
@ -1419,7 +1410,7 @@ void GenerateChamber(int sx, int sy, bool topflag, bool bottomflag, bool leftfla
for (int j = 1; j < 11; j++) {
for (int i = 1; i < 11; i++) {
dungeon[i + sx][j + sy] = CathedralTile::Floor;
L5dflags[i + sx][j + sy] |= DLRG_CHAMBER;
Chamber[i + sx][j + sy] = true;
}
}
@ -1582,7 +1573,7 @@ void SetCornerRoom(int rx1, int ry1)
for (int i = 0; i < rw; i++) {
if (CornerstoneRoomPattern[sp] != 0) {
dungeon[rx1 + i][ry1 + j] = CornerstoneRoomPattern[sp];
L5dflags[rx1 + i][ry1 + j] |= DLRG_PROTECTED;
Protected[rx1 + i][ry1 + j] = true;
} else {
dungeon[rx1 + i][ry1 + j] = CathedralTile::Floor;
}
@ -1597,7 +1588,7 @@ void Substitution()
for (int x = 0; x < DMAXX; x++) {
if (GenerateRnd(4) == 0) {
uint8_t c = L5BTYPES[dungeon[x][y]];
if (c != 0 && L5dflags[x][y] == 0) {
if (c != 0 && !Protected[x][y]) {
int rv = GenerateRnd(16);
int i = -1;
while (rv >= 0) {
@ -1612,14 +1603,14 @@ void Substitution()
// BUGFIX: Add `&& y > 0` to the if statement. (fixed)
if (i == 89 && y > 0) {
if (L5BTYPES[dungeon[x][y - 1]] != 79 || L5dflags[x][y - 1] != 0)
if (L5BTYPES[dungeon[x][y - 1]] != 79 || Protected[x][y - 1])
i = 79;
else
dungeon[x][y - 1] = 90;
}
// BUGFIX: Add `&& x + 1 < DMAXX` to the if statement. (fixed)
if (i == 91 && x + 1 < DMAXX) {
if (L5BTYPES[dungeon[x + 1][y]] != 80 || L5dflags[x + 1][y] != 0)
if (L5BTYPES[dungeon[x + 1][y]] != 80 || Protected[x + 1][y])
i = 80;
else
dungeon[x + 1][y] = 92;
@ -1648,7 +1639,7 @@ void SetRoom(int rx1, int ry1)
auto tileId = static_cast<uint8_t>(SDL_SwapLE16(tileLayer[j * width + i]));
if (tileId != 0) {
dungeon[rx1 + i][ry1 + j] = tileId;
L5dflags[rx1 + i][ry1 + j] |= DLRG_PROTECTED;
Protected[rx1 + i][ry1 + j] = true;
} else {
dungeon[rx1 + i][ry1 + j] = CathedralTile::Floor;
}
@ -1676,7 +1667,7 @@ void SetCryptRoom(int rx1, int ry1)
for (int i = 0; i < rw; i++) {
if (UberRoomPattern[sp] != 0) {
dungeon[rx1 + i][ry1 + j] = UberRoomPattern[sp];
L5dflags[rx1 + i][ry1 + j] |= DLRG_PROTECTED;
Protected[rx1 + i][ry1 + j] = true;
} else {
dungeon[rx1 + i][ry1 + j] = CathedralTile::Floor;
}
@ -1988,9 +1979,9 @@ void FixCornerTiles()
{
for (int j = 1; j < DMAXY - 1; j++) {
for (int i = 1; i < DMAXX - 1; i++) {
if ((L5dflags[i][j] & DLRG_PROTECTED) == 0 && dungeon[i][j] == 17 && dungeon[i - 1][j] == CathedralTile::Floor && dungeon[i][j - 1] == CathedralTile::VWall) {
if (!Protected[i][j] && dungeon[i][j] == 17 && dungeon[i - 1][j] == CathedralTile::Floor && dungeon[i][j - 1] == CathedralTile::VWall) {
dungeon[i][j] = 16;
L5dflags[i][j - 1] &= DLRG_PROTECTED;
// BUGFIX: Set tile as Protected
}
if (dungeon[i][j] == 202 && dungeon[i + 1][j] == CathedralTile::Floor && dungeon[i][j + 1] == CathedralTile::VWall) {
dungeon[i][j] = 8;
@ -2212,7 +2203,6 @@ void GenerateLevel(lvl_entry entry)
FillChambers();
FixTilesPatterns();
AddWall();
ClearFlags();
FloodTransparencyValues(13);
if (PlaceStairs(entry))
break;
@ -2317,7 +2307,7 @@ void LoadL1Dungeon(const char *path, int vx, int vy)
for (int j = 0; j < DMAXY; j++) {
for (int i = 0; i < DMAXX; i++) {
dungeon[i][j] = 22;
L5dflags[i][j] = 0;
Protected[i][j] = false;
}
}
@ -2334,7 +2324,7 @@ void LoadL1Dungeon(const char *path, int vx, int vy)
tileLayer++;
if (tileId != 0) {
dungeon[i][j] = tileId;
L5dflags[i][j] |= DLRG_PROTECTED;
Protected[i][j] = true;
} else {
dungeon[i][j] = CathedralTile::Floor;
}
@ -2360,7 +2350,7 @@ void LoadPreL1Dungeon(const char *path)
for (int j = 0; j < DMAXY; j++) {
for (int i = 0; i < DMAXX; i++) {
dungeon[i][j] = 22;
L5dflags[i][j] = 0;
Protected[i][j] = false;
}
}
@ -2380,7 +2370,7 @@ void LoadPreL1Dungeon(const char *path)
tileLayer++;
if (tileId != 0) {
dungeon[i][j] = tileId;
L5dflags[i][j] |= DLRG_PROTECTED;
Protected[i][j] = true;
} else {
dungeon[i][j] = CathedralTile::Floor;
}

18
Source/drlg_l2.cpp
Unescape View File

@ -1790,7 +1790,7 @@ void InitDungeonFlags()
for (int j = 0; j < DMAXY; j++) {
for (int i = 0; i < DMAXX; i++) {
predungeon[i][j] = 32;
dflags[i][j] = 0;
Protected[i][j] = false;
}
}
}
@ -1829,7 +1829,7 @@ void DefineRoom(int nX1, int nY1, int nX2, int nY2, bool forceHW)
for (int i = nX1; i < nX2; i++) {
/// BUGFIX: Should loop j between nY1 and nY2 instead of always using nY1.
while (i < nY2) {
dflags[i][nY1] |= DLRG_PROTECTED;
Protected[i][nY1] = true;
i++;
}
}
@ -2315,7 +2315,7 @@ void SetRoom(int rx1, int ry1)
auto tileId = static_cast<uint8_t>(SDL_SwapLE16(tileLayer[j * width + i]));
if (tileId != 0) {
dungeon[rx1 + i][ry1 + j] = tileId;
dflags[rx1 + i][ry1 + j] |= DLRG_PROTECTED;
Protected[rx1 + i][ry1 + j] = true;
} else {
dungeon[rx1 + i][ry1 + j] = 3;
}
@ -2800,7 +2800,7 @@ void FixLockout()
}
for (int j = 1; j < DMAXY - 1; j++) {
for (int i = 1; i < DMAXX - 1; i++) {
if ((dflags[i][j] & DLRG_PROTECTED) != 0) {
if (Protected[i][j]) {
continue;
}
if ((dungeon[i][j] == 2 || dungeon[i][j] == 5) && dungeon[i][j - 1] == 3 && dungeon[i][j + 1] == 3) {
@ -2817,7 +2817,7 @@ void FixLockout()
}
i++;
}
if (!doorok && (dflags[i - 1][j] & DLRG_PROTECTED) == 0) {
if (!doorok && !Protected[i - 1][j]) {
dungeon[i - 1][j] = 5;
}
}
@ -2825,7 +2825,7 @@ void FixLockout()
}
for (int j = 1; j < DMAXX - 1; j++) { /* check: might be flipped */
for (int i = 1; i < DMAXY - 1; i++) {
if ((dflags[j][i] & DLRG_PROTECTED) != 0) {
if (Protected[j][i]) {
continue;
}
if ((dungeon[j][i] == 1 || dungeon[j][i] == 4) && dungeon[j - 1][i] == 3 && dungeon[j + 1][i] == 3) {
@ -2842,7 +2842,7 @@ void FixLockout()
}
i++;
}
if (!doorok && (dflags[j][i - 1] & DLRG_PROTECTED) == 0) {
if (!doorok && !Protected[j][i - 1]) {
dungeon[j][i - 1] = 4;
}
}
@ -3042,7 +3042,7 @@ void LoadDungeonData(const uint16_t *dunData)
for (int j = 0; j < DMAXY; j++) {
for (int i = 0; i < DMAXX; i++) {
dungeon[i][j] = 12;
dflags[i][j] = 0;
Protected[i][j] = false;
}
}
@ -3057,7 +3057,7 @@ void LoadDungeonData(const uint16_t *dunData)
tileLayer++;
if (tileId != 0) {
dungeon[i][j] = tileId;
dflags[i][j] |= DLRG_PROTECTED;
Protected[i][j] = true;
} else {
dungeon[i][j] = 3;
}

18
Source/drlg_l3.cpp
Unescape View File

@ -843,13 +843,7 @@ const BYTE HivePattern42[] = {
void InitDungeonFlags()
{
memset(dungeon, 0, sizeof(dungeon));
for (int j = 0; j < DMAXY; j++) {
for (int i = 0; i < DMAXX; i++) {
dungeon[i][j] = 0;
dflags[i][j] = 0;
}
}
memset(Protected, 0, sizeof(Protected));
}
bool FillRoom(int x1, int y1, int x2, int y2)
@ -1531,7 +1525,7 @@ bool HivePlaceSetRandom(const BYTE *miniset, int rndper)
if (miniset[ii] != 0 && dungeon[xx + sx][yy + sy] != miniset[ii]) {
found = false;
}
if (dflags[xx + sx][yy + sy] != 0) {
if (Protected[xx + sx][yy + sy]) {
found = false;
}
ii++;
@ -1717,7 +1711,7 @@ bool PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, int cy, bool
for (int xx = 0; xx < sw && abort; xx++) {
if (miniset[ii] != 0 && dungeon[xx + sx][yy + sy] != miniset[ii])
abort = false;
if (dflags[xx + sx][yy + sy] != 0)
if (Protected[xx + sx][yy + sy])
abort = false;
ii++;
}
@ -1770,7 +1764,7 @@ void PlaceMiniSetRandom(const BYTE *miniset, int rndper)
if (miniset[ii] != 0 && dungeon[xx + sx][yy + sy] != miniset[ii]) {
found = false;
}
if (dflags[xx + sx][yy + sy] != 0) {
if (Protected[xx + sx][yy + sy]) {
found = false;
}
ii++;
@ -2123,7 +2117,7 @@ bool PlaceAnvil()
if (L3ANVIL[ii] != 0 && dungeon[xx + sx][yy + sy] != L3ANVIL[ii]) {
found = false;
}
if (dflags[xx + sx][yy + sy] != 0) {
if (Protected[xx + sx][yy + sy]) {
found = false;
}
ii++;
@ -2150,7 +2144,7 @@ bool PlaceAnvil()
if (L3ANVIL[ii] != 0) {
dungeon[xx + sx][yy + sy] = L3ANVIL[ii];
}
dflags[xx + sx][yy + sy] |= DLRG_PROTECTED;
Protected[xx + sx][yy + sy] = true;
ii++;
}
}

26
Source/drlg_l4.cpp
Unescape View File

@ -220,7 +220,7 @@ bool PlaceMiniSet(const Miniset &miniset, int tmin, int tmax, int cx, int cy, bo
return false;
}
miniset.place({ sx, sy }, 8);
miniset.place({ sx, sy }, true);
}
if (currlevel == 15 && Quests[Q_BETRAYER]._qactive >= QUEST_ACTIVE) { /// Lazarus staff skip bug fixed
@ -259,7 +259,7 @@ void InitDungeonFlags()
for (int j = 0; j < DMAXY; j++) {
for (int i = 0; i < DMAXX; i++) {
dungeon[i][j] = 30;
dflags[i][j] = 0;
Protected[i][j] = false;
}
}
}
@ -276,7 +276,7 @@ void SetRoom(const uint16_t *dunData, int rx1, int ry1)
auto tileId = static_cast<uint8_t>(SDL_SwapLE16(tileLayer[j * width + i]));
if (tileId != 0) {
dungeon[i + rx1][j + ry1] = tileId;
dflags[i + rx1][j + ry1] |= DLRG_PROTECTED;
Protected[i + rx1][j + ry1] = true;
} else {
dungeon[i + rx1][j + ry1] = 6;
}
@ -490,7 +490,7 @@ int HorizontalWallOk(int i, int j)
{
int x;
for (x = 1; dungeon[i + x][j] == 6; x++) {
if (dflags[i + x][j] != 0) {
if (Protected[i + x][j]) {
break;
}
if (dungeon[i + x][j - 1] != 6) {
@ -511,7 +511,7 @@ int VerticalWallOk(int i, int j)
{
int y;
for (y = 1; dungeon[i][j + y] == 6; y++) {
if (dflags[i][j + y] != 0) {
if (Protected[i][j + y]) {
break;
}
if (dungeon[i - 1][j + y] != 6) {
@ -619,7 +619,7 @@ void AddWall()
{
for (int j = 0; j < DMAXY; j++) {
for (int i = 0; i < DMAXX; i++) {
if (dflags[i][j] != 0) {
if (Protected[i][j]) {
continue;
}
for (auto d : { 10, 12, 13, 15, 16, 21, 22 }) {
@ -999,7 +999,7 @@ void Substitution()
for (int x = 0; x < DMAXX; x++) {
if (GenerateRnd(3) == 0) {
uint8_t c = L4BTYPES[dungeon[x][y]];
if (c != 0 && dflags[x][y] == 0) {
if (c != 0 && !Protected[x][y]) {
int rv = GenerateRnd(16);
int i = -1;
while (rv >= 0) {
@ -1022,7 +1022,7 @@ void Substitution()
int rv = GenerateRnd(10);
if (rv == 0) {
uint8_t c = dungeon[x][y];
if (L4BTYPES[c] == 6 && dflags[x][y] == 0) {
if (L4BTYPES[c] == 6 && !Protected[x][y]) {
dungeon[x][y] = GenerateRnd(3) + 95;
}
}
@ -1131,10 +1131,10 @@ void SaveQuads()
for (int j = 0; j < 14; j++) {
for (int i = 0; i < 14; i++) {
dflags[i + x][j + y] = 1;
dflags[DMAXX - 1 - i - x][j + y] = 1;
dflags[i + x][DMAXY - 1 - j - y] = 1;
dflags[DMAXX - 1 - i - x][DMAXY - 1 - j - y] = 1;
Protected[i + x][j + y] = true;
Protected[DMAXX - 1 - i - x][j + y] = true;
Protected[i + x][DMAXY - 1 - j - y] = true;
Protected[DMAXX - 1 - i - x][DMAXY - 1 - j - y] = true;
}
}
}
@ -1348,7 +1348,7 @@ void GenerateLevel(lvl_entry entry)
if (Quests[Q_WARLORD].IsAvailable() || (currlevel == Quests[Q_BETRAYER]._qlevel && gbIsMultiplayer)) {
for (int spi = SP4x1; spi < SP4x2; spi++) {
for (int spj = SP4y1; spj < SP4y2; spj++) {
dflags[spi][spj] = 1;
Protected[spi][spj] = true;
}
}
}

2
Source/gendung.cpp
Unescape View File

@ -22,7 +22,7 @@ namespace devilution {
uint8_t dungeon[DMAXX][DMAXY];
uint8_t pdungeon[DMAXX][DMAXY];
uint8_t dflags[DMAXX][DMAXY];
bool Protected[DMAXX][DMAXY];
int setpc_x;
int setpc_y;
int setpc_w;

19
Source/gendung.h
Unescape View File

@ -62,15 +62,6 @@ enum lvl_entry : uint8_t {
ENTRY_TWARPUP,
};
enum {
// clang-format off
DLRG_HDOOR = 1 << 0,
DLRG_VDOOR = 1 << 1,
DLRG_CHAMBER = 1 << 6,
DLRG_PROTECTED = 1 << 7,
// clang-format on
};
enum class DungeonFlag : uint8_t {
// clang-format off
None = 0, // Only used by lighting/automap
@ -137,7 +128,8 @@ struct ShadowStruct {
extern DVL_API_FOR_TEST uint8_t dungeon[DMAXX][DMAXY];
/** Contains a backup of the tile IDs of the map. */
extern uint8_t pdungeon[DMAXX][DMAXY];
extern uint8_t dflags[DMAXX][DMAXY];
/** Tile that may not be overwritten by the level generator */
extern bool Protected[DMAXX][DMAXY];
/** Specifies the active set level X-coordinate of the map. */
extern int setpc_x;
/** Specifies the active set level Y-coordinate of the map. */
@ -309,21 +301,22 @@ struct Miniset {
for (int xx = 0; xx < size.width; xx++) {
if (search[yy][xx] != 0 && dungeon[xx + position.x][yy + position.y] != search[yy][xx])
return false;
if (dflags[xx + position.x][yy + position.y] != 0)
if (Protected[xx + position.x][yy + position.y])
return false;
}
}
return true;
}
void place(Point position, unsigned char extraFlags = 0) const
void place(Point position, bool protect = false) const
{
for (int y = 0; y < size.height; y++) {
for (int x = 0; x < size.width; x++) {
if (replace[y][x] == 0)
continue;
dungeon[x + position.x][y + position.y] = replace[y][x];
dflags[x + position.x][y + position.y] |= extraFlags;
if (protect)
Protected[x + position.x][y + position.y] = true;
}
}
}

Write Preview
Loading…
Cancel
Save