summaryrefslogtreecommitdiff
path: root/src/dungeon.cc
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2015-02-23 09:11:58 +0100
committerBardur Arantsson <bardur@scientician.net>2015-02-23 09:11:58 +0100
commitcaa23251d8b279529330641032c62f8640ee13ff (patch)
treefd442587708295bfc31b17f12cc726aedf406f15 /src/dungeon.cc
parent3bfa6a0e2cba6b4fc8f53dac1e987c95fe7ed93c (diff)
Remove rp_head, rp_name, rp_text, rmp_head, rmp_name, rmp_text
Diffstat (limited to 'src/dungeon.cc')
-rw-r--r--src/dungeon.cc15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/dungeon.cc b/src/dungeon.cc
index 020effb4..06ac76ce 100644
--- a/src/dungeon.cc
+++ b/src/dungeon.cc
@@ -958,8 +958,8 @@ static bool_ grace_delay_trigger()
*/
static void process_world_gods()
{
- const char *race_name = rp_ptr->title + rp_name;
- const char *subrace_name = rmp_ptr->title + rmp_name;
+ const char *race_name = rp_ptr->title;
+ const char *subrace_name = rmp_ptr->title;
GOD(GOD_VARDA)
{
@@ -1705,9 +1705,14 @@ static void process_world(void)
int dec = 5 - wisdom_scale(3);
/* Blech what an hideous hack */
- if (!strcmp(rp_ptr->title + rp_name, "Ent"))
+ if (!strcmp(rp_ptr->title, "Ent"))
+ {
dec -= wisdom_scale(2);
- if (dec < 1) dec = 1;
+ }
+ if (dec < 1)
+ {
+ dec = 1;
+ }
inc_piety(GOD_YAVANNA, -dec);
}
}
@@ -4998,7 +5003,7 @@ static void load_all_pref_files(void)
/* Access the "race" pref file */
- sprintf(buf, "%s.prf", rp_ptr->title + rp_name);
+ sprintf(buf, "%s.prf", rp_ptr->title);
/* Process that file */
process_pref_file(buf);