summaryrefslogtreecommitdiff
path: root/src/monster1.cc
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2015-02-23 09:11:57 +0100
committerBardur Arantsson <bardur@scientician.net>2015-02-23 09:11:57 +0100
commitc4746c0f6d328baa429c96e54d86d2d7f97ccbcc (patch)
tree3f0b3a2f98298ab823662e0096bc7ba857793b98 /src/monster1.cc
parentb84ac3e1b505624e2af18a4283e7ec379c00b0dc (diff)
Remove r_name, r_text, r_head in favor of simple strings
Diffstat (limited to 'src/monster1.cc')
-rw-r--r--src/monster1.cc14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/monster1.cc b/src/monster1.cc
index 81800962..f1968807 100644
--- a/src/monster1.cc
+++ b/src/monster1.cc
@@ -337,7 +337,7 @@ static void roff_aux(int r_idx, int ego, int remem)
char buf[2048];
/* Simple method */
- strcpy(buf, r_text + r_ptr->text);
+ strcpy(buf, r_ptr->text);
/* Dump it */
text_out(buf);
@@ -1534,12 +1534,18 @@ static void roff_name(int r_idx, int ego)
/* Dump the name */
if (ego)
{
- if (re_info[ego].before) Term_addstr( -1, TERM_WHITE, format("%s %s", re_name + re_info[ego].name, r_name + r_ptr->name));
- else Term_addstr( -1, TERM_WHITE, format("%s %s", r_name + r_ptr->name, re_name + re_info[ego].name));
+ if (re_info[ego].before)
+ {
+ Term_addstr( -1, TERM_WHITE, format("%s %s", re_name + re_info[ego].name, r_ptr->name));
+ }
+ else
+ {
+ Term_addstr( -1, TERM_WHITE, format("%s %s", r_ptr->name, re_name + re_info[ego].name));
+ }
}
else
{
- Term_addstr( -1, TERM_WHITE, r_name + r_ptr->name);
+ Term_addstr( -1, TERM_WHITE, r_ptr->name);
}
/* Append the "standard" attr/char info */