diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-18 04:24:13 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-18 04:24:13 +0000 |
| commit | c7100ea3560444e620986945fa3d8768654624dd (patch) | |
| tree | 64f8a164060ce7de380519f34dd7e686d9c004b4 /crawl-ref | |
| parent | 5409f9e2f9282fd4758330639b630608ae62a7c7 (diff) | |
| download | crawl-ref-c7100ea3560444e620986945fa3d8768654624dd.tar.gz crawl-ref-c7100ea3560444e620986945fa3d8768654624dd.zip | |
Silenced valgrind warning noises, probably harmless.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6595 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/makeitem.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/output.cc | 7 | ||||
| -rw-r--r-- | crawl-ref/source/player.cc | 1 |
3 files changed, 8 insertions, 5 deletions
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 9897f63201..397c05a5a5 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -2912,8 +2912,9 @@ static void _give_monster_item(monsters *mon, int thing, item_def &mthing = mitm[thing]; #ifdef DEBUG_DIAGNOSTICS - mprf("Giving %s to %s...", mthing.name(DESC_PLAIN).c_str(), - mon->name(DESC_PLAIN).c_str()); + mprf(MSGCH_DIAGNOSTICS, + "Giving %s to %s...", mthing.name(DESC_PLAIN).c_str(), + mon->name(DESC_PLAIN).c_str()); #endif mthing.x = 0; diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index 76ed767ef2..6df4b409ef 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -1171,7 +1171,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. @@ -1181,10 +1182,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; @@ -2835,4 +2837,3 @@ std::string _status_mut_abilities() return text; } - diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 75f39facdf..e4e7b89ae7 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -5667,6 +5667,7 @@ std::string player_save_info::short_desc() const player::~player() { delete kills; + delete m_quiver; } coord_def player::pos() const |