Other minor fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7157 c06c8d41-db1a-0410-9941-cceddc491573
HTR7KACUG3OB7ANWNQDJ2DDSAR2FQY6VLNLRAJ7OWW4P2AX5LOGAC
5E2WUTWF247HPQ4BT5APN2LKXAG3QCKQRDADSJ4BCYYZ5HSWBHAQC
YMJQTOLVRYBNHPE6RVL6YB6O5E7TNNGTIBYSQHMR4PHSA233TT4QC
Y7OLUKMA5BUL2F7TAJXFX7MK75OSISVABIWHB5PGU6F22D32VQRAC
5FHWTG7M6FW4B3I33YI7QSM3OZIB6ZGC6TI6JISSLY5Y43HI56VAC
SVY2PTCLXR3KNPQAWXVXTTGCC5DR334HOAKHYO3VDDRWM2BWMALAC
K2CS6TCX2NDVL2ASEHGP4J4K4IJ6FP3ANNKTSIWVG43HPYSBX6ZQC
PR42BCP5BPRFD2MP5H6CIJP7E57Q6TKL6SOXZWFKMFVR2OZWHT7AC
HKQTMQVLLOBG2VO47TUGSTQALA3D2YLMEVADXXYNR4RGGKD3F2ZAC
WEFNLSQ7HRLNHIKFH46FIBBZNAORSXGOVIJWZGVVEHL36MICAUAAC
VMDHEP2MGV6D5MTWNNTUYV4SY45JC3ITDEZLHT4HDJ4N2GXM755AC
TRWPSFTO32PTSWMTZ476HJER6NTJIFRRMDSKHLJ7JLDRIOVQL6BAC
WG2IBEY4INAZZL3XJXC4PHLH36TRYZAP5CEZGXMJ5BLEJM7LEOKQC
RPOZZWKG5GLPHVZZ7ZKMKS64ZMV2LDCQSARBJFJ6FZOTOKCQO7FAC
PI5BATR2SER3RFE76IUGHM2AGXVFOUM3PLU7WC2K2Q2BA5K2E73QC
TGJZXTUIAKCFZQJ54ZQEBGFBVZSJCAX6AWDRSH3TP7UJRLGUM5SAC
KAOE5HB3THUKVGFZRO5EZESHEB3Q34WUO5DFMLWIKOBF47LZTIYAC
FLAGBNUNSIQNFDN53CDWABJRTTFWDL4PG34AI474ZKPXDEPYHOAQC
G3BHIB4AOVZ7P4DF7RMRI2C2O6HPSJYRMYQLF2LYBFLKHN6UUIZAC
4FQAKUKUO6PCAZ3N4HUR5XL6E4VA5UQUZ3AEDGRBLVY7W2LMWI7QC
JJULXW764V5C2HJKZNWQAEWB6QM5YZADD7ZCE35LYTBFEM6PMYCAC
// last updated 12may2000 {dlb}
/* ***********************************************************************
* called from: acr - bang - beam - command - effects - fight - misc -
* ouch - output - religion - spells - spells2 - spells4
* *********************************************************************** */
for (p.x = start.x; p.x < end.x; p.x++)
for (p.y = start.y; p.y < end.y; p.y++)
for (rectangle_iterator ri(start, end); ri; ++ri)
{
if (!in_bounds(*ri) || !see_grid(*ri))
continue;
const int oid = igrd(*ri);
if (oid != NON_ITEM)
if (!in_bounds(p.x,p.y) || !see_grid(p.x,p.y))
continue;
const int oid = igrd(p);
if (oid != NON_ITEM)
{
std::vector<const item_def*> items;
item_list_on_square( items, oid, true );
list_items.insert(list_items.end(), items.begin(), items.end());
}
std::vector<const item_def*> items;
item_list_on_square( items, oid, true );
list_items.insert(list_items.end(), items.begin(), items.end());
std::string col_string = colour_to_str(glyph_col);
std::string prefix = "(<" + col_string + ">"
+ (char)glyph_char
+ "</" + col_string + ">) ";
const std::string col_string = colour_to_str(glyph_col);
const std::string prefix = "(<" + col_string + ">"
+ static_cast<char>(glyph_char)
+ "</" + col_string + ">) ";
static int _beam_ouch_agent(const bolt &beam)
{
return YOU_KILL(beam.thrower) ? 0 : beam.beam_source;
}
// Special case: Explosion originates from rock/statue
// (e.g. Lee's rapid deconstruction) - in this case, ignore
// solid cells at the center of the explosion.
if (dngn_feat <= DNGN_MAXWALL
&& (p.x != 0 || p.y != 0) && !_affects_wall(beam, dngn_feat))
if (grid_is_wall(dngn_feat)
|| dngn_feat == DNGN_SECRET_DOOR
|| dngn_feat == DNGN_CLOSED_DOOR)