diff options
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/mon-data.h | 4 | ||||
-rw-r--r-- | crawl-ref/source/output.cc | 6 | ||||
-rw-r--r-- | crawl-ref/source/player.cc | 1 | ||||
-rw-r--r-- | crawl-ref/source/spells2.cc | 1 |
4 files changed, 8 insertions, 4 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 56cc5c8da0..61a4a97b7a 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -2914,7 +2914,7 @@ { MONS_LAVA_WORM, 'w', RED, "lava worm", M_NO_FLAGS, - MR_RES_FIRE | MR_VUL_COLD, + mrd(MR_RES_FIRE, 3) | MR_VUL_COLD, 0, 10, MONS_LAVA_WORM, MONS_LAVA_WORM, MH_NATURAL, -3, { {AT_BITE, AF_FIRE, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 6, 3, 5, 0 }, @@ -2925,7 +2925,7 @@ { MONS_LAVA_FISH, ';', RED, "lava fish", M_WARM_BLOOD, - MR_RES_FIRE | MR_VUL_COLD, + mrd(MR_RES_FIRE, 3) | MR_VUL_COLD, 0, 10, MONS_BIG_FISH, MONS_LAVA_FISH, MH_NATURAL, -3, { {AT_BITE, AF_FIRE, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 4, 3, 5, 0 }, diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index 0931faa75d..059ef8c7d6 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -1176,7 +1176,8 @@ std::string mpr_monster_list(bool past) #ifndef USE_TILE monster_pane_info::monster_pane_info(const monsters *m) - : m_mon(m) + : m_mon(m), m_attitude(ATT_HOSTILE), m_difficulty(0), + m_brands(0), m_fullname(true) { // XXX: this doesn't take into account ENCH_NEUTRAL, but that's probably // a bug for mons_attitude, not this. @@ -1186,10 +1187,11 @@ monster_pane_info::monster_pane_info(const monsters *m) // Currently, difficulty is defined as "average hp". Leaks too much info? const monsterentry* me = get_monster_data(m->type); + // [ds] XXX: Use monster experience value as a better indicator of diff.? m_difficulty = me->hpdice[0] * (me->hpdice[1] + (me->hpdice[2]>>1)) + me->hpdice[3]; - m_brands = 0; + // [ds] XXX: Kill the magic numbers. if (mons_looks_stabbable(m)) m_brands |= 1; if (mons_looks_distracted(m)) m_brands |= 2; if (m->has_ench(ENCH_BERSERK)) m_brands |= 4; diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index e6c9d84a28..53641b7d8b 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -5684,6 +5684,7 @@ std::string player_save_info::short_desc() const player::~player() { delete kills; + delete m_quiver; } coord_def player::pos() const diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index 3955799d24..7993961ffb 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -1820,6 +1820,7 @@ bool cast_tukimas_dance(int pow, god_type god, you.inv[wpn].quantity = 0; + destroy_item(menv[monster].inv[MSLOT_WEAPON]); menv[monster].inv[MSLOT_WEAPON] = i; menv[monster].colour = mitm[i].colour; burden_change(); |