diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2016-09-17 09:58:14 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2016-09-17 09:58:14 +0200 |
| commit | 013e27d39ee8ee513208d2855c7e3f6252f0c0bf (patch) | |
| tree | 78ff86f87247b6bbcc43b14e1c00d10cfaca683f /src/cmd1.cc | |
| parent | b15461dbcedf27f28a843f700ce0473d57364230 (diff) | |
Refactor object_type 'inscription' field to std::string
We don't really need quarks for this since we're not nearly as
memory-constrained these days.
Diffstat (limited to 'src/cmd1.cc')
| -rw-r--r-- | src/cmd1.cc | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/cmd1.cc b/src/cmd1.cc index 642c9df8..36b164b5 100644 --- a/src/cmd1.cc +++ b/src/cmd1.cc @@ -622,16 +622,12 @@ static void carried_monster_attack(s16b m_idx, bool_ *fear, bool_ *mdeath, { monster_type *t_ptr = &m_list[m_idx]; - monster_race *r_ptr; - int ap_cnt; int ac, rlev, pt; char t_name[80]; - cptr sym_name = symbiote_name(TRUE); - char temp[80]; bool_ blinked = FALSE, touched = FALSE; @@ -640,14 +636,12 @@ static void carried_monster_attack(s16b m_idx, bool_ *fear, bool_ *mdeath, byte x_saver = t_ptr->fx; - object_type *o_ptr; - - /* Get the carried monster */ - o_ptr = &p_ptr->inventory[INVEN_CARRY]; + auto o_ptr = &p_ptr->inventory[INVEN_CARRY]; if (!o_ptr->k_idx) return; - r_ptr = &r_info[o_ptr->pval]; + /* Get monster race of the symbiote */ + monster_race *r_ptr = &r_info[o_ptr->pval]; /* Not allowed to attack */ if (r_ptr->flags & RF_NEVER_BLOW) return; @@ -877,7 +871,9 @@ static void carried_monster_attack(s16b m_idx, bool_ *fear, bool_ *mdeath, { strnfmt(temp, sizeof(temp), act, t_name); if (t_ptr->ml) - msg_format("%s %s", sym_name, temp); + { + msg_format("%s %s", symbiote_name(true).c_str(), temp); + } } @@ -1092,7 +1088,7 @@ static void carried_monster_attack(s16b m_idx, bool_ *fear, bool_ *mdeath, disturb(1); /* Message */ - msg_format("%s misses %s.", sym_name, t_name); + msg_format("%s misses %s.", symbiote_name(true).c_str(), t_name); break; } } @@ -1102,7 +1098,7 @@ static void carried_monster_attack(s16b m_idx, bool_ *fear, bool_ *mdeath, /* Blink away */ if (blinked) { - msg_format("You and %s flee laughing!", symbiote_name(FALSE)); + msg_format("You and %s flee laughing!", symbiote_name(false).c_str()); teleport_player(MAX_SIGHT * 2 + 5); } |