games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00
Code Issues Releases Activity

Fixed #484. Preliminary support for bonus limiters/

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2010-07-12 10:20:25 +00:00
parent bb7615309f
commit fa4ee94cf9
10 changed files with 225 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/CGameState.cpp
View File

@ -117,11 +117,11 @@ class CObjectCaller : public IObjectCaller
public:
void preInit()
{
T::preInit();
//T::preInit();
}
void postInit()
{
T::postInit();
//T::postInit();
}
};
@ -148,14 +148,14 @@ public:
void preInit()
{
for (size_t i = 0; i < apps.size(); i++)
apps[i]->preInit();
// for (size_t i = 0; i < apps.size(); i++)
// apps[i]->preInit();
}
void postInit()
{
for (size_t i = 0; i < apps.size(); i++)
apps[i]->postInit();
// for (size_t i = 0; i < apps.size(); i++)
// apps[i]->postInit();
}
} *objCaller = NULL;
@ -2365,7 +2365,7 @@ int3 CGameState::guardingCreaturePosition (int3 pos) const
if (map->isInTheMap(pos))
{
TerrainTile &tile = map->terrain[pos.x][pos.y][pos.z];
if (tile.visitable)
if (tile.visitable && (tile.tertype == TerrainTile::water) == (posTile.tertype == TerrainTile::water))
{
BOOST_FOREACH (CGObjectInstance* obj, tile.visitableObjects)
{