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/dungeon.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/dungeon.cc')
| -rw-r--r-- | src/dungeon.cc | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/dungeon.cc b/src/dungeon.cc index bdb31fa1..2e42e871 100644 --- a/src/dungeon.cc +++ b/src/dungeon.cc @@ -610,16 +610,14 @@ static bool_ pattern_effect(void) */ static void recharged_notice(object_type *o_ptr) { - char o_name[80]; - - cptr s; - - /* No inscription */ - if (!o_ptr->note) return; + if (o_ptr->inscription.empty()) + { + return; + } /* Find a '!' */ - s = strchr(quark_str(o_ptr->note), '!'); + auto s = strchr(o_ptr->inscription.c_str(), '!'); /* Process notification request. */ while (s) @@ -628,6 +626,7 @@ static void recharged_notice(object_type *o_ptr) if (s[1] == '!') { /* Describe (briefly) */ + char o_name[80]; object_desc(o_name, o_ptr, FALSE, 0); /* Notify the player */ @@ -1295,7 +1294,7 @@ static void process_world(void) if ((randint(1000) < r_ptr->level - ((p_ptr->lev * 2) + get_skill(SKILL_SYMBIOTIC)))) { msg_format("%s breaks free from hypnosis!", - symbiote_name(TRUE)); + symbiote_name(true).c_str()); carried_make_attack_normal(o_ptr->pval); } } @@ -2773,11 +2772,9 @@ static void process_world(void) } else { - if (p_ptr->wild_mode || - (o_ptr->note && strchr(quark_str(o_ptr->note), '.'))) + if (p_ptr->wild_mode || strchr(o_ptr->inscription.c_str(), '.')) { - /* Do nothing */ - /* msg_print("Teleport aborted.") */; + /* Suppress teleportation */ } else if (get_check("Teleport? ")) { |