Merge branch 'canWalkBetween' into diggingInvaders

develop
expwnent 2012-12-17 00:25:31 -05:00
commit 3fde504ae2
1 changed files with 1 additions and 1 deletions

@ -576,7 +576,7 @@ bool Maps::canWalkBetween(df::coord pos1, df::coord pos2)
} }
//diagonal up: has to be a ramp //diagonal up: has to be a ramp
if ( shape1 == tiletype_shape::RAMP && shape2 == tiletype_shape::RAMP ) { if ( shape1 == tiletype_shape::RAMP /*&& shape2 == tiletype_shape::RAMP*/ ) {
df::coord up = df::coord(pos1.x,pos1.y,pos1.z+1); df::coord up = df::coord(pos1.x,pos1.y,pos1.z+1);
df::tiletype* typeUp = Maps::getTileType(up); df::tiletype* typeUp = Maps::getTileType(up);
df::tiletype_shape shapeUp = ENUM_ATTR(tiletype,shape,*typeUp); df::tiletype_shape shapeUp = ENUM_ATTR(tiletype,shape,*typeUp);