games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-29 00:41:38 +02:00
Code Issues Releases Activity

Partial fix for #961.

Browse Source 
Minor fixes for VS project files.
This commit is contained in:
Michał W. Urbańczyk
2012-05-18 22:47:54 +00:00
parent d168f3eac2
commit d2756e8c88
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/CGameState.cpp
View File

@ -1572,16 +1572,16 @@ int CGameState::battleGetBattlefieldType(int3 tile) const
if(dynamic_cast<const CGMine *>(t.visitableObjects.front()))
return 12;
const std::vector <ConstTransitivePtr<CGObjectInstance> > & objs = map->objects;
for(int g=0; g<objs.size(); ++g)
BOOST_FOREACH(auto &obj, map->objects)
{
if( !objs[g] || objs[g]->pos.x - tile.x < 0 || objs[g]->pos.x - tile.x >= 8
|| tile.y - objs[g]->pos.y + 5 < 0 || tile.y - objs[g]->pos.y + 5 >=6
|| !objs[g]->coveringAt(objs[g]->pos.x - tile.x, tile.y - objs[g]->pos.y + 5)
if( !obj || obj->pos.z != tile.z
|| obj->pos.x - tile.x < 0 || obj->pos.x - tile.x >= 8
|| tile.y - obj->pos.y + 5 < 0 || tile.y - obj->pos.y + 5 >=6
|| !obj->coveringAt(obj->pos.x - tile.x, tile.y - obj->pos.y + 5)
) //look only for objects covering given tile
continue;
switch(objs[g]->ID)
switch(obj->ID)
{
case Obj::CLOVER_FIELD:
return 19;