summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/it_use3.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-06-22 11:14:27 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-06-22 11:14:27 +0000
commit81612f62ebb9c6f74314875af2d4b92cfcdcfc67 (patch)
treedfb0d7bca291dfdfd9bc1520072e822da9ac1b05 /crawl-ref/source/it_use3.cc
parentdcde5bcfc99b2bd881f7ba3edd4e2b9cf37d3cf3 (diff)
downloadcrawl-ref-81612f62ebb9c6f74314875af2d4b92cfcdcfc67.tar.gz
crawl-ref-81612f62ebb9c6f74314875af2d4b92cfcdcfc67.zip
Labyrinths get tricoloured walls: rock at the periphery, stone further in, and
metal walls closest to the minotaur vault. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1620 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/it_use3.cc')
-rw-r--r--crawl-ref/source/it_use3.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc
index ee168bf1ee..d96d9c66b1 100644
--- a/crawl-ref/source/it_use3.cc
+++ b/crawl-ref/source/it_use3.cc
@@ -259,11 +259,8 @@ static void reaching_weapon_attack(void)
// if we're attacking more than a space away
if ((x_distance > 1) || (y_distance > 1))
{
-
-#define MAX(x,y) (((x) > (y)) ? (x) : (y))
x_middle = MAX(beam.tx, you.x_pos) - (x_distance / 2);
y_middle = MAX(beam.ty, you.y_pos) - (y_distance / 2);
-#undef MAX
// if either the x or the y is the same, we should check for
// a monster: