ALLOW_{EASY_OPEN,EASY_DISARM,REPEAT} code is no longer conditional.

1 files changed, 0 insertions, 24 deletions

diff --git a/src/cmd2.c b/src/cmd2.c
index eeed812c..7d2a33b9 100644
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -817,8 +817,6 @@ static bool do_cmd_open_chest(int y, int x, s16b o_idx)
 }
 
 
-#if defined(ALLOW_EASY_OPEN) || defined(ALLOW_EASY_DISARM)
-
 /*
  * Original code by TNB, improvement for Angband 2.9.3 by rr9
  * Slightly modified for ToME because of its trap implementation
@@ -976,8 +974,6 @@ static int coords_to_dir(int y, int x)
 	return d[dx + 1][dy + 1];
 }
 
-#endif /* defined(ALLOW_EASY_OPEN) || defined(ALLOW_EASY_DISARM) -- TNB */
-
 
 /*
  * Perform the basic "open" command on doors
@@ -1121,8 +1117,6 @@ void do_cmd_open(void)
 		return;
 	}
 
-#ifdef ALLOW_EASY_OPEN			/* TNB */
-
 	/* Option: Pick a direction */
 	if (easy_open)
 	{
@@ -1151,8 +1145,6 @@ void do_cmd_open(void)
 		}
 	}
 
-#endif /* ALLOW_EASY_OPEN -- TNB */
-
 	/* Allow repeated command */
 	if (command_arg)
 	{
@@ -1295,8 +1287,6 @@ void do_cmd_close(void)
 	bool more = FALSE;
 
 
-#ifdef ALLOW_EASY_OPEN			/* TNB */
-
 	/* Option: Pick a direction */
 	if (easy_open)
 	{
@@ -1322,8 +1312,6 @@ void do_cmd_close(void)
 		}
 	}
 
-#endif /* ALLOW_EASY_OPEN -- TNB */
-
 	/* Allow repeated command */
 	if (command_arg)
 	{
@@ -1824,8 +1812,6 @@ void do_cmd_tunnel(void)
 }
 
 
-#ifdef ALLOW_EASY_OPEN			/* TNB */
-
 /*
  * easy_open_door --
  *
@@ -1942,8 +1928,6 @@ bool easy_open_door(int y, int x)
 	return (TRUE);
 }
 
-#endif /* ALLOW_EASY_OPEN -- TNB */
-
 
 /*
  * Perform the basic "disarm" command
@@ -2032,11 +2016,7 @@ static bool do_cmd_disarm_chest(int y, int x, s16b o_idx)
  *
  * Returns TRUE if repeated commands may continue
  */
-#ifdef ALLOW_EASY_DISARM		/* TNB */
 bool do_cmd_disarm_aux(int y, int x, int dir, int do_pickup)
-#else  /* ALLOW_EASY_DISARM -- TNB */
-static bool do_cmd_disarm_aux(int y, int x, int dir, int do_pickup)
-#endif /* ALLOW_EASY_DISARM -- TNB */
 {
 	int i, j, power;
 
@@ -2156,8 +2136,6 @@ void do_cmd_disarm(void)
 	bool more = FALSE;
 
 
-#ifdef ALLOW_EASY_DISARM		/* TNB */
-
 	/* Option: Pick a direction */
 	if (easy_disarm)
 	{
@@ -2177,8 +2155,6 @@ void do_cmd_disarm(void)
 		}
 	}
 
-#endif /* ALLOW_EASY_DISARM -- TNB */
-
 	/* Allow repeated command */
 	if (command_arg)
 	{