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 | e6d0a04ee4231400fe9cd4037bf89e2985a18bf3 (patch) | |
| tree | 1628111f033af42b03582df0af425c0a62bd2392 /src/object1.cc | |
| parent | e2b5157f29e66cb0ccb151bfd46ee43c8c745fe7 (diff) | |
Remove e_name, e_text, e_head
Diffstat (limited to 'src/object1.cc')
| -rw-r--r-- | src/object1.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/object1.cc b/src/object1.cc index 1abdf36b..6346a492 100644 --- a/src/object1.cc +++ b/src/object1.cc @@ -1620,11 +1620,11 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) if (e_ptr->before) { - ego = e_ptr->name + e_name; + ego = e_ptr->name; } else if (e2_ptr->before) { - ego = e2_ptr->name + e_name; + ego = e2_ptr->name; } } @@ -1701,12 +1701,12 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) if (e_ptr->before) { - t = object_desc_str(t, (e_name + e_ptr->name)); + t = object_desc_str(t, e_ptr->name); t = object_desc_chr(t, ' '); } if (e2_ptr->before) { - t = object_desc_str(t, (e_name + e2_ptr->name)); + t = object_desc_str(t, e2_ptr->name); t = object_desc_chr(t, ' '); } } @@ -1779,12 +1779,12 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) if (e_ptr->before) { - t = object_desc_str(t, (e_name + e_ptr->name)); + t = object_desc_str(t, e_ptr->name); t = object_desc_chr(t, ' '); } if (e2_ptr->before) { - t = object_desc_str(t, (e_name + e2_ptr->name)); + t = object_desc_str(t, e2_ptr->name); t = object_desc_chr(t, ' '); } } @@ -1825,8 +1825,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) if (known && o_ptr->name2) { ego_item_type *e_ptr = &e_info[o_ptr->name2]; - - t = object_desc_str(t, (e_name + e_ptr->name)); + t = object_desc_str(t, e_ptr->name); } } @@ -1922,12 +1921,12 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) if (o_ptr->name2 && !e_ptr->before) { t = object_desc_chr(t, ' '); - t = object_desc_str(t, (e_name + e_ptr->name)); + t = object_desc_str(t, e_ptr->name); } if (o_ptr->name2b && !e2_ptr->before) { t = object_desc_chr(t, ' '); - t = object_desc_str(t, (e_name + e2_ptr->name)); + t = object_desc_str(t, e2_ptr->name); } } } |