games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

Revert "Merge branch 'p254_4' into develop"

Browse Source 
This reverts commit 37f68713a7, reversing
changes made to 4477b7c35d.
This commit is contained in:
AlexVinS
2016-11-08 00:15:46 +03:00
parent 37f68713a7
commit aad675a7c4
14 changed files with 875 additions and 837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/CGameInfoCallback.cpp
View File

@@ -457,6 +457,12 @@ std::vector < const CGObjectInstance * > CGameInfoCallback::getFlaggableObjects(
for(const CGObjectInstance *obj : t->blockingObjects)
if(obj->tempOwner != PlayerColor::UNFLAGGABLE)
ret.push_back(obj);
// const std::vector < std::pair<const CGObjectInstance*,SDL_Rect> > & objs = CGI->mh->ttiles[pos.x][pos.y][pos.z].objects;
// for(size_t b=0; b<objs.size(); ++b)
// {
// if(objs[b].first->tempOwner!=254 && !((objs[b].first->defInfo->blockMap[pos.y - objs[b].first->pos.y + 5] >> (objs[b].first->pos.x - pos.x)) & 1))
// ret.push_back(CGI->mh->ttiles[pos.x][pos.y][pos.z].objects[b].first);
// }
return ret;
}