git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1817 c06c8d41-db1a-0410-9941-cceddc491573
BSI5DB3LVY42ZHOS46X2CAPPVOSOTTQWFGLTMAKRFTROI5BQWFDQC
557IY36VX2M4ERVCP5HNI3YTHHVTHPETZ5RWDX5BKDKXXIYCFUJAC
BTO5WE4OEK64DZQVNYLOESM74KKQNE7KSNMQVF5UDB26OBKP7ORQC
OQ4KB7QCJSK7GSW3DYBARH4DCB75HFKLUSOSOZZZ4IUFKNGFRUDQC
52XHD5LKS6UVLXBYUXMPTMVMTXQ6FBUFXJ2TAW6R7CSJY7OXWVJAC
K2CS6TCX2NDVL2ASEHGP4J4K4IJ6FP3ANNKTSIWVG43HPYSBX6ZQC
6LT6USGJOTDMRJGXLAN2NSZXK2GKWEXDKKUV6SVV7ZC6WI6EKMDQC
RPOZZWKG5GLPHVZZ7ZKMKS64ZMV2LDCQSARBJFJ6FZOTOKCQO7FAC
5OVWAD2MGK2NT6Q546KW7HZHELVDBBRC2CQX6VZMZF2YVRC7CPVAC
HDLNRHAMFVDM4QCZMY6COBYZ35ODPR5PONT4UE77UAZ7GEE2FLHQC
4GGNXCX2CLKWQZIZT543LXFFKFRD4PY5XPJFLGWKW4ACKYZNLVPQC
74LQ7JXVLAFSHLI7LCBKFX47CNTYSKGUQSXNX5FCIUIGCC2JTR3QC
P722Q43MJLCJ5NHF6FA27YM7IYP2ZTP6WP373BAVZPODZW4JLJPQC
5KJCHLIUFKRPMIVWUAYT6EOF7SW4PTQF6Y5OPEFWXGLE7DUGYLZAC
unsigned char key2 = 0;
you.had_book[booktype] = true;
if ( booktype == BOOK_MINOR_MAGIC_I
|| booktype == BOOK_MINOR_MAGIC_II
|| booktype == BOOK_MINOR_MAGIC_III)
{
you.had_book[BOOK_MINOR_MAGIC_I] = true;
you.had_book[BOOK_MINOR_MAGIC_II] = true;
you.had_book[BOOK_MINOR_MAGIC_III] = true;
}
else if (booktype == BOOK_CONJURATIONS_I
|| booktype == BOOK_CONJURATIONS_II)
{
you.had_book[BOOK_CONJURATIONS_I] = true;
you.had_book[BOOK_CONJURATIONS_II] = true;
}
}
if ( book.sub_type == BOOK_MINOR_MAGIC_I
|| book.sub_type == BOOK_MINOR_MAGIC_II
|| book.sub_type == BOOK_MINOR_MAGIC_III)
{
you.had_book[BOOK_MINOR_MAGIC_I] = true;
you.had_book[BOOK_MINOR_MAGIC_II] = true;
you.had_book[BOOK_MINOR_MAGIC_III] = true;
}
else if (book.sub_type == BOOK_CONJURATIONS_I
|| book.sub_type == BOOK_CONJURATIONS_II)
{
you.had_book[BOOK_CONJURATIONS_I] = true;
you.had_book[BOOK_CONJURATIONS_II] = true;
}
}
{
const int subtype = you.inv[i].sub_type;
you.had_book[subtype] = true;
// one for all, all for one
if (subtype == BOOK_MINOR_MAGIC_I ||
subtype == BOOK_MINOR_MAGIC_II ||
subtype == BOOK_MINOR_MAGIC_III)
{
you.had_book[BOOK_MINOR_MAGIC_I] = true;
you.had_book[BOOK_MINOR_MAGIC_II] = true;
you.had_book[BOOK_MINOR_MAGIC_III] = true;
}
if (subtype == BOOK_CONJURATIONS_I ||
subtype == BOOK_CONJURATIONS_II)
{
you.had_book[BOOK_CONJURATIONS_I] = true;
you.had_book[BOOK_CONJURATIONS_II] = true;
}
}
}
mark_had_book(you.inv[i].sub_type);
if (keyin == 'a')
class_wanted = OBJ_WEAPONS;
else if (keyin == 'b')
class_wanted = OBJ_ARMOUR;
else if (keyin == 'c')
class_wanted = OBJ_JEWELLERY;
else if (keyin == 'd')
class_wanted = OBJ_BOOKS;
else if (keyin == 'e')
class_wanted = OBJ_STAVES;
else if (keyin == 'f')
class_wanted = OBJ_FOOD;
else if (keyin == 'g')
class_wanted = OBJ_MISCELLANY;
else if (keyin == 'h')
class_wanted = OBJ_GOLD;
switch ( keyin )
{
case 'a': class_wanted = OBJ_WEAPONS; break;
case 'b': class_wanted = OBJ_ARMOUR; break;
case 'c': class_wanted = OBJ_JEWELLERY; break;
case 'd': class_wanted = OBJ_BOOKS; break;
case 'e': class_wanted = OBJ_STAVES; break;
case 'f': class_wanted = OBJ_FOOD; break;
case 'g': class_wanted = OBJ_MISCELLANY; break;
case 'h': class_wanted = OBJ_GOLD; break;
default: break;
}
if (thing.sub_type == BOOK_MINOR_MAGIC_I
|| thing.sub_type == BOOK_MINOR_MAGIC_II
|| thing.sub_type == BOOK_MINOR_MAGIC_III)
{
you.had_book[ BOOK_MINOR_MAGIC_I ] = true;
you.had_book[ BOOK_MINOR_MAGIC_II ] = true;
you.had_book[ BOOK_MINOR_MAGIC_III ] = true;
}
else if (thing.sub_type == BOOK_CONJURATIONS_I
|| thing.sub_type == BOOK_CONJURATIONS_II)
{
you.had_book[ BOOK_CONJURATIONS_I ] = true;
you.had_book[ BOOK_CONJURATIONS_II ] = true;
}
else
{
you.had_book[ thing.sub_type ] = true;
}
mark_had_book(thing.sub_type);