diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2015-02-23 09:11:58 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2015-02-23 09:11:58 +0100 |
| commit | c54c7ab7a45e1729bcd3a238cd296850ba91c55f (patch) | |
| tree | 7447f2e269667378c74daf374dde8fd80f753c0e /src/store.cc | |
| parent | 1ba4f05af61fbc1b65cf12d140bb4bce6c91e71d (diff) | |
Remove st_head, st_name
Diffstat (limited to 'src/store.cc')
| -rw-r--r-- | src/store.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/store.cc b/src/store.cc index 15c97d1d..e948c094 100644 --- a/src/store.cc +++ b/src/store.cc @@ -613,7 +613,7 @@ bool_ is_blessed(object_type *o_ptr) */ static bool_ store_will_buy(object_type *o_ptr) { - cptr store_name = st_info[st_ptr->st_idx].name + st_name; + cptr store_name = st_info[st_ptr->st_idx].name; /* Hack -- The Home is simple */ if (cur_store_num == 7) return (TRUE); @@ -1217,7 +1217,7 @@ static void store_create(void) obj_all_done = FALSE; /* Magic Shop */ - if (streq(st_info[st_ptr->st_idx].name + st_name, STORE_MAGIC) && + if (streq(st_info[st_ptr->st_idx].name, STORE_MAGIC) && magik(20)) { s16b spell; @@ -1233,7 +1233,7 @@ static void store_create(void) } /* Temple */ - else if (streq(st_info[st_ptr->st_idx].name + st_name, STORE_TEMPLE) && + else if (streq(st_info[st_ptr->st_idx].name, STORE_TEMPLE) && magik(20)) { s16b spell; @@ -1584,10 +1584,8 @@ void display_store(void) else if (st_info[st_ptr->st_idx].flags1 & SF1_MUSEUM) { - cptr store_name = (st_name + st_info[cur_store_num].name); - /* Show the name of the store */ - strnfmt(buf, 80, "%s", store_name); + strnfmt(buf, 80, "%s", st_info[cur_store_num].name); prt(buf, 3, 30); /* Label the item descriptions */ @@ -1600,7 +1598,6 @@ void display_store(void) /* Normal stores */ else { - cptr store_name = (st_name + st_info[cur_store_num].name); cptr owner_name = (ow_name + ot_ptr->name); /* Put the owner name and race */ @@ -1608,7 +1605,9 @@ void display_store(void) put_str(buf, 3, 10); /* Show the max price in the store (above prices) */ - strnfmt(buf, 80, "%s (" FMTs16b ")", store_name, ot_ptr->max_cost); + strnfmt(buf, 80, "%s (" FMTs16b ")", + st_info[cur_store_num].name, + ot_ptr->max_cost); prt(buf, 3, 50); /* Label the item descriptions */ |