summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/artefact.cc3
-rw-r--r--crawl-ref/source/spl-book.cc3
2 files changed, 2 insertions, 4 deletions
diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc
index 9cb254c619..b612ae9226 100644
--- a/crawl-ref/source/artefact.cc
+++ b/crawl-ref/source/artefact.cc
@@ -1226,7 +1226,8 @@ static bool _init_artefact_book(item_def &book)
book.plus2 = plus2;
if (book.sub_type == BOOK_RANDART_LEVEL)
- book_good = make_book_level_randart(book);
+ // The parameters to this call are encoded in book.plus and plus2
+ book_good = make_book_level_randart(book, book.plus, book.plus2);
else
book_good = make_book_theme_randart(book);
diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index 375fe300e1..33087ddb77 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -2254,16 +2254,13 @@ bool make_book_level_randart(item_def &book, int level, int num_spells,
// Being called from make_item_randart()
ASSERT(book.sub_type == BOOK_RANDART_LEVEL);
- ASSERT(level == -1 && num_spells == -1);
// Re-read owner, if applicable.
if (owner.empty() && book.props.exists("owner"))
owner = book.props["owner"].get_string();
- level = book.plus;
ASSERT(level > 0 && level <= 9);
- num_spells = book.plus2;
ASSERT(num_spells > 0 && num_spells <= SPELLBOOK_SIZE);
int god_discard = 0;