summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/database.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-18 20:21:53 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-18 20:21:53 +0000
commit341258b95e2dde491b2b8aef794e5fd6ac3156ee (patch)
tree260ca53fb36d35627b441d400b26b4beb8404135 /crawl-ref/source/database.cc
parentc64b21cdfddbb84b459273e7990bd80a1e91d970 (diff)
downloadcrawl-ref-341258b95e2dde491b2b8aef794e5fd6ac3156ee.tar.gz
crawl-ref-341258b95e2dde491b2b8aef794e5fd6ac3156ee.zip
Add the framework for descriptions for abilities to be read from the
ability menu (a!) Currently only contains descriptions for Zin, TSO and "Renounce Religion". Also, now I'm worried that players might accidentally press '?' instead of '!' and then apply an ability when they only wanted to read its description. (Of course, with some of them you can opt out, e.g. because they need targeting, but for others it's a real problem.) There must be a good solution around somewhere. Abilities are not (yet) searchable in the database. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5958 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/database.cc')
-rw-r--r--crawl-ref/source/database.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/crawl-ref/source/database.cc b/crawl-ref/source/database.cc
index a700e4d825..50c3ca4c7a 100644
--- a/crawl-ref/source/database.cc
+++ b/crawl-ref/source/database.cc
@@ -66,6 +66,7 @@ static TextDB AllDBs[] =
"descript/gods.txt",
"descript/branches.txt",
"descript/skills.txt",
+ "descript/ability.txt",
NULL),
TextDB( "db/randart",
@@ -89,13 +90,13 @@ static TextDB AllDBs[] =
"database/insult.txt", // imp/demon taunts, again
NULL),
- TextDB( "db/help",
- "database/help.txt",
- NULL),
-
TextDB( "db/misc",
"database/miscname.txt", // names for miscellaneous things
NULL),
+
+ TextDB( "db/help", // database for outsourced help texts
+ "database/help.txt",
+ NULL),
};
static TextDB& DescriptionDB = AllDBs[0];
@@ -309,7 +310,7 @@ static void _execute_embedded_lua(std::string &str)
str.replace(pos, lua_full.length(), result);
pos = str.find("{{", pos + result.length());
- } // while (pos != std::string::npos)
+ }
}
static void _trim_leading_newlines(std::string &s)