summaryrefslogtreecommitdiff
path: root/src/cmd3.c
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2011-02-19 17:09:03 +0100
committerBardur Arantsson <bardur@scientician.net>2011-02-19 19:32:06 +0100
commit946d101429a49b656ee37ad00a927787e2d463fd (patch)
tree99623edd7ad64502efbdefcc2ad1eaf693a062b2 /src/cmd3.c
parent6a077f767bab67c5847e6ccf98513151462879a4 (diff)
Remove dead (#if 0) code.
Diffstat (limited to 'src/cmd3.c')
-rw-r--r--src/cmd3.c28
1 files changed, 0 insertions, 28 deletions
diff --git a/src/cmd3.c b/src/cmd3.c
index 120d72f4..9c2b7aad 100644
--- a/src/cmd3.c
+++ b/src/cmd3.c
@@ -734,22 +734,6 @@ void do_cmd_destroy(void)
automatizer_add_rule(o_ptr, TRUE);
}
-#if 0 /* DGDGDGDG -- use a skill */
- if (cp_ptr->magic_key == MKEY_TELEKINESIS)
- {
- /* Good merchants don't break anything... */
- s32b value = object_value_real(o_ptr);
-
- if (value < 0) value = -value;
-
- /* ... otherwise they lose some experience */
- value = value * amt / 10;
- if (value == 0) value = 1;
-
- lose_exp(value);
- msg_print("Good merchants should not break anything...");
- }
-#endif
/*
* Hack -- If rods or wand are destroyed, the total maximum timeout or
* charges of the stack needs to be reduced, unless all the items are
@@ -2143,12 +2127,6 @@ void set_portable_hole_weight(void)
{
s32b weight, i, j;
-
- /* Portable holes can be used only by merchants */
-#if 0 /* DGDGDGDG -- use a skill */
- if (cp_ptr->magic_key == MKEY_TELEKINESIS) return;
-#endif
-
/* Calculate the weight of items in home */
weight = portable_hole_weight();
@@ -2201,12 +2179,6 @@ void do_cmd_portable_hole(void)
int feat, special, town_num;
-
- /* Portable holes can be used only by merchants */
-#if 0 /* DGDGDGDG -- use a skill */
- if (cp_ptr->magic_key != MKEY_TELEKINESIS) return;
-#endif
-
/* Is it currently wielded? */
if (!p_ptr->inventory[INVEN_TOOL].k_idx ||
(p_ptr->inventory[INVEN_TOOL].tval != TV_TOOL) ||