summaryrefslogtreecommitdiff
path: root/src/traps.cc
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2015-02-23 09:11:58 +0100
committerBardur Arantsson <bardur@scientician.net>2015-02-23 09:11:58 +0100
commite3405ca03eebafa60e773812c4f12fed7f4805db (patch)
tree52724af30f03765e46593bbbe350305cfa55b084 /src/traps.cc
parent7fce5e3c4d9c6700786828a6b82577fa95499217 (diff)
Remove t_head, t_name, t_text
Diffstat (limited to 'src/traps.cc')
-rw-r--r--src/traps.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/traps.cc b/src/traps.cc
index 6410e76c..6b56de16 100644
--- a/src/traps.cc
+++ b/src/traps.cc
@@ -439,12 +439,9 @@ static bool_ player_handle_breath_trap(s16b rad, s16b type, u16b trap)
*/
static void trap_hit(s16b trap)
{
- s16b dam;
trap_type *t_ptr = &t_info[trap];
-
- dam = damroll(t_ptr->dd, t_ptr->ds);
-
- take_hit(dam, t_name + t_ptr->name);
+ s16b dam = damroll(t_ptr->dd, t_ptr->ds);
+ take_hit(dam, t_ptr->name);
}
/*
@@ -1988,7 +1985,7 @@ void player_activate_door_trap(s16b y, s16b x)
{
t_info[c_ptr->t_idx].ident = TRUE;
msg_format("You identified that trap as %s.",
- t_name + t_info[c_ptr->t_idx].name);
+ t_info[c_ptr->t_idx].name);
}
}