summaryrefslogtreecommitdiff
path: root/src/object1.cc
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2016-10-05 18:45:09 +0200
committerBardur Arantsson <bardur@scientician.net>2016-10-05 18:49:38 +0200
commitcbafbc638c2e1d5bb40ee6bc419007062e9615e4 (patch)
tree0a4644c9c935a2a54d8b52613c67a09fc2fbf4be /src/object1.cc
parent551339813797a9b274ccf5f3f0c4f0d0b44cbf64 (diff)
Remove traps
Credit goes mostly to "miramor" <danlev@norwoodlight.com> who did most of the actual work. I just did a few minor tweaks and fixes + rebased onto master.
Diffstat (limited to 'src/object1.cc')
-rw-r--r--src/object1.cc89
1 files changed, 0 insertions, 89 deletions
diff --git a/src/object1.cc b/src/object1.cc
index d04c7ab2..e81c5742 100644
--- a/src/object1.cc
+++ b/src/object1.cc
@@ -47,7 +47,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"
@@ -636,7 +635,6 @@ void reset_visuals(void)
auto &r_info = game->edit_data.r_info;
auto &f_info = game->edit_data.f_info;
auto &k_info = game->edit_data.k_info;
- auto &t_info = game->edit_data.t_info;
/* Extract some info about terrain features */
for (auto &f_ref: f_info)
@@ -685,15 +683,6 @@ void reset_visuals(void)
rmp.g_char = 0;
}
- /* Reset attr/char code for trap overlay graphics */
- for (auto &t_ref: t_info)
- {
- /* Default attr/char */
- t_ref.g_attr = 0;
- t_ref.g_char = 0;
- }
-
-
/* Normal symbols */
process_pref_file("font.prf");
}
@@ -1033,7 +1022,6 @@ static std::string object_desc_aux(object_type const *o_ptr, int pref, int mode)
auto const &k_info = game->edit_data.k_info;
auto const &a_info = game->edit_data.a_info;
auto const &e_info = game->edit_data.e_info;
- auto const &t_info = game->edit_data.t_info;
static auto const TR_PVAL_MASK = compute_pval_mask();
bool_ hack_name = FALSE;
@@ -1097,14 +1085,6 @@ static std::string object_desc_aux(object_type const *o_ptr, int pref, int mode)
break;
}
- /* Trapping Kits */
- case TV_TRAPKIT:
- {
- modstr = basenm;
- basenm = "& # Trap Set~";
- break;
- }
-
/* Armour */
case TV_BOOTS:
case TV_GLOVES:
@@ -1769,23 +1749,6 @@ static std::string object_desc_aux(object_type const *o_ptr, int pref, int mode)
{
t += " (empty)";
}
-
- /* May be "disarmed" */
- else if (o_ptr->pval < 0)
- {
- t += " (disarmed)";
- }
-
- /* Describe the traps, if any */
- else
- {
- /* Describe the traps */
- auto trap_name = (t_info[o_ptr->pval].ident)
- ? t_info[o_ptr->pval].name
- : "trapped";
-
- t += fmt::format(" ({})", trap_name);
- }
}
@@ -2704,7 +2667,6 @@ bool_ object_out_desc(object_type *o_ptr, FILE *fff, bool_ trim_down, bool_ wait
if (flags & TR_DEX) vp[vn++] = "dexterity";
if (flags & TR_CON) vp[vn++] = "constitution";
if (flags & TR_CHR) vp[vn++] = "charisma";
- if ((o_ptr->tval != TV_TRAPKIT) && (flags & TR_STEALTH)) vp[vn++] = "stealth";
if (flags & TR_SEARCH) vp[vn++] = "searching";
if (flags & TR_INFRA) vp[vn++] = "infravision";
if (flags & TR_TUNNEL) vp[vn++] = "ability to tunnel";
@@ -2781,11 +2743,6 @@ bool_ object_out_desc(object_type *o_ptr, FILE *fff, bool_ trim_down, bool_ wait
text_out(". ");
}
- if ((o_ptr->tval == TV_TRAPKIT) && (flags & TR_STEALTH))
- {
- text_out("It is well-hidden. ");
- }
-
vn = 0;
if (flags & TR_BRAND_ACID)
{
@@ -2919,7 +2876,6 @@ bool_ object_out_desc(object_type *o_ptr, FILE *fff, bool_ trim_down, bool_ wait
text_out("It makes you invisible. ");
}
- if (o_ptr->tval != TV_TRAPKIT)
{
vn = 0;
if (flags & TR_SUST_STR)
@@ -3016,45 +2972,6 @@ bool_ object_out_desc(object_type *o_ptr, FILE *fff, bool_ trim_down, bool_ wait
text_out(". ");
}
}
- else
- {
- if (flags & TR_AUTOMATIC_5)
- {
- text_out("It can rearm itself. ");
- }
- if (flags & TR_AUTOMATIC_99)
- {
- text_out("It rearms itself. ");
- }
- if (flags & TR_KILL_GHOST)
- {
- text_out("It is effective against Ghosts. ");
- }
- if (flags & TR_TELEPORT_TO)
- {
- text_out("It can teleport monsters to you. ");
- }
- if (flags & TR_ONLY_DRAGON)
- {
- text_out("It can only be set off by dragons. ");
- }
- if (flags & TR_ONLY_DEMON)
- {
- text_out("It can only be set off by demons. ");
- }
- if (flags & TR_ONLY_UNDEAD)
- {
- text_out("It can only be set off by undead. ");
- }
- if (flags & TR_ONLY_ANIMAL)
- {
- text_out("It can only be set off by animals. ");
- }
- if (flags & TR_ONLY_EVIL)
- {
- text_out("It can only be set off by evil creatures. ");
- }
- }
if (flags & TR_FREE_ACT)
{
@@ -5861,12 +5778,6 @@ void py_pickup_floor(int pickup)
/* Get the tile */
auto c_ptr = &cave[p_ptr->py][p_ptr->px];
- /* Hack -- ignore monster traps */
- if (c_ptr->feat == FEAT_MON_TRAP)
- {
- return;
- }
-
/* Try to grab ammo */
pickup_ammo();