summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/initfile.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-14 17:22:57 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-14 17:22:57 +0000
commitc952a077df68bc5174a63ffaabab555c01f0b8ac (patch)
treed98af75f307df9de3a56682ce3a815b04dfa1078 /crawl-ref/source/initfile.cc
parent4461e8e2b1380e7f2790fa42eccbf54fbebb4b9e (diff)
downloadcrawl-ref-c952a077df68bc5174a63ffaabab555c01f0b8ac.tar.gz
crawl-ref-c952a077df68bc5174a63ffaabab555c01f0b8ac.zip
FR 1861017: add info on enchanting hides to enchant armour description
FR 1840678: upon failed sacrifice give hint on correct item class part of FR 1857701: Give a message when a weapon of returning does NOT return (and add a message_colour line in init.txt) Also, change Zin's donation messages to reflect the piety status the player will have once the piety pool has emptied into the actual piety, and modify descriptions of the good gods (by David). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3274 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
-rw-r--r--crawl-ref/source/initfile.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index e5a6ffcd5d..587a89ba4b 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -734,12 +734,12 @@ void game_options::reset_options()
sc_entries = 0;
sc_format = -1;
- friend_brand = CHATTR_NORMAL;
- stab_brand = CHATTR_NORMAL;
- may_stab_brand = CHATTR_NORMAL;
- heap_brand = CHATTR_REVERSE;
- stair_item_brand = CHATTR_REVERSE;
- trap_item_brand = CHATTR_NORMAL;
+ friend_brand = CHATTR_NORMAL;
+ stab_brand = CHATTR_NORMAL;
+ may_stab_brand = CHATTR_NORMAL;
+ heap_brand = CHATTR_REVERSE;
+ feature_item_brand = CHATTR_REVERSE;
+ trap_item_brand = CHATTR_NORMAL;
no_dark_brand = true;
@@ -1836,7 +1836,7 @@ void game_options::read_option_line(const std::string &str, bool runscript)
}
else if (key == "stair_item_brand")
{
- stair_item_brand = curses_attribute(field);
+ feature_item_brand = curses_attribute(field);
}
else if (key == "trap_item_brand")
{