From cbafbc638c2e1d5bb40ee6bc419007062e9615e4 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:09 +0200 Subject: Remove traps Credit goes mostly to "miramor" who did most of the actual work. I just did a few minor tweaks and fixes + rebased onto master. --- src/xtra2.cc | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'src/xtra2.cc') diff --git a/src/xtra2.cc b/src/xtra2.cc index 890ce975..8e859f14 100644 --- a/src/xtra2.cc +++ b/src/xtra2.cc @@ -51,7 +51,6 @@ #include "stats.hpp" #include "store_info_type.hpp" #include "tables.hpp" -#include "trap_type.hpp" #include "util.hpp" #include "util.h" #include "variable.h" @@ -3777,9 +3776,6 @@ static bool_ target_set_accept(int y, int x) /* Interesting memorized features */ if (c_ptr->info & (CAVE_MARK)) { - /* Traps are interesting */ - if (c_ptr->info & (CAVE_TRDT)) return (TRUE); - /* Hack -- Doors are boring */ if (c_ptr->feat == FEAT_OPEN) return (FALSE); if (c_ptr->feat == FEAT_BROKEN) return (FALSE); @@ -3902,7 +3898,6 @@ static int target_set_aux(int y, int x, int mode, cptr info) auto const &wf_info = game->edit_data.wf_info; auto const &f_info = game->edit_data.f_info; auto const &k_info = game->edit_data.k_info; - auto const &t_info = game->edit_data.t_info; cave_type *c_ptr = &cave[y][x]; @@ -4166,34 +4161,6 @@ static int target_set_aux(int y, int x, int mode, cptr info) } } - /* Actual traps */ - if ((c_ptr->info & (CAVE_TRDT)) && c_ptr->t_idx) - { - cptr name = "a trap", s4; - - /* Name trap */ - if (t_info[c_ptr->t_idx].ident) - { - s4 = format("(%s)", t_info[c_ptr->t_idx].name); - } - else - { - s4 = "an unknown trap"; - } - - /* Display a message */ - sprintf(out_val, "%s%s%s%s [%s]", s1, s2, s3, name, s4); - prt(out_val, 0, 0); - move_cursor_relative(y, x); - query = inkey(); - - /* Stop on everything but "return" */ - if ((query != '\r') && (query != '\n')) break; - - /* Repeat forever */ - continue; - } - /* Feature (apply "mimic") */ if (c_ptr->mimic) { -- cgit v1.2.3