summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/dungeon.cc4
-rw-r--r--crawl-ref/source/effects.cc10
2 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index d821a9180a..7509309a4c 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -2890,7 +2890,7 @@ static int give_weapon(monsters *mon, int level)
if (one_chance_in(12) && level > 1)
{
item.base_type = OBJ_WEAPONS;
- item.base_type = WPN_BLOWGUN;
+ item.sub_type = WPN_BLOWGUN;
break;
}
// deliberate fall through {dlb}
@@ -2950,7 +2950,7 @@ static int give_weapon(monsters *mon, int level)
if (one_chance_in(15) && level > 1)
{
item.base_type = OBJ_WEAPONS;
- item.base_type = WPN_BLOWGUN;
+ item.sub_type = WPN_BLOWGUN;
break;
}
// deliberate fall through {gdl}
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 30dbc1be0c..04ba728117 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -1220,16 +1220,16 @@ bool acquirement(unsigned char force_class, int agent)
if (thing.base_type == OBJ_BOOKS)
{
- if (thing.base_type == BOOK_MINOR_MAGIC_I
- || thing.base_type == BOOK_MINOR_MAGIC_II
- || thing.base_type == BOOK_MINOR_MAGIC_III)
+ 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 ] = 1;
you.had_book[ BOOK_MINOR_MAGIC_II ] = 1;
you.had_book[ BOOK_MINOR_MAGIC_III ] = 1;
}
- else if (thing.base_type == BOOK_CONJURATIONS_I
- || thing.base_type == BOOK_CONJURATIONS_II)
+ else if (thing.sub_type == BOOK_CONJURATIONS_I
+ || thing.sub_type == BOOK_CONJURATIONS_II)
{
you.had_book[ BOOK_CONJURATIONS_I ] = 1;
you.had_book[ BOOK_CONJURATIONS_II ] = 1;