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/util.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/util.cc')
| -rw-r--r-- | src/util.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/util.cc b/src/util.cc index b393c610..70cc3f4f 100644 --- a/src/util.cc +++ b/src/util.cc @@ -2968,18 +2968,19 @@ void request_command(int shopping) /* Hack -- Scan equipment */ for (i = INVEN_WIELD; i < INVEN_TOTAL; i++) { - cptr s; - object_type *o_ptr = &p_ptr->inventory[i]; /* Skip non-objects */ if (!o_ptr->k_idx) continue; /* No inscription */ - if (!o_ptr->note) continue; + if (o_ptr->inscription.empty()) + { + continue; + } /* Obtain the inscription */ - s = quark_str(o_ptr->note); + auto s = o_ptr->inscription.c_str(); /* Find a '^' */ s = strchr(s, '^'); |