diff --git a/Source/objects.cpp b/Source/objects.cpp index 349496777..f8b082bf8 100644 --- a/Source/objects.cpp +++ b/Source/objects.cpp @@ -857,7 +857,7 @@ void AddNakrulBook(int a1, int a2, int a3) void AddNakrulGate() { - AddNakrulLeaver(); + AddObject(OBJ_L5LEVER, { UberRow + 3, UberCol - 1 }); switch (GenerateRnd(6)) { case 0: AddNakrulBook(6, UberRow + 3, UberCol); @@ -5627,24 +5627,4 @@ void SyncNakrulRoom() SetDungeonMicros(); } -void AddNakrulLeaver() -{ - while (true) { - int xp = GenerateRnd(80) + 16; - int yp = GenerateRnd(80) + 16; - if (RndLocOk(xp - 1, yp - 1) - && RndLocOk(xp, yp - 1) - && RndLocOk(xp + 1, yp - 1) - && RndLocOk(xp - 1, yp) - && RndLocOk(xp, yp) - && RndLocOk(xp + 1, yp) - && RndLocOk(xp - 1, yp + 1) - && RndLocOk(xp, yp + 1) - && RndLocOk(xp + 1, yp + 1)) { - break; - } - } - AddObject(OBJ_L5LEVER, { UberRow + 3, UberCol - 1 }); -} - } // namespace devilution diff --git a/Source/objects.h b/Source/objects.h index 39aea8a79..19624bcec 100644 --- a/Source/objects.h +++ b/Source/objects.h @@ -318,6 +318,5 @@ void SyncObjectAnim(Object &object); void GetObjectStr(const Object &object); void OperateNakrulLever(); void SyncNakrulRoom(); -void AddNakrulLeaver(); } // namespace devilution