From fd625fe87d44d066a381cdbb2b81cdd13fca270d Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Tue, 21 Feb 2012 14:18:58 +0000 Subject: [PATCH] - enabled fix for #866 --- lib/CObjectHandler.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/CObjectHandler.cpp b/lib/CObjectHandler.cpp index 543d2d8c7..b3b93ac10 100644 --- a/lib/CObjectHandler.cpp +++ b/lib/CObjectHandler.cpp @@ -262,12 +262,12 @@ bool CGObjectInstance::blockingAt(int x, int y) const bool CGObjectInstance::coveringAt(int x, int y) const { #if USE_COVERAGE_MAP - return x < 8 && y < 6;// ignore unreliable msk\msg -#else if((defInfo->coverageMap[y] >> (7-(x) )) & 1 || (defInfo->shadowCoverage[y] >> (7-(x) )) & 1) return true; return false; +#else + return x < 8 && y < 6;// ignore unreliable msk\msg #endif } @@ -455,11 +455,11 @@ ui8 CGObjectInstance::getPassableness() const bool CGObjectInstance::hasShadowAt( int x, int y ) const { #if USE_COVERAGE_MAP - return coveringAt(x,y);// ignore unreliable shadowCoverage map -#else if( (defInfo->shadowCoverage[y] >> (7-(x) )) & 1 ) return true; return false; +#else + return coveringAt(x,y);// ignore unreliable shadowCoverage map #endif }