Revise

diasurgical · Nov 16, 2024 · 1f56d9f · 1f56d9f
1 parent 21dd2f6
commit 1f56d9f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/Source/diablo.cpp b/Source/diablo.cpp
@@ -1440,7 +1440,10 @@ void GameLogic()
 	}
 	if (leveltype != DTYPE_TOWN) {
 		gGameLogicStep = GameLogicStep::ProcessMonsters;
-		ProcessMonsters();
+#ifdef _DEBUG
+		if (!DebugInvisible)
+#endif
+			ProcessMonsters();
 		gGameLogicStep = GameLogicStep::ProcessObjects;
 		ProcessObjects();
 		gGameLogicStep = GameLogicStep::ProcessMissiles;

diff --git a/Source/levels/gendung.cpp b/Source/levels/gendung.cpp
@@ -28,10 +28,6 @@
 #include "utils/log.hpp"
 #include "utils/status_macros.hpp"
 
-#ifdef _DEBUG
-#include "debug.h"
-#endif
-
 namespace devilution {
 
 Bitset2d<DMAXX, DMAXY> DungeonMask;
@@ -377,15 +373,6 @@ void InitGlobals()
 
 } // namespace
 
-bool IsTileVisible(Point position)
-{
-	return InDungeonBounds(position) && HasAnyOf(dFlags[position.x][position.y], DungeonFlag::Visible)
-#ifdef _DEBUG
-	    && !DebugInvisible
-#endif
-	    ;
-}
-
 #ifdef BUILD_TESTING
 std::optional<WorldTileSize> GetSizeForThemeRoom()
 {

diff --git a/Source/levels/gendung.h b/Source/levels/gendung.h
@@ -268,7 +268,10 @@ constexpr bool TileContainsSetPiece(Point position)
  * @param position Coordinates of the dungeon tile to check
  * @return true if the tile is within at least one players vision
  */
-bool IsTileVisible(Point position);
+constexpr bool IsTileVisible(Point position)
+{
+	return InDungeonBounds(position) && HasAnyOf(dFlags[position.x][position.y], DungeonFlag::Visible);
+}
 
 /**
  * @brief Checks if a light source is illuminating this tile