games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-03 00:46:55 +02:00
Code Issues Releases Activity

- enabled fix for #866

Browse Source
This commit is contained in:
Ivan Savenko
2012-02-21 14:18:58 +00:00
parent 354b9e7fb3
commit fd625fe87d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/CObjectHandler.cpp
View File

@ -262,12 +262,12 @@ bool CGObjectInstance::blockingAt(int x, int y) const
bool CGObjectInstance::coveringAt(int x, int y) const bool CGObjectInstance::coveringAt(int x, int y) const
{ {
#if USE_COVERAGE_MAP #if USE_COVERAGE_MAP
return x < 8 && y < 6;// ignore unreliable msk\msg
#else
if((defInfo->coverageMap[y] >> (7-(x) )) & 1 if((defInfo->coverageMap[y] >> (7-(x) )) & 1
|| (defInfo->shadowCoverage[y] >> (7-(x) )) & 1) || (defInfo->shadowCoverage[y] >> (7-(x) )) & 1)
return true; return true;
return false; return false;
#else
return x < 8 && y < 6;// ignore unreliable msk\msg
#endif #endif
} }
@ -455,11 +455,11 @@ ui8 CGObjectInstance::getPassableness() const
bool CGObjectInstance::hasShadowAt( int x, int y ) const bool CGObjectInstance::hasShadowAt( int x, int y ) const
{ {
#if USE_COVERAGE_MAP #if USE_COVERAGE_MAP
return coveringAt(x,y);// ignore unreliable shadowCoverage map
#else
if( (defInfo->shadowCoverage[y] >> (7-(x) )) & 1 ) if( (defInfo->shadowCoverage[y] >> (7-(x) )) & 1 )
return true; return true;
return false; return false;
#else
return coveringAt(x,y);// ignore unreliable shadowCoverage map
#endif #endif
} }