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

- Added handler classes CRmgTemplateStorage and CTerrainViewPatternConfig to LibClasses

Browse Source 
- Re-organized CMapGenerator
- Created CZone and CTemplate objects in the heap and used pointers
- Added stub classes CZoneGraphGenerator and CZonePlacer (include warnings of unused variables, please ignore them)
- Fixed CRandomGenerator bug that always the same number was produced
- Better structure of Visual Studio project files with using filters
- Updated project files (VS, CMake)
- Excluded compiler warning mismatched-tags (false positive)
- Fixed a bug when compiling with unit tests enabled
This commit is contained in:
beegee1
2013-08-17 12:46:48 +00:00
parent 45c2bd7511
commit 1ac328635a
25 changed files with 2004 additions and 1422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/mapping/CMapEditManager.h
View File

@@ -279,7 +279,8 @@ struct DLL_LINKAGE TerrainViewPattern
class DLL_LINKAGE CTerrainViewPatternConfig : public boost::noncopyable
{
public:
static CTerrainViewPatternConfig & get();
CTerrainViewPatternConfig();
~CTerrainViewPatternConfig();
const std::vector<TerrainViewPattern> & getTerrainViewPatternsForGroup(ETerrainGroup::ETerrainGroup terGroup) const;
boost::optional<const TerrainViewPattern &> getTerrainViewPatternById(ETerrainGroup::ETerrainGroup terGroup, const std::string & id) const;
@@ -287,12 +288,8 @@ public:
ETerrainGroup::ETerrainGroup getTerrainGroup(const std::string & terGroup) const;
private:
CTerrainViewPatternConfig();
~CTerrainViewPatternConfig();
std::map<ETerrainGroup::ETerrainGroup, std::vector<TerrainViewPattern> > terrainViewPatterns;
std::map<std::string, TerrainViewPattern> terrainTypePatterns;
static boost::mutex smx;
};
/// The CDrawTerrainOperation class draws a terrain area on the map.