summaryrefslogtreecommitdiffstats
path: root/crawl-ref/settings
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-12-09 20:28:26 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-12-09 20:28:26 +0000
commit0b3e4a3a26f964bfd37347b4aa8425b4b2d7f1db (patch)
treeeed15ff1e17302ed715c4c6a141ec4258d8b54a9 /crawl-ref/settings
parent847d18dc0c092ff23aa03cfc23b7bc1c32f2dabe (diff)
downloadcrawl-ref-0b3e4a3a26f964bfd37347b4aa8425b4b2d7f1db.tar.gz
crawl-ref-0b3e4a3a26f964bfd37347b4aa8425b4b2d7f1db.zip
* Updated change log.
* Fixed an ASSERT when quitting. If no one finds any urgent problems (someone please try compiling and playing on Windows, both ASCII and Tiles) I'll branch tomorrow. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7801 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/settings')
-rw-r--r--crawl-ref/settings/init.txt4
-rw-r--r--crawl-ref/settings/menu_colours.txt4
2 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt
index ecea500c90..93a04e82a2 100644
--- a/crawl-ref/settings/init.txt
+++ b/crawl-ref/settings/init.txt
@@ -262,8 +262,8 @@ include = menu_colours.txt
menu_colour = pickup:green:god gift
# Highlight (partly) selected items
-menu_colour = white:\w \+
-menu_colour = white:\w \#
+menu_colour = inventory:white:\w \+\s
+menu_colour = inventory:white:\w \#\s
# Colouring of messages
include = messages.txt
diff --git a/crawl-ref/settings/menu_colours.txt b/crawl-ref/settings/menu_colours.txt
index 321c023392..ed7cae2f37 100644
--- a/crawl-ref/settings/menu_colours.txt
+++ b/crawl-ref/settings/menu_colours.txt
@@ -21,7 +21,7 @@ menu = lightmagenta:.*orb.*Zot
# Artefacts
#
-menu = white:.*artefact.*
+menu = inventory:white:.*artefact.*
#menu = white:.*identified.*artefact.*
#menu = lightblue:.*unidentified.*artefact.*
@@ -59,6 +59,6 @@ menu = $evil:.*evil_item.*
# Defaults for normal items
#
menu = lightred:.*equipped.* cursed
-menu = lightgreen:.*equipped.*
+menu = inventory:lightgreen:.*equipped.*
menu = green:uncursed
menu = red:cursed