games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

* refactoring

Browse Source
This commit is contained in:
mateuszb
2013-02-12 22:24:48 +00:00
parent 7e46d462b6
commit 9c1a117c1c
23 changed files with 165 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/CHeroHandler.h
View File

@@ -131,8 +131,8 @@ struct DLL_LINKAGE CObstacleInfo
{
si32 ID;
std::string defName;
std::vector<ETerrainType::ETerrainType> allowedTerrains;
std::vector<BFieldType::BFieldType> allowedSpecialBfields;
std::vector<ETerrainType> allowedTerrains;
std::vector<BFieldType> allowedSpecialBfields;
ui8 isAbsoluteObstacle; //there may only one such obstacle in battle and its position is always the same
si32 width, height; //how much space to the right and up is needed to place obstacle (affects only placement algorithm)
@@ -140,7 +140,7 @@ struct DLL_LINKAGE CObstacleInfo
std::vector<BattleHex> getBlocked(BattleHex hex) const; //returns vector of hexes blocked by obstacle when it's placed on hex 'hex'
bool isAppropriate(ETerrainType::ETerrainType terrainType, int specialBattlefield = -1) const;
bool isAppropriate(ETerrainType terrainType, int specialBattlefield = -1) const;
template <typename Handler> void serialize(Handler &h, const int version)
{